February 2009 - jbosstools-commits

JBoss Tools SVN: r13683 - trunk/seam/docs/reference/en/images/seam_editors.

by jbosstools-commits＠lists.jboss.org

Author: msorokin Date: 2009-02-19 11:44:01 -0500 (Thu, 19 Feb 2009) New Revision: 13683 Modified: trunk/seam/docs/reference/en/images/seam_editors/seam_editors_6.png Log: https://jira.jboss.org/jira/browse/JBDS-367 updated an image Modified: trunk/seam/docs/reference/en/images/seam_editors/seam_editors_6.png =================================================================== (Binary files differ)

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13682 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: xpl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2009-02-19 10:33:58 -0500 (Thu, 19 Feb 2009) New Revision: 13682 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java Log: https://jira.jboss.org/jira/browse/JBIDE-3805 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2009-02-19 15:09:14 UTC (rev 13681) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2009-02-19 15:33:58 UTC (rev 13682) @@ -265,7 +265,12 @@ model = StructuredModelManager.getModelManager() .getExistingModelForRead( getSourceEditor().getTextViewer().getDocument()); - + + //fix for JBIDE-3805, mareshkau + if(model==null) { + return; + } + Point range = SelectionUtil .getSourceSelectionRange(getSourceEditor()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java 2009-02-19 15:09:14 UTC (rev 13681) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/SashSetting.java 2009-02-19 15:33:58 UTC (rev 13682) @@ -55,7 +55,10 @@ sb.append(EditorSettings.SEPERATOR); sb.append(sash.getSavedWeight()); try { + //fix for JBIDE-3805 + if(resource.exists()) { resource.setPersistentProperty(name,sb.toString()); + } } catch (CoreException e) { VpePlugin.getPluginLog().logError(e); }

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13681 - trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools.

by jbosstools-commits＠lists.jboss.org

Author: artdaw Date: 2009-02-19 10:09:14 -0500 (Thu, 19 Feb 2009) New Revision: 13681 Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf-diff.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-diff.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-diff.xsl Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl Log: https://jira.jboss.org/jira/browse/RF-5655 - xsl files for the release, diffmk profiles were added Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl 2009-02-19 15:09:14 UTC (rev 13681) @@ -0,0 +1,21 @@ +<?xml version='1.0'?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0"> + +  + <xsl:template match="//diffmk:wrapper"> + <xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <xsl:text> </xsl:text> + </xsl:when> + <xsl:when test="parent::node()[local-name()='title']"> + <xsl:value-of select="."/> + </xsl:when> + <xsl:otherwise> + <span class="diffmkwrapper"> + <xsl:value-of select="."/> + </span> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + </xsl:stylesheet> + Property changes on: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common-diff.xsl ___________________________________________________________________ Name: svn:executable + * Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-02-19 15:06:44 UTC (rev 13680) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2009-02-19 15:09:14 UTC (rev 13681) @@ -11,6 +11,8 @@  <xsl:param name="html.stylesheet" select="'css/tools.css'"/> + + <xsl:template name="head.content"> <xsl:param name="node" select="."/> <xsl:param name="title"> @@ -59,13 +61,40 @@ </xsl:template> +  + <xsl:template name="markerTypes"> + <xsl:param name="marker-type" /> + <xsl:param name="marker-value" /> + <xsl:choose> + <xsl:when test="$marker-type = 'attribute'"> + <xsl:attribute name="class"> + <xsl:value-of select="$marker-value" /> + </xsl:attribute> + </xsl:when> + <xsl:when test="$marker-type = 'image'"> + <xsl:choose> + <xsl:when test="$marker-value='changed'"> + <img src="images/updated.png" alt="updated" class="img_marker" /> + </xsl:when> + <xsl:when test="$marker-value='added'"> + <img src="images/new.png" alt="updated" class="img_marker" /> + </xsl:when> + </xsl:choose> + </xsl:when> + </xsl:choose> + </xsl:template> + +  <xsl:template name="toc.line"> <xsl:param name="toc-context" select="."/> <xsl:param name="depth" select="1"/> <xsl:param name="depth.from.context" select="8"/> - + + <xsl:param name="min-diff" select="10"/> + <xsl:param name="pos" select="position()"/> + <span> <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute> @@ -88,26 +117,29 @@ <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> </xsl:attribute> - - <xsl:choose> - <xsl:when test="@role='new' or @role='updated'"> - <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> - </xsl:when> -  - <xsl:when test="@revisionflag='added' or @revisionflag='changed'"> - <xsl:attribute name="class"> - <xsl:value-of select="@revisionflag"/> - </xsl:attribute> - </xsl:when> - <xsl:when test="@diffmk:change='added' or @diffmk:change='changed'"> - <xsl:attribute name="class"> - <xsl:value-of select="@diffmk:change"/> - </xsl:attribute> - </xsl:when> - </xsl:choose> - + + <xsl:choose> + <xsl:when test="local-name(.)='section' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='chapter' and current()/@diffmk:change='added'"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="local-name(.)='section' and current()//diffmk:wrapper"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">attribute</xsl:with-param> + <xsl:with-param name="marker-value">updated</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + +   <xsl:if test="not($autotoc.label.in.hyperlink = 0)"> @@ -126,7 +158,9 @@ </xsl:template>  - <xsl:template match="//diffmk:wrapper"> + +  + <xsl:template match="//diffmk:wrapper"> <xsl:choose> <xsl:when test="@diffmk:change='deleted'"> <xsl:text> </xsl:text> @@ -135,62 +169,14 @@ <xsl:value-of select="."/> </xsl:when> <xsl:otherwise> - <span class="diffmkwrapper"> <xsl:value-of select="."/> - </span> </xsl:otherwise> </xsl:choose> </xsl:template> -  - <xsl:template match="abstract" mode="titlepage.mode"> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="paragraph"> @@ -204,6 +190,8 @@ <xsl:template name="component.title"> <xsl:param name="node" select="."/> + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> <xsl:variable name="level"> <xsl:choose> @@ -236,19 +224,26 @@ <xsl:with-param name="allow-anchors" select="1"/> </xsl:apply-templates> </xsl:element> - - <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> - <img src="images/new.png" alt="new" class="img_marker" /> - </xsl:when> -  - <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> - <img src="images/updated.png" alt="updated" class="img_marker" /> - </xsl:when> - </xsl:choose> + +  + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::node()[name(.)!='section']/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> + </xsl:when> + </xsl:choose> + </xsl:template> - + <xsl:template name="section.heading"> <xsl:param name="section" select="."/> @@ -256,7 +251,9 @@ <xsl:param name="allow-anchors" select="1"/> <xsl:param name="title"/> <xsl:param name="class" select="'title'"/> - + <xsl:param name="pos" select="position()"/> + <xsl:param name="min-diff" select="10"/> + <xsl:variable name="id"> <xsl:choose>  @@ -305,15 +302,23 @@ </xsl:if> <xsl:copy-of select="$title"/> </xsl:element> - <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> - <img src="images/new.png" alt="new" class="img_marker" /> - </xsl:when> -  - <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> - <img src="images/updated.png" alt="updated" class="img_marker" /> + +  + <xsl:choose> + <xsl:when test="current()/parent::node()[@diffmk:change='added']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">added</xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:when test="current()/following-sibling::*/descendant-or-self::node()[name()='diffmk:wrapper']"> + <xsl:call-template name="markerTypes"> + <xsl:with-param name="marker-type">image</xsl:with-param> + <xsl:with-param name="marker-value">changed</xsl:with-param> + </xsl:call-template> </xsl:when> </xsl:choose> + </xsl:template>  Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf-diff.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf-diff.xsl 2009-02-19 15:09:14 UTC (rev 13681) @@ -0,0 +1,28 @@ +<?xml version='1.0'?> + + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> + + <xsl:import href="classpath:/xslt/org/jboss/pdf.xsl"/> + <xsl:import href="pdf.xsl"/> + + +<xsl:template match="//diffmk:wrapper"> +<xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <fo:inline> </fo:inline> + </xsl:when> + <xsl:otherwise> + <fo:inline background-color="#cce2f6"> + <xsl:value-of select="."/><xsl:text> </xsl:text> + </fo:inline> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +</xsl:stylesheet> Property changes on: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf-diff.xsl ___________________________________________________________________ Name: svn:executable + * Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-02-19 15:06:44 UTC (rev 13680) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-02-19 15:09:14 UTC (rev 13681) @@ -32,16 +32,9 @@ </xsl:template> <xsl:template match="//diffmk:wrapper"> -<xsl:choose> - <xsl:when test="@diffmk:change='deleted'"> - <fo:inline> </fo:inline> - </xsl:when> - <xsl:otherwise> - <fo:inline background-color="#cce2f6"> + <fo:inline> <xsl:value-of select="."/><xsl:text> </xsl:text> </fo:inline> - </xsl:otherwise> - </xsl:choose> - </xsl:template> +</xsl:template> </xsl:stylesheet> Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-diff.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-diff.xsl 2009-02-19 15:09:14 UTC (rev 13681) @@ -0,0 +1,6 @@ +<?xml version='1.0'?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0"> + <xsl:import href="xhtml.xsl"/> + <xsl:import href="common-diff.xsl"/> + </xsl:stylesheet> + Property changes on: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-diff.xsl ___________________________________________________________________ Name: svn:executable + * Added: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-diff.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-diff.xsl (rev 0) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-diff.xsl 2009-02-19 15:09:14 UTC (rev 13681) @@ -0,0 +1,6 @@ +<?xml version='1.0'?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:diffmk="http://diffmk.sf.net/ns/diff" version="1.0"> + <xsl:import href="xhtml-single.xsl"/> + <xsl:import href="common-diff.xsl"/> + </xsl:stylesheet> + Property changes on: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/xhtml-single-diff.xsl ___________________________________________________________________ Name: svn:executable + *

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13680 - trunk/as/docs/reference.

by jbosstools-commits＠lists.jboss.org

Author: artdaw Date: 2009-02-19 10:06:44 -0500 (Thu, 19 Feb 2009) New Revision: 13680 Modified: trunk/as/docs/reference/pom.xml Log: https://jira.jboss.org/jira/browse/RF-5655 - release, diffmk profiles were added Modified: trunk/as/docs/reference/pom.xml =================================================================== --- trunk/as/docs/reference/pom.xml 2009-02-19 13:38:05 UTC (rev 13679) +++ trunk/as/docs/reference/pom.xml 2009-02-19 15:06:44 UTC (rev 13680) @@ -12,9 +12,18 @@ <profiles> <profile> + <id>release</id> + <properties> + <master>master_output.xml</master> + </properties> + </profile> + <profile> <id>diffmk</id> <properties> - <master>master_output.xml</master> + <master>master_output.xml</master> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single-diff.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml-diff.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf-diff.xsl</xsl-pdf> </properties> </profile> </profiles> @@ -30,10 +39,15 @@ <dependencies> <dependency> + <groupId>org.jboss.tools</groupId> + <artifactId>jbosstools-docbook-xslt</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> +  <dependency> <groupId>org.jboss</groupId> <artifactId>jbossorg-jdocbook-style</artifactId> @@ -58,22 +72,22 @@ <formats> <format> <formatName>pdf</formatName> - <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/pdf.xsl</stylesheetResource> + <stylesheetResource>${xsl-pdf}</stylesheetResource> <finalName>${pom.name}.pdf</finalName> </format> <format> <formatName>html</formatName> - <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml.xsl</stylesheetResource> + <stylesheetResource>${xsl-chunked}</stylesheetResource> <finalName>index.html</finalName> </format> <format> <formatName>html_single</formatName> - <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/xhtml-single.xsl</stylesheetResource> + <stylesheetResource>${xsl-single}</stylesheetResource> <finalName>index.html</finalName> </format> <format> <formatName>eclipse</formatName> - <stylesheetResource>file:${pom.basedir}/${stylesdir}/xslt/org/jboss/tools/eclipse.xsl</stylesheetResource> + <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource> <finalName>index.html</finalName> </format> </formats> @@ -108,7 +122,9 @@ </distributionManagement> <properties> - <stylesdir>../../../documentation/jbosstools-docbook-xslt/src/main/resources/</stylesdir> + <xsl-single>classpath:/xslt/org/jboss/tools/xhtml-single.xsl</xsl-single> + <xsl-chunked>classpath:/xslt/org/jboss/tools/xhtml.xsl</xsl-chunked> + <xsl-pdf>classpath:/xslt/org/jboss/tools/pdf.xsl</xsl-pdf> <cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir> <master>master.xml</master> <translation>en-US</translation>

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13679 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core: validation and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2009-02-19 08:38:05 -0500 (Thu, 19 Feb 2009) New Revision: 13679 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java Log: https://jira.jboss.org/jira/browse/JBIDE-3822 validate files only in webcontent folder (in case of WTP project) and java source path. - Fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-02-19 13:22:16 UTC (rev 13678) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-02-19 13:38:05 UTC (rev 13679) @@ -21,7 +21,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-02-19 13:22:16 UTC (rev 13678) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-02-19 13:38:05 UTC (rev 13679) @@ -15,6 +15,7 @@ import java.util.List; import java.util.Set; +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -23,12 +24,19 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner; import org.eclipse.jdt.ui.text.IJavaPartitions; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.Token; +import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; @@ -81,6 +89,7 @@ private ElVarSearcher elVarSearcher; private IProject currentProject; private IResource[] currentSources; + private IContainer webRootFolder; public SeamELValidator(SeamValidatorManager validatorManager, SeamContextValidationHelper coreHelper, IReporter reporter, @@ -147,20 +156,40 @@ // Just ignore this resource. return false; } - if(!JAVA_EXT.equalsIgnoreCase(file.getFileExtension())) { - return true; - } IProject project = file.getProject(); if(!project.equals(currentProject)) { + IFacetedProject facetedProject = null; + try { + facetedProject = ProjectFacetsManager.create(project); + } catch (CoreException e) { + SeamCorePlugin.getDefault().logError(SeamCoreMessages.SEAM_EL_VALIDATOR_ERROR_VALIDATING_SEAM_EL, e); + } + webRootFolder = null; + if(facetedProject!=null && facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.DYNAMIC_WEB_FACET)!=null) { + IVirtualComponent component = ComponentCore.createComponent(project); + if(component!=null) { + IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ + webRootFolder = webRootVirtFolder.getUnderlyingFolder(); + } + } currentProject = project; currentSources = EclipseResourceUtil.getJavaSourceRoots(project); } + // Validate all files from java source folders. for (int i = 0; i < currentSources.length; i++) { if(currentSources[i].getLocation().isPrefixOf(file.getLocation())) { return true; } } - return false; + // If *.java is out of Java Source path then ignore it. + if(JAVA_EXT.equalsIgnoreCase(file.getFileExtension())) { + return false; + } + // Otherwise validate only files from Web-Content (in case of WTP project) + if(webRootFolder!=null) { + return webRootFolder.getLocation().isPrefixOf(file.getLocation()); + } + return true; } private void validateFile(IFile file) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2009-02-19 13:22:16 UTC (rev 13678) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamValidatorManager.java 2009-02-19 13:38:05 UTC (rev 13679) @@ -19,7 +19,6 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.eclipse.wst.validation.internal.provisional.core.IValidationContext; import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob; -import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.internal.core.SeamProject;

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13678 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-02-19 08:22:16 -0500 (Thu, 19 Feb 2009) New Revision: 13678 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SerializationTest.java Log: JBIDE-3818 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2009-02-19 13:20:24 UTC (rev 13677) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2009-02-19 13:22:16 UTC (rev 13678) @@ -83,15 +83,15 @@ public void testBigProject() { ISeamProject sp = getSeamProject(); - Set<ISeamComponent> cs = sp.getComponents(); - int components = cs.size(); + ISeamComponent[] cs = sp.getComponents(); + int components = cs.length; if(components < 500) { fail("Found only " + components + " components. Must be more than 500."); } SeamProject impl = (SeamProject)sp; System.out.println("Full build of " + components + " components completed in " + impl.fullBuildTime + "ms"); long time = impl.reload(); - System.out.println("Reloaded " + sp.getComponents().size() + " components in " + time + "ms"); + System.out.println("Reloaded " + sp.getComponents().length + " components in " + time + "ms"); List<Long> statistics = impl.statistics; impl.statistics = null; assertTrue("Statistics contains less than 500 items", statistics.size() >= 500); @@ -133,7 +133,7 @@ provider.dispose(); } - private void generateLongXHTML(Set<ISeamComponent> cs) { + private void generateLongXHTML(ISeamComponent[] cs) { StringBuffer sb = new StringBuffer(); IFolder webContent = project.getFolder("WebContent"); Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SerializationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SerializationTest.java 2009-02-19 13:20:24 UTC (rev 13677) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SerializationTest.java 2009-02-19 13:22:16 UTC (rev 13678) @@ -65,7 +65,7 @@ public void testXMLSerialization() { Element root = XMLUtilities.createDocumentElement("root"); ISeamProject seamProject = getSeamProject(); - Set<ISeamComponent> cs = seamProject.getComponents(); + ISeamComponent[] cs = seamProject.getComponents(); for (ISeamComponent c: cs) { Set<ISeamComponentDeclaration> ds = c.getAllDeclarations(); for (ISeamComponentDeclaration d: ds) { @@ -92,7 +92,7 @@ root.removeChild(e); } } - Set<ISeamFactory> fs = seamProject.getFactories(); + ISeamFactory[] fs = seamProject.getFactories(); for (ISeamFactory f: fs) { Properties context = new Properties(); context.put(SeamXMLConstants.ATTR_PATH, f.getSourcePath()); @@ -120,7 +120,7 @@ ISeamProject sp = getSeamProject(); long time = ((SeamProject)sp).reload(); - int components = sp.getComponents().size(); + int components = sp.getComponents().length; System.out.print("Reloaded " + components + " components in " + time + " ms"); float timePerComponent = 1f * time / components; @@ -131,14 +131,15 @@ public void testCleanBuild() { ISeamProject sp = getSeamProject(); try { - int components_1 = sp.getComponents().size(); + boolean auto = ResourcesUtils.setBuildAutomatically(false); + sp.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null); + int components_1 = sp.getComponents().length; assertFalse(components_1 == 0); - boolean auto = ResourcesUtils.setBuildAutomatically(false); sp.getProject().build(IncrementalProjectBuilder.CLEAN_BUILD, null); - int components_2 = sp.getComponents().size(); + int components_2 = sp.getComponents().length; assertTrue(components_2 == 0); sp.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null); - int components_3 = sp.getComponents().size(); + int components_3 = sp.getComponents().length; assertEquals(components_1, components_3); ResourcesUtils.setBuildAutomatically(auto);

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13677 - 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: scabanovich Date: 2009-02-19 08:20:24 -0500 (Thu, 19 Feb 2009) New Revision: 13677 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java Log: JBIDE-3818 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java 2009-02-19 13:18:59 UTC (rev 13676) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/SeamLinkHelper.java 2009-02-19 13:20:24 UTC (rev 13677) @@ -73,7 +73,7 @@ ISeamProject seamProject = SeamCorePlugin.getSeamProject(jp.getProject(), true); if(seamProject == null) return null; IType type = cf.getType(); - Set<ISeamComponent> cs = seamProject.getComponents(); + ISeamComponent[] cs = seamProject.getComponents(); for (ISeamComponent c : cs) { ISeamJavaComponentDeclaration d = c.getJavaDeclaration(); IMember m = d.getSourceMember(); 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 2009-02-19 13:18:59 UTC (rev 13676) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2009-02-19 13:20:24 UTC (rev 13677) @@ -128,11 +128,8 @@ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); if (seamProject != null) { - Iterator<ISeamComponent> iter = seamProject.getComponents() - .iterator(); - while (iter.hasNext()) { - ISeamComponent component = iter.next(); - + ISeamComponent[] iter = seamProject.getComponents(); + for (ISeamComponent component: iter) { if (SeamReferencedFilter .isComponentDeclaredInThisProject(component)) contentProvider.add(new SeamComponentWrapper(component

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13676 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-02-19 08:18:59 -0500 (Thu, 19 Feb 2009) New Revision: 13676 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java Log: JBIDE-3818 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2009-02-19 13:00:42 UTC (rev 13675) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamProject.java 2009-02-19 13:18:59 UTC (rev 13676) @@ -140,7 +140,7 @@ /** * @return Set of all ISeamComponents of project */ - public Set<ISeamComponent> getComponents(); + public ISeamComponent[] getComponents(); /** * Adds component into project @@ -199,7 +199,7 @@ /** * @return all factories methods of project */ - public Set<ISeamFactory> getFactories(); + public ISeamFactory[] getFactories(); /** * @return Factories methods of project by name and scope Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2009-02-19 13:00:42 UTC (rev 13675) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamJavaComponentDeclaration.java 2009-02-19 13:18:59 UTC (rev 13676) @@ -201,7 +201,7 @@ return null; } SeamProject p = (SeamProject)getSeamProject(); - return p == null ? null : p.getAllJavaComponentDeclarations().get(superclass); + return p == null ? null : p.getJavaComponentDeclaration(superclass); } public Set<IRole> getRoles() { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-19 13:00:42 UTC (rev 13675) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2009-02-19 13:18:59 UTC (rev 13676) @@ -760,8 +760,8 @@ /** * */ - public Set<ISeamComponent> getComponents() { - return components.allComponentsSet; + public ISeamComponent[] getComponents() { + return components.getAllComponentsArray(); } /** @@ -1338,8 +1338,8 @@ /** * */ - public Set<ISeamFactory> getFactories() { - return factories.allFactories; + public ISeamFactory[] getFactories() { + return factories.getAllFactoriesArray(); } /** @@ -1347,7 +1347,7 @@ */ public Set<ISeamFactory> getFactories(String name, ScopeType scope) { Set<ISeamFactory> result = new HashSet<ISeamFactory>(); - for (ISeamFactory f: factories.allFactories) { + for (ISeamFactory f: getFactories()) { if(name.equals(f.getName()) && scope.equals(f.getScope())) result.add(f); } return result; @@ -1358,7 +1358,7 @@ */ public Set<ISeamFactory> getFactoriesByName(String name) { Set<ISeamFactory> result = new HashSet<ISeamFactory>(); - for (ISeamFactory f: factories.allFactories) { + for (ISeamFactory f: getFactories()) { if(name.equals(f.getName())) result.add(f); } return result; @@ -1376,7 +1376,7 @@ */ public Set<ISeamFactory> getFactoriesByScope(ScopeType scope, boolean addVisibleScopes) { Set<ISeamFactory> result = new HashSet<ISeamFactory>(); - for (ISeamFactory f: factories.allFactories) { + for (ISeamFactory f: getFactories()) { if(isVisibleInScope(f, scope, addVisibleScopes)) { result.add(f); } @@ -1408,20 +1408,24 @@ * that does not create a seam component. * @return */ - public Map<String, SeamJavaComponentDeclaration> getAllJavaComponentDeclarations() { - return components.javaDeclarations; + public ISeamJavaComponentDeclaration[] getAllJavaComponentDeclarations() { + return components.getJavaDeclarationsArray(); } + public ISeamJavaComponentDeclaration getJavaComponentDeclaration(String className) { + return components.getJavaDeclaration(className); + } + /** * Returns set of java classes that contain seam annotations with specified path. * They may be seam components, as well as cases of incomplete annotating * that does not create a seam component. * @return */ - public Set<SeamJavaComponentDeclaration> findJavaDeclarations(IPath source) { + public Set<ISeamJavaComponentDeclaration> findJavaDeclarations(IPath source) { //TODO map needed - Set<SeamJavaComponentDeclaration> set = new HashSet<SeamJavaComponentDeclaration>(); - for (SeamJavaComponentDeclaration d: components.javaDeclarations.values()) { + Set<ISeamJavaComponentDeclaration> set = new HashSet<ISeamJavaComponentDeclaration>(); + for (ISeamJavaComponentDeclaration d: components.getJavaDeclarationsArray()) { if(source.equals(d.getSourcePath())) set.add(d); } return set; @@ -1574,7 +1578,7 @@ */ Map<IPath, LoadedDeclarations> getAllDeclarations() throws CloneNotSupportedException { Map<IPath, LoadedDeclarations> map = new HashMap<IPath, LoadedDeclarations>(); - for (ISeamComponent c : components.allComponentsSet) { + for (ISeamComponent c : getComponents()) { for (ISeamComponentDeclaration d : c.getAllDeclarations()) { IPath p = d.getSourcePath(); if(p == null || EclipseResourceUtil.isJar(p.toString())) continue; @@ -1599,7 +1603,7 @@ ds.getNamespaces().add(n); } } - for (ISeamFactory f : factories.allFactories) { + for (ISeamFactory f : getFactories()) { IPath p = f.getSourcePath(); if(p == null || EclipseResourceUtil.isJar(p.toString())) continue; LoadedDeclarations ds = map.get(p); @@ -1772,32 +1776,66 @@ } class ComponentStorage { - Set<ISeamComponent> allComponentsSet = new HashSet<ISeamComponent>(); + private Set<ISeamComponent> allComponentsSet = new HashSet<ISeamComponent>(); Map<String, SeamComponent> allComponents = new HashMap<String, SeamComponent>(); Map<String, SeamJavaComponentDeclaration> javaDeclarations = new HashMap<String, SeamJavaComponentDeclaration>(); + ISeamJavaComponentDeclaration[] javaDeclarationsArray = null; + Map<IPath, Set<SeamComponentDeclaration>> declarationsBySource = new HashMap<IPath, Set<SeamComponentDeclaration>>(); Map<String, Set<SeamComponentDeclaration>> declarationsByClassName = new HashMap<String, Set<SeamComponentDeclaration>>(); public void clear() { - allComponentsSet.clear(); + synchronized(allComponentsSet) { + allComponentsSet.clear(); + } allComponents.clear(); - javaDeclarations.clear(); + synchronized(javaDeclarations) { + javaDeclarations.clear(); + javaDeclarationsArray = null; + } declarationsBySource.clear(); declarationsByClassName.clear(); } - + + public ISeamComponent[] getAllComponentsArray() { + synchronized(allComponentsSet) { + return components.allComponentsSet.toArray(new ISeamComponent[0]); + } + } + + public ISeamJavaComponentDeclaration[] getJavaDeclarationsArray() { + ISeamJavaComponentDeclaration[] result = javaDeclarationsArray; + if(result == null) { + synchronized(javaDeclarations) { + javaDeclarationsArray = new ISeamJavaComponentDeclaration[javaDeclarations.values().size()]; + result = javaDeclarationsArray; + int i = 0; + for (ISeamJavaComponentDeclaration d: javaDeclarations.values()) { + javaDeclarationsArray[i++] = d; + } + } + } + return result; + } public SeamComponent getByName(String name) { - return name == null ? null : allComponents.get(name); + if(name == null) return null; + synchronized(allComponentsSet) { + return allComponents.get(name); + } } public void removeComponent(ISeamComponent c) { - allComponentsSet.remove(c); + synchronized(allComponentsSet) { + allComponentsSet.remove(c); + } allComponents.remove(c.getName()); } public void addComponent(ISeamComponent c) { - allComponentsSet.add(c); + synchronized(allComponentsSet) { + allComponentsSet.add(c); + } allComponents.put(c.getName(), (SeamComponent)c); } @@ -1812,7 +1850,10 @@ if(d instanceof ISeamJavaComponentDeclaration) { SeamJavaComponentDeclaration jd = (SeamJavaComponentDeclaration)d; for (ISeamContextVariable v: jd.getDeclaredVariables()) addVariable(v); - javaDeclarations.put(jd.getClassName(), jd); + synchronized(javaDeclarations) { + javaDeclarations.put(jd.getClassName(), jd); + javaDeclarationsArray = null; + } addDeclaration(jd.getClassName(), jd); } else if(d instanceof ISeamXmlComponentDeclaration) { ISeamXmlComponentDeclaration xd = (ISeamXmlComponentDeclaration)d; @@ -1838,7 +1879,9 @@ } public SeamJavaComponentDeclaration getJavaDeclaration(String className) { - return javaDeclarations.get(className); + synchronized(javaDeclarations) { + return javaDeclarations.get(className); + } } public Set<SeamComponentDeclaration> getDeclarationsByClasName(String className) { @@ -1857,7 +1900,10 @@ private void removeDeclarationWithClass(SeamComponentDeclaration d) { if(d instanceof ISeamJavaComponentDeclaration) { SeamJavaComponentDeclaration jd = (SeamJavaComponentDeclaration)d; - javaDeclarations.remove(jd.getClassName()); + synchronized(javaDeclarations) { + javaDeclarations.remove(jd.getClassName()); + javaDeclarationsArray = null; + } for (ISeamContextVariable v: jd.getDeclaredVariables()) removeVariable(v); removeDeclaration(jd.getClassName(), d); } else if(d instanceof ISeamXmlComponentDeclaration) { @@ -1900,22 +1946,40 @@ } class FactoryStorage { - protected Set<ISeamFactory> allFactories = new HashSet<ISeamFactory>(); + private Set<ISeamFactory> allFactories = new HashSet<ISeamFactory>(); + private ISeamFactory[] allFactoriesArray = null; Map<IPath, Set<ISeamFactory>> factoriesBySource = new HashMap<IPath, Set<ISeamFactory>>(); SeamMessages messages = null; public void clear() { - allFactories.clear(); + synchronized(allFactories) { + allFactories.clear(); + allFactoriesArray = null; + } factoriesBySource.clear(); messages = null; } + public ISeamFactory[] getAllFactoriesArray() { + ISeamFactory[] result = allFactoriesArray; + if(result == null) { + synchronized(allFactories) { + allFactoriesArray = allFactories.toArray(new ISeamFactory[0]); + result = allFactoriesArray; + } + } + return result; + } + public Set<ISeamFactory> getFactoriesBySource(IPath path) { return factoriesBySource.get(path); } public void addFactory(ISeamFactory f) { - allFactories.add(f); + synchronized(allFactories) { + allFactories.add(f); + allFactoriesArray = null; + } IPath path = f.getSourcePath(); if(path != null) { Set<ISeamFactory> fs = factoriesBySource.get(path); @@ -1932,7 +1996,10 @@ } public void removeFactory(ISeamFactory f) { - allFactories.remove(f); + synchronized(allFactories) { + allFactories.remove(f); + allFactoriesArray = null; + } IPath path = f.getSourcePath(); if(path != null) { Set<ISeamFactory> fs = factoriesBySource.get(path); @@ -1953,7 +2020,10 @@ Set<ISeamFactory> fs = factoriesBySource.get(path); if(fs == null) return null; for (ISeamFactory f: fs) { - allFactories.remove(f); + synchronized(allFactories) { + allFactories.remove(f); + allFactoriesArray = null; + } removeVariable(f); if(f == messages) messages = null; } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-02-19 13:00:42 UTC (rev 13675) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-02-19 13:18:59 UTC (rev 13676) @@ -185,8 +185,8 @@ newResources.addAll(unnamedResources); for (IPath path : newResources) { displaySubtask(VALIDATING_RESOURCE_MESSAGE_ID, new String[]{projectName, path.toString()}); - Set<SeamJavaComponentDeclaration> declarations = ((SeamProject)seamProject).findJavaDeclarations(path); - for (SeamJavaComponentDeclaration d : declarations) { + Set<ISeamJavaComponentDeclaration> declarations = ((SeamProject)seamProject).findJavaDeclarations(path); + for (ISeamJavaComponentDeclaration d : declarations) { validateMethodsOfUnknownComponent(d); } } @@ -200,14 +200,14 @@ * @see org.jboss.tools.seam.internal.core.validation.ISeamValidator#validateAll() */ public IStatus validateAll() throws ValidationException { - Set<ISeamComponent> components = Collections.unmodifiableSet(seamProject.getComponents()); + ISeamComponent[] components = seamProject.getComponents(); for (ISeamComponent component : components) { if(reporter.isCancelled()) { return OK_STATUS; } validateComponent(component); } - Set<ISeamFactory> factories = Collections.unmodifiableSet(seamProject.getFactories()); + ISeamFactory[] factories = seamProject.getFactories(); Set<String> markedDuplicateFactoryNames = new HashSet<String>(); for (ISeamFactory factory : factories) { if(reporter.isCancelled()) { @@ -216,9 +216,8 @@ validateFactory(factory, markedDuplicateFactoryNames); } - Map<String,SeamJavaComponentDeclaration> declarations = ((SeamProject)seamProject).getAllJavaComponentDeclarations(); - Collection<SeamJavaComponentDeclaration> values = declarations.values(); - for (SeamJavaComponentDeclaration d : values) { + ISeamJavaComponentDeclaration[] values = ((SeamProject)seamProject).getAllJavaComponentDeclarations(); + for (ISeamJavaComponentDeclaration d : values) { if(reporter.isCancelled()) { return OK_STATUS; }

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13675 - in trunk/vpe/tests/org.jboss.tools.vpe.test: resources and 15 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-02-19 08:00:42 -0500 (Thu, 19 Feb 2009) New Revision: 13675 Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.classpath trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.project trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/.jsdtscope trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jdt.core.prefs trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.component trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/Messages.properties trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/User.java trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/META-INF/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/Messages.properties trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/User.class trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/faces-config.xml trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/common-annotations.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-beanutils.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-collections.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-digester.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-logging.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/jsf-tlds.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/jstl.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/standard.jar trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/web.xml trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/index.jsp trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/hello.jsp trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/inputUserName.jsp trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.properties trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.xml trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-3793, JUnit test for VpeResourceDialog. Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.classpath =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.classpath (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.classpath 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0.14"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_16"/> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.classpath ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.project =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.project (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.project 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>TestProject</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.common.verification.verifybuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.project ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/.jsdtscope =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/.jsdtscope (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/.jsdtscope 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jdt.core.prefs 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,7 @@ +#Wed Feb 18 17:58:24 EET 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,4 @@ +#Wed Feb 18 17:58:24 EET 2009 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_16/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v6.0.14/owners=jst.web\:2.5 +eclipse.preferences.version=1 Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.component 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="TestProject"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="TestProject"/> +<property name="java-output-path"/> +</wb-module> +</project-modules> Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="Apache Tomcat v6.0.14"/> + <fixed facet="jst.web"/> + <fixed facet="jst.java"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.5"/> +</faceted-project> Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/Messages.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/Messages.properties (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/Messages.properties 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/User.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/User.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/User.java 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by JBoss Developer Studio + */ +public class User { + + private String name; + + /** + * @return User Name + */ + public String getName() { + return name; + } + + /** + * @param User Name + */ + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/JavaSource/demo/User.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/META-INF/MANIFEST.MF 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/Messages.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/Messages.properties (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/Messages.properties 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/User.class =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/classes/demo/User.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/faces-config.xml 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + <managed-bean> + <description>User Name Bean</description> + <managed-bean-name>user</managed-bean-name> + <managed-bean-class>demo.User</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <property-class>java.lang.String</property-class> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/inputUserName.jsp</from-view-id> + <navigation-case> + <from-outcome>hello</from-outcome> + <to-view-id>/pages/hello.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <application> + <locale-config/> + </application> + <factory/> + <lifecycle/> +</faces-config> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/common-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/common-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-digester.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-digester.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/jsf-tlds.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/jsf-tlds.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/jstl.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/standard.jar =================================================================== (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/lib/standard.jar ___________________________________________________________________ Name: svn:mime-type + application/x-jar Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/web.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/web.xml 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<web-app version="2.5" +xmlns="http://java.sun.com/xml/ns/javaee" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup> 1 </load-on-startup> + </servlet> + + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + +</web-app> Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/index.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/index.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/index.jsp 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,7 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + <body> + <jsp:forward page="/pages/inputUserName.jsf" /> + </body> +</html> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/hello.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/hello.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/hello.jsp 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,20 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + +<f:loadBundle var="Message" basename="demo.Messages" /> + +<html> + <head> + <title>Hello!</title> + </head> + + <body> + <f:view> + <h3> + <h:outputText value="#{Message.hello_message}" />, + <h:outputText value="#{user.name}" />! + </h3> + </f:view> + </body> + +</html> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/hello.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/inputUserName.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/inputUserName.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/inputUserName.jsp 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,28 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> + +<f:loadBundle var="Message" basename="demo.Messages"/> + +<html> + <head> + <title>Input User Name Page</title> + </head> + <body> + + <f:view> + <h1><h:outputText value="#{Message.header}"/></h1> + + <h:messages style="color: red"/> + + <h:form id="greetingForm"> + <h:outputText value="#{Message.prompt_message}"/> + <h:inputText value="#{user.name}" required="true"> + <f:validateLength maximum="30" minimum="3"/> + </h:inputText> + + <h:commandButton action="hello" value="Say Hello!" /> + + </h:form> + </f:view> + </body> +</html> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/WebContent/pages/inputUserName.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.properties =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.properties (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.properties 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,3 @@ +# +#Wed Feb 18 17:58:23 EET 2009 +classpath.external= Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.xml 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,74 @@ +<project name="KickStart" default="deploy" basedir="../"> + +  + <property file="${basedir}/ant/build.properties" /> + + <property name="project.name" value="KickStart" /> + <property name="web.content.dir" value="${basedir}/WebContent" /> + <property name="web-inf.dir" value="${web.content.dir}/WEB-INF" /> + <property name="build.dir" value="build" /> + <property name="war.name" value="${build.dir}/${project.name}.war" /> + +  + <property name="deploy.dir" value="deploy" /> + +  + <path id="compile.classpath"> + <fileset dir="${webinf.dir}/lib"> + <include name="**/*.jar" /> + </fileset> + <pathelement path="${classpath}" /> + <pathelement path="${classpath.external}" /> + <pathelement path="${webinf.dir}/classes" /> + </path> + +  + <target name="copyResources"> + <copy todir="${web-inf.dir}/classes" includeEmptyDirs="no"> + <fileset dir="JavaSource"> + <patternset> + <include name="**/*.*" /> + <exclude name="**/*.java" /> + </patternset> + </fileset> + </copy> + </target> + +  + <target name="prepare"> + <tstamp /> + </target> + +  + <target name="clean" description="Prepare for clean build"> + <delete dir="${web-inf.dir}/classes" failonerror="false"/> + <mkdir dir="${web-inf.dir}/classes" /> + </target> + +  + <target name="compile" depends="prepare, copyResources"> + <javac srcdir="JavaSource" destdir="${web-inf.dir}/classes"> + <classpath refid="compile.classpath" /> + </javac> + </target> + +  + <target name="build" depends="prepare, compile" /> + +  + <target name="rebuild" depends="clean, prepare, compile" /> + +  + <target name="war" depends="build"> + <mkdir dir="${build.dir}" /> + <war warfile="${war.name}" basedir="${web.content.dir}" webxml="${web-inf.dir}/web.xml"> + <exclude name="WEB-INF/web.xml" /> + </war> + </target> + + <target name="deploy" depends="war"> + <delete dir="${deploy.dir}/${project.name}" failonerror="false"/> + <copy file="${war.name}" todir="${deploy.dir}" /> + </target> + +</project> \ No newline at end of file Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/resources/TestProject/ant/build.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java 2009-02-19 13:00:42 UTC (rev 13675) @@ -0,0 +1,105 @@ +/******************************************************************************* + * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.editor.dialogs; + +import java.util.Properties; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.common.model.options.PreferenceModelUtilities; +import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryDialog; +import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.vpe.resref.VpeResourcesDialog; +import org.jboss.tools.vpe.ui.test.TestUtil; + +import junit.framework.TestCase; + +public class VpeResourcesDialogTest extends TestCase { + + private final String BUNDLE_NAME = "org.jboss.tools.vpe.test"; //$NON-NLS-1$ + private final String PROJECT_PATH = "resources/TestProject"; //$NON-NLS-1$ + private final String PROJECT_NAME = "TestProject"; //$NON-NLS-1$ + private final String FILE_NAME = "hello.jsp"; //$NON-NLS-1$ + + private IProject project; + + @Override + protected void setUp() throws Exception { + super.setUp(); + project = (IProject) ResourcesPlugin.getWorkspace().getRoot() + .findMember(PROJECT_NAME); + if (project == null) { + ProjectImportTestSetup setup = new ProjectImportTestSetup(this, + BUNDLE_NAME, PROJECT_PATH, PROJECT_NAME); + project = setup.importProject(); + } + this.project = project.getProject(); + + JobUtils.waitForIdle(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + try { + JobUtils.waitForIdle(); + if (project != null) { + project.close(new NullProgressMonitor()); + project.delete(true, new NullProgressMonitor()); + project = null; + JobUtils.waitForIdle(); + } + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + } + + public void testVpeResourcesDialogOpen() throws Throwable { + + IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME, + PROJECT_NAME); + + assertNotNull("Specified file does not exist: fileName = " + FILE_NAME //$NON-NLS-1$ + + "; projectName = " + PROJECT_NAME, file); //$NON-NLS-1$ + + VpeResourcesDialog dialog = new VpeResourcesDialog(); + Properties p = new Properties(); + p.setProperty("help", "VpeResourcesDialog"); //$NON-NLS-1$ //$NON-NLS-2$ + p.put("file", file); //$NON-NLS-1$ + p.put("model", PreferenceModelUtilities.getPreferenceModel()); //$NON-NLS-1$ + dialog.setObject(p); + Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell(); + IQueryDialog dialogWindow = new AbstractQueryDialog(shell); + + dialogWindow.setView(dialog.getView()); + dialogWindow.getDialog().create(); + dialog.getView().setDialog(dialogWindow.getDialog()); + dialogWindow.getDialog().setBlockOnOpen(false); + dialogWindow.getDialog().open(); + int code = dialogWindow.getDialog().getReturnCode(); + + /* + * Assert that window has been created. + */ + assertEquals(0, code); + + dialogWindow.getDialog().close(); + } + + +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/dialogs/VpeResourcesDialogTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2009-02-19 12:27:06 UTC (rev 13674) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2009-02-19 13:00:42 UTC (rev 13675) @@ -20,6 +20,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.JsfComponentTest; import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin; import org.jboss.tools.tests.ImportBean; +import org.jboss.tools.vpe.editor.dialogs.VpeResourcesDialogTest; import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPageTest; import org.jboss.tools.vpe.editor.template.VpeTemplateManagerTest; import org.jboss.tools.vpe.ui.test.VpeTestSetup; @@ -40,6 +41,7 @@ suite.addTestSuite(TemplateSchemeValidateTest.class); suite.addTestSuite(TemplatesExpressionParsingTest.class); suite.addTestSuite(VpeEditorPreferencesPageTest.class); + suite.addTestSuite(VpeResourcesDialogTest.class); suite.addTestSuite(VpeTemplateManagerTest.class); List<ImportBean> projectToImport = new ArrayList<ImportBean>(); ImportBean importBean = new ImportBean();

17 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r13674 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2009-02-19 07:27:06 -0500 (Thu, 19 Feb 2009) New Revision: 13674 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-3823 Revalidate unresolver Seam ELs only if changed file is java source or components.xml. - Fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-02-19 11:00:34 UTC (rev 13673) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-02-19 12:27:06 UTC (rev 13674) @@ -10,12 +10,10 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core.validation; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; @@ -124,10 +122,16 @@ // Collect all resources which we must validate. Set<IPath> resources = new HashSet<IPath>(); // Resources which we have to validate. Set<IPath> newResources = new HashSet<IPath>(); // New (unlinked) resources file + boolean validateUnnamedResources = false; for(IFile currentFile : changedFiles) { if(reporter.isCancelled()) { break; } + if(!validateUnnamedResources) { + String fileName = currentFile.getName().toLowerCase(); + // We need to check only file names here. + validateUnnamedResources = fileName.endsWith(".java") || fileName.equals("components.xml"); //$NON-NLS-1$ $NON-NLS-2$ + } if (checkFileExtension(currentFile)) { validateXMLVersion(currentFile); // Get all variable names which were linked with this resource. @@ -175,14 +179,16 @@ validateFactory(linkedResource, markedDuplicateFactoryNames); } - // Validate all unnamed resources. - Set<IPath> unnamedResources = validationContext.getUnnamedCoreResources(); - newResources.addAll(unnamedResources); - for (IPath path : newResources) { - displaySubtask(VALIDATING_RESOURCE_MESSAGE_ID, new String[]{projectName, path.toString()}); - Set<SeamJavaComponentDeclaration> declarations = ((SeamProject)seamProject).findJavaDeclarations(path); - for (SeamJavaComponentDeclaration d : declarations) { - validateMethodsOfUnknownComponent(d); + // If changed files are *.java or component.xml then re-validate all unnamed resources. + if(validateUnnamedResources) { + Set<IPath> unnamedResources = validationContext.getUnnamedCoreResources(); + newResources.addAll(unnamedResources); + for (IPath path : newResources) { + displaySubtask(VALIDATING_RESOURCE_MESSAGE_ID, new String[]{projectName, path.toString()}); + Set<SeamJavaComponentDeclaration> declarations = ((SeamProject)seamProject).findJavaDeclarations(path); + for (SeamJavaComponentDeclaration d : declarations) { + validateMethodsOfUnknownComponent(d); + } } }

17 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits February 2009