JBoss Tools SVN: r7441 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-04-09 05:18:15 -0400 (Wed, 09 Apr 2008)
New Revision: 7441
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2001, Selection borders are fixed, height attribute updated
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-04-09 09:18:08 UTC (rev 7440)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-04-09 09:18:15 UTC (rev 7441)
@@ -132,9 +132,21 @@
SourceDataTableElements sourceElements = new SourceDataTableElements(sourceNode);
VisualDataTableElements visualElements = new VisualDataTableElements();
-
+
+ /*
+ * Fixes http://jira.jboss.com/jira/browse/JBIDE-2001
+ * Selection borders are fixed.
+ */
nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV);
- VpeCreatorInfo creatorInfo = new VpeCreatorInfo(div);
+ nsIDOMElement selectionTable = visualDocument.createElement(HTML.TAG_TABLE);
+ nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
+ nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
+
+ td.appendChild(div);
+ tr.appendChild(td);
+ selectionTable.appendChild(tr);
+
+ VpeCreatorInfo creatorInfo = new VpeCreatorInfo(selectionTable);
/*
* Table with caption, header, footer,
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-09 09:18:08 UTC (rev 7440)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-09 09:18:15 UTC (rev 7441)
@@ -195,6 +195,7 @@
static final String ATTR_DATATABLE_COLUMN_CLASSES = "columnClasses"; //$NON-NLS-1$
static final String[] ATTR_DATATABLE_PROPERTIES = {
"width", //$NON-NLS-1$
+ "height", //$NON-NLS-1$
"bgcolor", //$NON-NLS-1$
"border", //$NON-NLS-1$
"cellpadding", //$NON-NLS-1$
17 years, 8 months
JBoss Tools SVN: r7440 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-04-09 05:18:08 -0400 (Wed, 09 Apr 2008)
New Revision: 7440
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-2001, Selection borders are fixed, height attribute updated
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-04-09 09:07:56 UTC (rev 7439)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-04-09 09:18:08 UTC (rev 7440)
@@ -560,15 +560,15 @@
<vpe:tag name="h:dataTable" case-sensitive="yes">
<vpe:template children="yes" modify="no">
- <vpe:datatable width="{@width}" bgcolor="{@bgcolor}"
+ <vpe:datatable width="{@width}" height="{@height}" bgcolor="{@bgcolor}"
border="{@border}" cellpadding="{@cellpadding}"
cellspacing="{@cellspacing}" columnClasses="{@columnClasses}"
footerClass="{@footerClass}" headerClass="{@headerClass}"
rowClasses="{@rowClasses}" frame="{@frame}" rules="{@rules}"
class="{@styleClass}" style="{@style}" title="{tagstring()}" dir="{@dir}"/>
<vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
+ <vpe:width width-attr="width" />
+ <vpe:height height-attr="height" />
</vpe:resize>
<vpe:dnd>
<vpe:drag start-enable="yes" />
17 years, 8 months
JBoss Tools SVN: r7439 - trunk/jsf/docs/jsf_tools_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: tromanovich
Date: 2008-04-09 05:07:56 -0400 (Wed, 09 Apr 2008)
New Revision: 7439
Modified:
trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_config_file.xml
trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_support.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-140 links in docs should be relative
Changed internal links on the external in the jsf_config_file.xml and jsf_support.xml files.
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_config_file.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_config_file.xml 2008-04-08 23:40:20 UTC (rev 7438)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_config_file.xml 2008-04-09 09:07:56 UTC (rev 7439)
@@ -213,8 +213,8 @@
</figure>
<para>The JSF configuration editor also comes with a very useful <link
- linkend="OpenOnSelection4Hyperlinknavigation">OpenOn</link> selection feature.</para>
-
+ linkend="../../../jsf/en/html_single/index.html#OpenOnSelection4Hyperlinknavigation">OpenOn</link> selection feature.</para>
+
</section>
<section id="ErrorReporting3324">
@@ -223,7 +223,7 @@
error checking. This greatly reduces your development time as it allows you to catch
many of the errors during development.</para>
<para>Errors will be reported by JBoss Developer Studio's <link
- linkend="verif_valid"> verification</link> facility:</para>
+ linkend="../../../jsf/en/html_single/index.html#verif_valid"> verification</link> facility:</para>
<figure>
<title>Error Reporting in Source View</title>
<mediaobject>
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_support.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_support.xml 2008-04-08 23:40:20 UTC (rev 7438)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/modules/jsf_support.xml 2008-04-09 09:07:56 UTC (rev 7439)
@@ -190,7 +190,7 @@
<title>Facelets components</title>
<para>ss</para>
- <para>The <link linkend="palette">JBoss Tools Palette</link> comes with the
+ <para>The <link linkend="../../../jsf/en/html_single/index.html#palette">JBoss Tools Palette</link> comes with the
Facelets components ready to use. A useful tip appears when you
hover the mouse cursor over the tag, the tip includes a detailed
description of the tag component, the syntax and available
17 years, 8 months
JBoss Tools SVN: r7438 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-04-08 19:40:20 -0400 (Tue, 08 Apr 2008)
New Revision: 7438
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-2013
fix problems in case of custom paths to java and webapp root folders:
location for seam.properties
path to dev hot deployment directory
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-04-08 21:29:49 UTC (rev 7437)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-04-08 23:40:20 UTC (rev 7438)
@@ -165,7 +165,7 @@
public static AntCopyUtils.FileSet JBOOS_WAR_WEB_INF_CLASSES_SET = new AntCopyUtils.FileSet()
.include("import\\.sql") //$NON-NLS-1$
.include("security\\.drl") //$NON-NLS-1$
- .include("seam\\.properties") //$NON-NLS-1$
+ //.include("seam\\.properties") //$NON-NLS-1$
.include("messages_en\\.properties"); //$NON-NLS-1$
public static AntCopyUtils.FileSet JBOOS_EJB_WEB_INF_CLASSES_SET = new AntCopyUtils.FileSet()
@@ -297,27 +297,27 @@
// ********************************************************************************************
// Copy seam project indicator
// ********************************************************************************************
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properties"), srcFolder, true); //$NON-NLS-1$
final IContainer source = srcRootFolder.getUnderlyingFolder();
IPath actionSrcPath = new Path(source.getFullPath().removeFirstSegments(1)+"/action"); //$NON-NLS-1$
IPath modelSrcPath = new Path(source.getFullPath().removeFirstSegments(1)+"/model"); //$NON-NLS-1$
srcRootFolder.delete(IVirtualFolder.FORCE, monitor);
- WtpUtils.createSourceFolder(project, actionSrcPath, source.getFullPath().removeFirstSegments(1), new Path(webRootFolder.getLocation().lastSegment()+"/WEB-INF/dev")); //$NON-NLS-1$
+ WtpUtils.createSourceFolder(project, actionSrcPath, source.getFullPath().removeFirstSegments(1), webRootFolder.getFullPath().removeFirstSegments(1).append("WEB-INF/dev")); //$NON-NLS-1$
WtpUtils.createSourceFolder(project, modelSrcPath, source.getFullPath().removeFirstSegments(1), null);
srcRootFolder.createLink(actionSrcPath, 0, null);
srcRootFolder.createLink(modelSrcPath, 0, null);
+ File actionsSrc = new File(project.getLocation().toFile(), source.getFullPath().removeFirstSegments(1) + "/action/");
+
+ AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properties"), actionsSrc, true); //$NON-NLS-1$
+
AntCopyUtils.copyFileToFile(
new File(seamGenHomeFolder,"src/Authenticator.java"), //$NON-NLS-1$
- new File(project.getLocation().toFile(),source.getFullPath().removeFirstSegments(1)+"/action/" + model.getProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME).toString().replace('.', '/')+"/"+"Authenticator.java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new File(actionsSrc, model.getProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME).toString().replace('.', '/')+"/"+"Authenticator.java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
new FilterSetCollection(filtersFilterSet), true);
- // Needed to make sure /dev is picked up by test, so need seam.properties.
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properties"), new File(project.getLocation().toFile(),source.getFullPath().lastSegment()+"/action"), true); //$NON-NLS-1$
-
AntCopyUtils.copyFileToFile(
persistenceFile,
new File(srcFolder,"META-INF/persistence.xml"), //$NON-NLS-1$
@@ -398,11 +398,6 @@
seamGenResFolder,new File(ejb,"ejbModule"),new AntCopyUtils.FileSetFileFilter(ejbSrcResourcesSet), viewFilterSetCollection, true); //$NON-NLS-1$
// ********************************************************************************************
- // Copy seam project indicator
- // ********************************************************************************************
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properties"), new File(ejb,"ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
-
- // ********************************************************************************************
// Copy security.drl to source folder
// ********************************************************************************************
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"security.drl"), new File(ejb,"ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-04-08 21:29:49 UTC (rev 7437)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2008-04-08 23:40:20 UTC (rev 7438)
@@ -207,7 +207,7 @@
public static AntCopyUtils.FileSet JBOOS_WAR_WEB_INF_CLASSES_SET = new AntCopyUtils.FileSet()
.include("import\\.sql") //$NON-NLS-1$
.include("security\\.drl") //$NON-NLS-1$
- .include("seam\\.properties") //$NON-NLS-1$
+ //.include("seam\\.properties") //$NON-NLS-1$
.include("messages_en\\.properties"); //$NON-NLS-1$
/**
@@ -359,7 +359,7 @@
// ********************************************************************************************
// Copy seam project indicator
// ********************************************************************************************
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properties"), srcFolder, true); //$NON-NLS-1$
+
final IContainer source = srcRootFolder.getUnderlyingFolder();
IPath actionSrcPath = new Path(source.getFullPath().removeFirstSegments(1) + "/action"); //$NON-NLS-1$
@@ -372,9 +372,13 @@
srcRootFolder.createLink(actionSrcPath, 0, null);
srcRootFolder.createLink(modelSrcPath, 0, null);
+ File actionsSrc = new File(project.getLocation().toFile(), source.getFullPath().removeFirstSegments(1) + "/action/");
+
+ AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properties"), actionsSrc, true); //$NON-NLS-1$
+
AntCopyUtils.copyFileToFile(
new File(seamGenHomeFolder, "src/Authenticator.java"), //$NON-NLS-1$
- new File(project.getLocation().toFile(), source.getFullPath().removeFirstSegments(1) + "/action/" + model.getProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME).toString().replace('.', '/') + "/" + "Authenticator.java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ new File(actionsSrc,model.getProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME).toString().replace('.', '/') + "/" + "Authenticator.java"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
new FilterSetCollection(filtersFilterSet), true);
AntCopyUtils.copyFileToFile(
@@ -449,11 +453,6 @@
AntCopyUtils.copyFilesAndFolders(
seamGenResFolder, new File(ejb, "ejbModule"), new AntCopyUtils.FileSetFileFilter(ejbSrcResourcesSet), viewFilterSetCollection, true); //$NON-NLS-1$
- // ********************************************************************************************
- // Copy seam project indicator
- // ********************************************************************************************
- AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properties"), new File(ejb, "ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
-
AntCopyUtils.copyFileToFolder(
new File(seamGenResFolder, "META-INF/ejb-jar.xml"), //$NON-NLS-1$
new File(ejb, "ejbModule/META-INF/"), //$NON-NLS-1$
17 years, 8 months
JBoss Tools SVN: r7437 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-04-08 17:29:49 -0400 (Tue, 08 Apr 2008)
New Revision: 7437
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
Log:
Filesets JBIDE-943
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-04-08 19:39:20 UTC (rev 7436)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2008-04-08 21:29:49 UTC (rev 7437)
@@ -239,7 +239,11 @@
* @see org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet#getPathRelativeToParent(org.eclipse.core.runtime.IPath)
*/
public IPath getPathRelativeToParent(IPath inputFile) {
- String s = inputFile.toOSString().substring(getGlobalSourcePath().toOSString().length()+1);
+ String s;
+ if( isFlattened() )
+ s = inputFile.toOSString().substring(getGlobalSourcePath().toOSString().length()+1);
+ else
+ s = inputFile.lastSegment();
return new Path(s);
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-04-08 19:39:20 UTC (rev 7436)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-04-08 21:29:49 UTC (rev 7437)
@@ -39,6 +39,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeVisitor;
import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
+import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveActionImpl;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFileSetImpl;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFolderImpl;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveImpl;
@@ -157,6 +158,7 @@
if( fileset.equals(filesets[i])) continue;
relativePathsMatch = fileset.getRootArchiveRelativePath(path).equals(filesets[i].getRootArchiveRelativePath(path));
destinationsMatch = fileset.getRootArchive().getArchiveFilePath().equals(filesets[i].getRootArchive().getArchiveFilePath());
+
if( relativePathsMatch && destinationsMatch ) {
// the two put the file in the same spot, within the same archive! It's a match!
return true;
@@ -252,7 +254,7 @@
} else if (node instanceof XbFileSet) {
nodeImpl = new ArchiveFileSetImpl((XbFileSet)node);
} else if( node instanceof XbAction ) {
- nodeImpl = null; // TODO
+ nodeImpl = new ArchiveActionImpl((XbAction)node);
}
for (Iterator iter = node.getAllChildren().iterator(); iter.hasNext(); ) {
17 years, 8 months
JBoss Tools SVN: r7436 - in trunk: documentation/guides/Exadel-migration and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-04-08 15:39:20 -0400 (Tue, 08 Apr 2008)
New Revision: 7436
Modified:
trunk/as/docs/reference/pom.xml
trunk/documentation/guides/Exadel-migration/pom.xml
trunk/documentation/guides/GettingStartedGuide/pom.xml
trunk/documentation/jboss-tools-docs/pom.xml
trunk/hibernatetools/docs/reference/pom.xml
trunk/jbpm/docs/reference/pom.xml
trunk/jsf/docs/jsf_tools_ref_guide/pom.xml
trunk/jsf/docs/jsf_tools_tutorial/pom.xml
trunk/jsf/docs/userguide/pom.xml
trunk/seam/docs/reference/pom.xml
trunk/struts/docs/struts_tools_ref_guide/pom.xml
trunk/struts/docs/struts_tools_tutorial/pom.xml
Log:
http://jira.jboss.com/jira/browse/JBQA-1524 - jdocbook-style dependency was moved from plugin
build section to project section in order to separate enterprise and org styles
Modified: trunk/as/docs/reference/pom.xml
===================================================================
--- trunk/as/docs/reference/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/as/docs/reference/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -9,7 +9,14 @@
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>AS_Reference_Guide</name>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -23,13 +30,8 @@
<artifactId>jbossorg-docbook-xslt</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/documentation/guides/Exadel-migration/pom.xml
===================================================================
--- trunk/documentation/guides/Exadel-migration/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/documentation/guides/Exadel-migration/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -10,6 +10,14 @@
<packaging>jdocbook</packaging>
<name>Exadel_Studio_Migration_Guide</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -23,13 +31,8 @@
<artifactId>jbossent-docbook-xslt</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>com.jboss</groupId>
- <artifactId>jbossent-jdocbook-style</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/documentation/guides/GettingStartedGuide/pom.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/documentation/guides/GettingStartedGuide/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -9,7 +9,14 @@
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Getting_Started_Guide</name>
-
+<dependencies>
+ <dependency>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +31,6 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.jboss</groupId>
- <artifactId>jbossent-jdocbook-style</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/documentation/jboss-tools-docs/pom.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/documentation/jboss-tools-docs/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -10,29 +10,18 @@
<packaging>pom</packaging>
<name>All_Userguides</name>
-<dependencies>
-
- <!--dependency>
- <groupId>org.jboss.tools</groupId>
- <artifactId>exadel-migration-${translation}</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency-->
-
-</dependencies>
-
<modules>
- <module>../guides/Exadel-migration</module>
- <module>../guides/GettingStartedGuide</module>
- <module>../../as/docs/reference</module>
- <module>../../hibernatetools/docs/reference</module>
- <module>../../jbpm/docs/reference</module>
- <module>../../jsf/docs/userguide</module>
- <module>../../seam/docs/reference</module>
- <module>../../jsf/docs/jsf_tools_ref_guide</module>
- <module>../../jsf/docs/jsf_tools_tutorial</module>
- <module>../../struts/docs/struts_tools_ref_guide</module>
- <module>../../struts/docs/struts_tools_tutorial</module>
-
+ <module>../../as/docs/reference</module>
+ <module>../../hibernatetools/docs/reference</module>
+ <module>../../jbpm/docs/reference</module>
+ <module>../../jsf/docs/userguide</module>
+ <module>../../jsf/docs/jsf_tools_ref_guide</module>
+ <module>../../jsf/docs/jsf_tools_tutorial</module>
+ <module>../../seam/docs/reference</module>
+ <module>../../struts/docs/struts_tools_ref_guide</module>
+ <module>../../struts/docs/struts_tools_tutorial</module>
+ <module>../guides/Exadel-migration</module>
+ <module>../guides/GettingStartedGuide</module>
</modules>
<build>
Modified: trunk/hibernatetools/docs/reference/pom.xml
===================================================================
--- trunk/hibernatetools/docs/reference/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/hibernatetools/docs/reference/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -9,7 +9,14 @@
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernatetools_Reference_Guide</name>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +31,6 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/jbpm/docs/reference/pom.xml
===================================================================
--- trunk/jbpm/docs/reference/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/jbpm/docs/reference/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -10,6 +10,14 @@
<packaging>jdocbook</packaging>
<name>JBPM_Reference_Guide</name>
+<dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +32,6 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/jsf/docs/jsf_tools_ref_guide/pom.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/jsf/docs/jsf_tools_ref_guide/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -10,6 +10,14 @@
<packaging>jdocbook</packaging>
<name>JSF_Tools_Reference_Guide</name>
+<dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.0.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +32,6 @@
<version>1.0.0</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/jsf/docs/jsf_tools_tutorial/pom.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/jsf/docs/jsf_tools_tutorial/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -10,6 +10,14 @@
<packaging>jdocbook</packaging>
<name>JSF_Tools_Tutorial</name>
+<dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.0.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +32,6 @@
<version>1.0.0</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.0.0</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/jsf/docs/userguide/pom.xml
===================================================================
--- trunk/jsf/docs/userguide/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/jsf/docs/userguide/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -10,6 +10,14 @@
<packaging>jdocbook</packaging>
<name>Visual_Web_Tools_Reference_Guide</name>
+<dependencies>
+ <dependency>
+ <groupId>com.jboss</groupId>
+ <artifactId>jbossent-jdocbook-style</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +32,6 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.jboss</groupId>
- <artifactId>jbossent-jdocbook-style</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/seam/docs/reference/pom.xml
===================================================================
--- trunk/seam/docs/reference/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/seam/docs/reference/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -10,6 +10,14 @@
<packaging>jdocbook</packaging>
<name>Seam_Reference_Guide</name>
+<dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +32,6 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/struts/docs/struts_tools_ref_guide/pom.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/struts/docs/struts_tools_ref_guide/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -9,7 +9,14 @@
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Struts_Tools_Reference_Guide</name>
-
+<dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +31,6 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
Modified: trunk/struts/docs/struts_tools_tutorial/pom.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/pom.xml 2008-04-08 19:11:26 UTC (rev 7435)
+++ trunk/struts/docs/struts_tools_tutorial/pom.xml 2008-04-08 19:39:20 UTC (rev 7436)
@@ -9,7 +9,14 @@
<version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Struts_Tools_Tutorial</name>
-
+<dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <type>jdocbook-style</type>
+ </dependency>
+</dependencies>
<build>
<plugins>
<plugin>
@@ -24,12 +31,6 @@
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossorg-jdocbook-style</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <type>jdocbook-style</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.docs</groupId>
<artifactId>highlight</artifactId>
<version>3.1.4.GA</version>
17 years, 8 months
JBoss Tools SVN: r7435 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-04-08 15:11:26 -0400 (Tue, 08 Apr 2008)
New Revision: 7435
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
Log:
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-04-08 19:07:31 UTC (rev 7434)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-04-08 19:11:26 UTC (rev 7435)
@@ -205,6 +205,7 @@
OPEN_SEAM_COMPONENT_ACTION_MESSAGE=Enter seam component name prefix or pattern (? = any character, * = any string):
OPEN_SEAM_COMPONENT_DIALOG_LOADING=Seam components loading
OPEN_SEAM_COMPONENT_DIALOG_NAME=OpenSeamComponentDialog
+OPEN_SEAM_COMPONENT_DIALOG_WAIT=Wait for Build...
FIND_DECLARATIONS_ACTION_ACTION_NAME=Find Seam Declarations
FIND_DECLARATIONS_ACTION_DESCRIPTION=Find Seam Declarations
FIND_DECLARATIONS_ACTION_TOOL_TIP=Find Seam Declarations
17 years, 8 months
JBoss Tools SVN: r7434 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-04-08 15:07:31 -0400 (Tue, 08 Apr 2008)
New Revision: 7434
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1950 Added seam project setting validation into New Action/Form/Entity/Conversation/Generate Entities Wizards.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-04-08 18:38:38 UTC (rev 7433)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-04-08 19:07:31 UTC (rev 7434)
@@ -409,6 +409,8 @@
public static String VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS;
+ public static String VALIDATOR_INVALID_SETTINGS;
+
public static String SEAM_TARGET_SERVER;
public static String RUNTIME_DELETE_CONFIRM_TITLE;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-04-08 18:38:38 UTC (rev 7433)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-04-08 19:07:31 UTC (rev 7434)
@@ -161,6 +161,7 @@
VALIDATOR_FACTORY_EJB_PROJECT=EJB project '
VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS=' already exists. Please select other name for new Seam project.
VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED=Seam Runtime is not configured for selected Seam Web Project
+VALIDATOR_INVALID_SETTINGS=Selected seam project has some invalid settings. Please press "Settings..." and correct them.
SEAM_PROJECT_WIZARD_PAGE1_FILE_CONTAINER_MUST_BE_SPECIFIED=File container must be specified
SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT=Runtime name is not correct
SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES=Can't generate seam entities
@@ -204,7 +205,6 @@
OPEN_SEAM_COMPONENT_ACTION_MESSAGE=Enter seam component name prefix or pattern (? = any character, * = any string):
OPEN_SEAM_COMPONENT_DIALOG_LOADING=Seam components loading
OPEN_SEAM_COMPONENT_DIALOG_NAME=OpenSeamComponentDialog
-OPEN_SEAM_COMPONENT_DIALOG_WAIT=Wait for Build...
FIND_DECLARATIONS_ACTION_ACTION_NAME=Find Seam Declarations
FIND_DECLARATIONS_ACTION_DESCRIPTION=Find Seam Declarations
FIND_DECLARATIONS_ACTION_TOOL_TIP=Find Seam Declarations
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2008-04-08 18:38:38 UTC (rev 7433)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2008-04-08 19:07:31 UTC (rev 7434)
@@ -33,6 +33,7 @@
import org.eclipse.swt.widgets.Composite;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;
import org.jboss.tools.seam.ui.SeamUIMessages;
import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
@@ -47,6 +48,7 @@
public abstract class SeamBaseWizardPage extends WizardPage implements IAdaptable, PropertyChangeListener {
protected final IStructuredSelection initialSelection;
+ protected IProject rootSeamProject;
/**
*
@@ -72,7 +74,8 @@
protected void createEditors() {
addEditors(SeamWizardFactory.createBaseFormFieldEditors(SeamWizardUtils.getRootSeamProjectName(initialSelection)));
- String selectedProject = SeamWizardUtils.getRootSeamProjectName(initialSelection);
+ rootSeamProject = SeamWizardUtils.getRootSeamProject(initialSelection);
+ String selectedProject = (rootSeamProject == null) ? "" : rootSeamProject.getName();
String packageName = getDefaultPackageName(selectedProject);
addEditor(SeamWizardFactory.createSeamJavaPackageSelectionFieldEditor(packageName));
setSeamProjectNameData(selectedProject);
@@ -290,6 +293,17 @@
setPageComplete(true);
}
+ protected boolean isProjectSettingsOk() {
+ if(rootSeamProject!=null) {
+ IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(rootSeamProject);
+ return SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, ""), false) &&
+ SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, ""), false) &&
+ ("false".equals(prefs.get(ISeamFacetDataModelProperties.TEST_CREATING, "false").trim()) || (SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, ""), false) && SeamProjectPropertyValidator.isProjectNameValid(prefs.get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, ""), false))) &&
+ (ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(prefs.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ISeamFacetDataModelProperties.DEPLOY_AS_WAR).trim()) || SeamProjectPropertyValidator.isProjectNameValid(prefs.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, ""), false));
+ }
+ return true;
+ }
+
/**
* @param project
*/
@@ -309,8 +323,12 @@
Map errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(
editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue(), null);
- if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
+ if(errors.size()>0 || !isProjectSettingsOk()) {
+ Object errorMessage = errors.get(IValidator.DEFAULT_ERROR);
+ if(errorMessage==null) {
+ errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS;
+ }
+ setErrorMessage(errorMessage.toString());
setPageComplete(false);
IFieldEditor beanEditor = getEditor(IParameter.SEAM_BEAN_NAME);
if(beanEditor!=null) {
@@ -321,8 +339,6 @@
packageEditor.setEnabled(false);
}
return false;
- } else {
-
}
return true;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2008-04-08 18:38:38 UTC (rev 7433)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java 2008-04-08 19:07:31 UTC (rev 7434)
@@ -19,7 +19,9 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;
import org.jboss.tools.seam.ui.SeamUIMessages;
import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
@@ -45,10 +47,11 @@
*/
@Override
protected void createEditors() {
- addEditor(SeamWizardFactory.createSeamProjectSelectionFieldEditor(SeamWizardUtils.getRootSeamProjectName(initialSelection)));
+ rootSeamProject = SeamWizardUtils.getRootSeamProject(initialSelection);
+ String selectedProject = (rootSeamProject == null) ? "" : rootSeamProject.getName();
+ addEditor(SeamWizardFactory.createSeamProjectSelectionFieldEditor(selectedProject));
addEditor(SeamWizardFactory.createSeamEntityClasNameFieldEditor());
- String selectedProject = SeamWizardUtils.getRootSeamProjectName(initialSelection);
String packageName = getDefaultPackageName(selectedProject);
addEditor(SeamWizardFactory.createSeamJavaPackageSelectionFieldEditor(packageName));
@@ -99,7 +102,24 @@
return seamFacetPrefs.get(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "");
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.ui.wizard.SeamBaseWizardPage#isProjectSettingsOk()
+ */
@Override
+ protected boolean isProjectSettingsOk() {
+ if(rootSeamProject!=null) {
+ IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(rootSeamProject);
+ return SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, ""), false) &&
+ SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, ""), false) &&
+ SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, ""), false) &&
+ ("false".equals(prefs.get(ISeamFacetDataModelProperties.TEST_CREATING, "false").trim()) || (SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.TEST_SOURCE_FOLDER, ""), false) && SeamProjectPropertyValidator.isProjectNameValid(prefs.get(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, ""), false))) &&
+ (ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(prefs.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ISeamFacetDataModelProperties.DEPLOY_AS_WAR).trim()) || SeamProjectPropertyValidator.isProjectNameValid(prefs.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, ""), false));
+ }
+ return true;
+ }
+
+ @Override
protected void doValidate(PropertyChangeEvent event) {
if(!isValidProjectSelected()) return;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-04-08 18:38:38 UTC (rev 7433)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-04-08 19:07:31 UTC (rev 7434)
@@ -19,6 +19,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -30,7 +31,10 @@
import org.hibernate.console.KnownConfigurations;
import org.hibernate.eclipse.console.utils.ProjectUtils;
import org.hibernate.eclipse.launch.HibernateLaunchConstants;
+import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;
import org.jboss.tools.seam.ui.SeamUIMessages;
import org.jboss.tools.seam.ui.internal.project.facet.IValidator;
import org.jboss.tools.seam.ui.internal.project.facet.ValidatorFactory;
@@ -45,6 +49,7 @@
private IFieldEditor projectEditor;
private IFieldEditor configEditor;
private RadioField radios;
+ IProject rootSeamProject;
public SeamGenerateEnitiesWizardPage() {
super("seam.generate.entities.page", SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE, null); //$NON-NLS-1$
@@ -56,7 +61,8 @@
*/
public void createControl(Composite parent) {
setPageComplete(true);
- String projectName = SeamWizardUtils.getCurrentSelectedRootSeamProjectName();
+ rootSeamProject = SeamWizardUtils.getCurrentSelectedRootSeamProject();
+ String projectName = rootSeamProject==null?"":rootSeamProject.getName();
projectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(projectName);
projectEditor.addPropertyChangeListener(this);
if(projectName!=null && projectName.length()>0) {
@@ -106,6 +112,7 @@
radios.addPropertyChangeListener(this);
setControl(top);
+ validate();
}
private static String getConsoleConfigurationName(String seamWebProjectName) {
@@ -164,12 +171,45 @@
validate();
}
- private void validate() {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ protected boolean isProjectSettingsOk() {
+ if(rootSeamProject!=null) {
+ if(!isValidRuntimeConfigured(rootSeamProject)) {
+ return false;
+ }
+ IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(rootSeamProject);
+ return SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.ENTITY_BEAN_SOURCE_FOLDER, ""), false) &&
+ SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.SESSION_BEAN_SOURCE_FOLDER, ""), false) &&
+ SeamProjectPropertyValidator.isFolderPathValid(prefs.get(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, ""), false) &&
+ (ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(prefs.get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ISeamFacetDataModelProperties.DEPLOY_AS_WAR).trim()) || SeamProjectPropertyValidator.isProjectNameValid(prefs.get(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, ""), false));
+ }
+ return true;
+ }
+ /**
+ * @param project
+ */
+ protected boolean isValidRuntimeConfigured(IProject project) {
+ Map errors;
+ String seamRt = SeamCorePlugin.getSeamPreferences(project).get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,""); //$NON-NLS-1$
+ errors = ValidatorFactory.SEAM_RUNTIME_VALIDATOR.validate(seamRt, null);
if(errors.size()>0) {
setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
setPageComplete(false);
+ return false;
+ }
+ return true;
+ }
+
+ private void validate() {
+ Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+
+ if(errors.size()>0 || !isProjectSettingsOk()) {
+ Object errorMessage = errors.get(IValidator.DEFAULT_ERROR);
+ if(errorMessage==null) {
+ errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS;
+ }
+ setErrorMessage(errorMessage.toString());
+ setPageComplete(false);
return;
}
String config = (String)configEditor.getValue();
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java 2008-04-08 18:38:38 UTC (rev 7433)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java 2008-04-08 19:07:31 UTC (rev 7434)
@@ -15,8 +15,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.internal.ui.viewsupport.IViewPartInputProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IEditorInput;
@@ -24,12 +22,10 @@
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
/**
@@ -50,6 +46,21 @@
return getRootSeamProjectName(sel);
}
+ /**
+ *
+ * @return
+ */
+ public static IProject getCurrentSelectedRootSeamProject() {
+ ISelection sel = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getSelectionService().getSelection();
+ return getRootSeamProject(sel);
+ }
+
+ /**
+ *
+ * @param project
+ * @return
+ */
public static IProject getRootSeamProject(IProject project) {
if (project != null) {
ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, false);
@@ -78,7 +89,6 @@
}
/**
- *
* @param sel
* @return root seam project name based on the passed selection;
* name of project if selection contains a project which is not a seam project -
@@ -86,16 +96,31 @@
* empty string if selection contains no project
*/
public static String getRootSeamProjectName(ISelection sel) {
+ IProject project = getRootSeamProject(sel);
+ return project == null ? "" : project.getName();
+ }
+
+ /**
+ * @param sel
+ * @return project if selection contains a project which is not a seam project -
+ * in this case it is up to wizard to show what is the problem with the selection;
+ * null if selection contains no project
+ */
+ public static IProject getRootSeamProject(ISelection sel) {
IProject initial = getInitialProject(sel);
IProject project = getRootSeamProject(initial);
if(project == null) {
project = initial;
}
- return project == null ? "" : project.getName();
+ return project == null ? null : project;
}
+ /**
+ *
+ * @param simpleSelection
+ * @return
+ */
public static IProject getInitialProject(ISelection simpleSelection) {
-
IProject project = null;
if (simpleSelection != null && !simpleSelection.isEmpty()
&& simpleSelection instanceof IStructuredSelection) {
@@ -109,7 +134,7 @@
return resource.getProject();
}
}
-
+
if(project==null) {
IEditorPart activeEditor = getActivePage().getActiveEditor();
if(activeEditor!=null) {
@@ -122,16 +147,15 @@
}
return project;
}
-
+
private static IWorkbenchPage getActivePage() {
IWorkbenchWindow window= getWorkbench().getActiveWorkbenchWindow();
if (window == null)
return null;
return getWorkbench().getActiveWorkbenchWindow().getActivePage();
}
-
+
private static IWorkbench getWorkbench() {
return PlatformUI.getWorkbench();
}
-
-}
+}
\ No newline at end of file
17 years, 8 months
JBoss Tools SVN: r7433 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-04-08 14:38:38 -0400 (Tue, 08 Apr 2008)
New Revision: 7433
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamPathIndexer.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1999 Seam find references shows error dialog if some resources are out of sync
Non-synchronized files are excluded from the search scope.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamPathIndexer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamPathIndexer.java 2008-04-08 18:19:04 UTC (rev 7432)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamPathIndexer.java 2008-04-08 18:38:38 UTC (rev 7433)
@@ -51,6 +51,11 @@
if (proxy.getType() == IResource.FILE) {
IFile file = (IFile)proxy.requestResource();
+ if(!file.isSynchronized(IResource.DEPTH_ZERO)) {
+ // The resource is out of sync with the file system
+ // Just ignore this resource.
+ return false;
+ }
IContentDescription contentDescription = file.getContentDescription();
String ctId = null;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2008-04-08 18:19:04 UTC (rev 7432)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2008-04-08 18:38:38 UTC (rev 7433)
@@ -1283,12 +1283,22 @@
public boolean visit(IResourceProxy proxy) {
if (fScope == null)
return false;
+
boolean inScope= fScope.contains(proxy);
- if (inScope && proxy.getType() == IResource.FILE &&
- fProject == proxy.requestResource().getProject()) {
- fFiles.add(proxy.requestResource());
+ if (inScope && proxy.getType() == IResource.FILE) {
+ IFile file = (IFile)proxy.requestResource();
+ if(!file.isSynchronized(IResource.DEPTH_ZERO)) {
+ // The resource is out of sync with the file system
+ // Just ignore this resource.
+ return false;
+ }
+
+ if (fProject == file.getProject()) {
+ fFiles.add(proxy.requestResource());
+ }
}
+
return inScope;
}
17 years, 8 months
JBoss Tools SVN: r7432 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-04-08 14:19:04 -0400 (Tue, 08 Apr 2008)
New Revision: 7432
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1993
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-04-08 18:15:11 UTC (rev 7431)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-04-08 18:19:04 UTC (rev 7432)
@@ -24,7 +24,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.DialogSettings;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -100,7 +100,7 @@
boolean interrupted= true;
while (interrupted) {
try {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
+ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
interrupted= false;
} catch (InterruptedException e) {
interrupted= true;
17 years, 8 months