JBoss Tools SVN: r10643 - in trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt: org/jboss/tools and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: artdaw
Date: 2008-10-03 06:59:30 -0400 (Fri, 03 Oct 2008)
New Revision: 10643
Modified:
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
Log:
https://jira.jboss.org/jira/browse/JBDS-399 - markers for titles are added as <img /> elements
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-03 10:37:42 UTC (rev 10642)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-03 10:59:30 UTC (rev 10643)
@@ -209,22 +209,10 @@
<!-- Let's handle the case where a component (bibliography, for example)
occurs inside a section; will we need parameters for this? -->
- <xsl:variable name="revflag">
- <xsl:choose>
- <xsl:when test="../@role='new' or ../@role='updated'">
- <xsl:value-of select="../@role"/>
- </xsl:when>
- <!-- For mkdiff compatibility-->
- <xsl:when test="../@revisionflag='added' or ../@revisionflag='changed'">
- <xsl:value-of select="../@revisionflag"/>
- </xsl:when>
- <xsl:otherwise></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+
<xsl:element name="h{$level+1}">
<xsl:attribute name="class">
title
- <xsl:value-of select="$revflag" />
</xsl:attribute>
<xsl:if test="$generate.id.attributes = 0">
<xsl:call-template name="anchor">
@@ -236,6 +224,15 @@
<xsl:with-param name="allow-anchors" select="1"/>
</xsl:apply-templates>
</xsl:element>
+ <xsl:choose>
+ <xsl:when test="../@role='new' or ../@revisionflag='added'">
+ <img src="images/new.png" alt="new" class="img_marker" />
+ </xsl:when>
+ <!-- For mkdiff compatibility-->
+ <xsl:when test="../@role='updated' or ../@revisionflag='changed'">
+ <img src="images/updated.png" alt="updated" class="img_marker" />
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
@@ -275,24 +272,9 @@
</xsl:choose>
</xsl:variable>
- <xsl:variable name="revflag">
- <xsl:choose>
- <xsl:when test="../@role='new' or ../@role='updated'">
- <xsl:value-of select="../@role"/>
- </xsl:when>
- <!-- For mkdiff compatibility-->
- <xsl:when test="../@revisionflag='added' or ../@revisionflag='changed'">
- <xsl:value-of select="../@revisionflag"/>
- </xsl:when>
- <xsl:otherwise></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:element name="h{$hlevel}">
<xsl:attribute name="class">
<xsl:value-of select="$class"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$revflag"/>
</xsl:attribute>
<xsl:if test="$css.decoration != '0'">
<xsl:if test="$hlevel<3">
@@ -310,6 +292,15 @@
</xsl:if>
<xsl:copy-of select="$title"/>
</xsl:element>
+ <xsl:choose>
+ <xsl:when test="../@role='new' or ../@revisionflag='added'">
+ <img src="images/new.png" alt="new" class="img_marker" />
+ </xsl:when>
+ <!-- For mkdiff compatibility-->
+ <xsl:when test="../@role='updated' or ../@revisionflag='changed'">
+ <img src="images/updated.png" alt="updated" class="img_marker" />
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
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 2008-10-03 10:37:42 UTC (rev 10642)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-10-03 10:59:30 UTC (rev 10643)
@@ -200,22 +200,10 @@
<!-- Let's handle the case where a component (bibliography, for example)
occurs inside a section; will we need parameters for this? -->
- <xsl:variable name="revflag">
- <xsl:choose>
- <xsl:when test="../@role='new' or ../@role='updated'">
- <xsl:value-of select="../@role"/>
- </xsl:when>
- <!-- For mkdiff compatibility-->
- <xsl:when test="../@revisionflag='added' or ../@revisionflag='changed'">
- <xsl:value-of select="../@revisionflag"/>
- </xsl:when>
- <xsl:otherwise></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
+
<xsl:element name="h{$level+1}">
<xsl:attribute name="class">
title
- <xsl:value-of select="$revflag" />
</xsl:attribute>
<xsl:if test="$generate.id.attributes = 0">
<xsl:call-template name="anchor">
@@ -227,6 +215,16 @@
<xsl:with-param name="allow-anchors" select="1"/>
</xsl:apply-templates>
</xsl:element>
+
+ <xsl:choose>
+ <xsl:when test="../@role='new' or ../@revisionflag='added'">
+ <img src="images/new.png" alt="new" class="img_marker" />
+ </xsl:when>
+ <!-- For mkdiff compatibility-->
+ <xsl:when test="../@role='updated' or ../@revisionflag='changed'">
+ <img src="images/updated.png" alt="updated" class="img_marker" />
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
@@ -266,24 +264,9 @@
</xsl:choose>
</xsl:variable>
- <xsl:variable name="revflag">
- <xsl:choose>
- <xsl:when test="../@role='new' or ../@role='updated'">
- <xsl:value-of select="../@role"/>
- </xsl:when>
- <!-- For mkdiff compatibility-->
- <xsl:when test="../@revisionflag='added' or ../@revisionflag='changed'">
- <xsl:value-of select="../@revisionflag"/>
- </xsl:when>
- <xsl:otherwise></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:element name="h{$hlevel}">
<xsl:attribute name="class">
<xsl:value-of select="$class"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="$revflag"/>
</xsl:attribute>
<xsl:if test="$css.decoration != '0'">
<xsl:if test="$hlevel<3">
@@ -301,6 +284,15 @@
</xsl:if>
<xsl:copy-of select="$title"/>
</xsl:element>
+ <xsl:choose>
+ <xsl:when test="../@role='new' or ../@revisionflag='added'">
+ <img src="images/new.png" alt="new" class="img_marker" />
+ </xsl:when>
+ <!-- For mkdiff compatibility-->
+ <xsl:when test="../@role='updated' or ../@revisionflag='changed'">
+ <img src="images/updated.png" alt="updated" class="img_marker" />
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
15 years, 7 months
JBoss Tools SVN: r10642 - trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-03 06:37:42 -0400 (Fri, 03 Oct 2008)
New Revision: 10642
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JstlCore1_0.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2695 Fixed
Modified: trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JstlCore1_0.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JstlCore1_0.xml 2008-10-03 10:01:22 UTC (rev 10641)
+++ trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JstlCore1_0.xml 2008-10-03 10:37:42 UTC (rev 10642)
@@ -5,130 +5,262 @@
prefix="c" uri="http://java.sun.com/jstl/core">
<element-type body-content="allowed" content="mixed" end-tag="required"
name="catch" start-tag="required">
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="choose" start-tag="required"/>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="out" start-tag="required">
- <attribute-type name="value" required="true"/>
+ <attribute-type name="value" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="value"/>
- <attribute-type name="default" required="false"/>
+ <attribute-type name="default" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="default"/>
- <attribute-type name="escapeXml" required="false"/>
+ <attribute-type name="escapeXml" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="escapeXml"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="if" start-tag="required">
- <attribute-type name="test" required="true"/>
+ <attribute-type name="test" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="test"/>
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="scope" required="false"/>
+ <attribute-type name="scope" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="scope"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="import" start-tag="required">
- <attribute-type name="url" required="true"/>
+ <attribute-type name="url" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="url"/>
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="scope" required="false"/>
+ <attribute-type name="scope" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="scope"/>
- <attribute-type name="varReader" required="false"/>
+ <attribute-type name="varReader" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="varReader"/>
- <attribute-type name="context" required="false"/>
+ <attribute-type name="context" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="context"/>
- <attribute-type name="charEncoding" required="false"/>
+ <attribute-type name="charEncoding" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="charEncoding"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="forEach" start-tag="required">
- <attribute-type name="items" required="false"/>
+ <attribute-type name="items" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="items"/>
- <attribute-type name="begin" required="false"/>
+ <attribute-type name="begin" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="begin"/>
- <attribute-type name="end" required="false"/>
+ <attribute-type name="end" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="end"/>
- <attribute-type name="step" required="false"/>
+ <attribute-type name="step" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="step"/>
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="varStatus" required="false"/>
+ <attribute-type name="varStatus" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="varStatus"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="forTokens" start-tag="required">
- <attribute-type name="items" required="true"/>
+ <attribute-type name="items" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="items"/>
- <attribute-type name="delims" required="true"/>
+ <attribute-type name="delims" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="delims"/>
- <attribute-type name="begin" required="false"/>
+ <attribute-type name="begin" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="begin"/>
- <attribute-type name="end" required="false"/>
+ <attribute-type name="end" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="end"/>
- <attribute-type name="step" required="false"/>
+ <attribute-type name="step" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="step"/>
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="varStatus" required="false"/>
+ <attribute-type name="varStatus" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="varStatus"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="otherwise" start-tag="required"/>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="param" start-tag="required">
- <attribute-type name="name" required="true"/>
+ <attribute-type name="name" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="name"/>
- <attribute-type name="value" required="false"/>
+ <attribute-type name="value" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="value"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="redirect" start-tag="required">
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="scope" required="false"/>
+ <attribute-type name="scope" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="scope"/>
- <attribute-type name="url" required="true"/>
+ <attribute-type name="url" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="url"/>
- <attribute-type name="context" required="false"/>
+ <attribute-type name="context" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="context"/>
</element-type>
<element-type body-content="refused" content="mixed" end-tag="required"
name="remove" start-tag="required">
- <attribute-type name="var" required="true"/>
+ <attribute-type name="var" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="scope" required="false"/>
+ <attribute-type name="scope" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="scope"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="set" start-tag="required">
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="value" required="false"/>
+ <attribute-type name="value" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="value"/>
- <attribute-type name="target" required="false"/>
+ <attribute-type name="target" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="target"/>
- <attribute-type name="property" required="false"/>
+ <attribute-type name="property" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="property"/>
- <attribute-type name="scope" required="false"/>
+ <attribute-type name="scope" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="scope"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="url" start-tag="required">
- <attribute-type name="var" required="false"/>
+ <attribute-type name="var" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="var"/>
- <attribute-type name="scope" required="false"/>
+ <attribute-type name="scope" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="scope"/>
- <attribute-type name="value" required="true"/>
+ <attribute-type name="value" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="value"/>
- <attribute-type name="context" required="false"/>
+ <attribute-type name="context" required="false">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="context"/>
</element-type>
<element-type body-content="allowed" content="mixed" end-tag="required"
name="when" start-tag="required">
- <attribute-type name="test" required="true"/>
+ <attribute-type name="test" required="true">
+ <proposal type="beanProperty" />
+ <proposal type="bundleProperty" />
+ </attribute-type>
<attribute type="test"/>
</element-type>
-</schema>
+</schema>
\ No newline at end of file
15 years, 7 months
JBoss Tools SVN: r10641 - trunk/vpe/plugins/org.jboss.tools.vpe.resref.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-03 06:01:22 -0400 (Fri, 03 Oct 2008)
New Revision: 10641
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/build.properties
Log:
Error in JUnit tests
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/build.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/build.properties 2008-10-03 10:00:46 UTC (rev 10640)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/build.properties 2008-10-03 10:01:22 UTC (rev 10641)
@@ -1,4 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.xml
+src.includes = plugin.xml
Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/plugin.xml 2008-10-03 10:01:22 UTC (rev 10641)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension point="org.jboss.tools.common.model.classes">
+ <xclass id="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"
+ class="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"/>
+ </extension>
+</plugin>
15 years, 7 months
JBoss Tools SVN: r10640 - in trunk/vpe/plugins/org.jboss.tools.vpe: resources/meta and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-03 06:00:46 -0400 (Fri, 03 Oct 2008)
New Revision: 10640
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta
Log:
Error in JUnit tests
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-03 09:51:09 UTC (rev 10639)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-03 10:00:46 UTC (rev 10640)
@@ -27,10 +27,6 @@
paths=".vpe."
/>
</extension>
- <extension point="org.jboss.tools.common.model.classes">
- <xclass id="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"
- class="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"/>
- </extension>
<extension point="org.eclipse.ui.preferencePages">
<page category="org.jboss.tools.common.xstudio.editors" class="org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage" id="org.jboss.tools.vpe.editor" name="Visual Page Editor"></page>
<page
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-10-03 09:51:09 UTC (rev 10639)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/meta/vpe.meta 2008-10-03 10:00:46 UTC (rev 10640)
@@ -194,7 +194,7 @@
<XActionItem HandlerClassName="%SpecialWizard%" ICON="action.empty"
PROPERTIES="support=org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"
displayName="Add El Reference..." kind="action" name="AddItem">
- <EntityData EntityName="VPEELReferenceExt">
+ <EntityData EntityName="VPEElReferenceExt">
<AttributeData AttributeName="location"/>
<AttributeData AttributeName="scope" Mandatory="no"/>
<AttributeData AttributeName="prefix" Mandatory="no"/>
@@ -248,7 +248,7 @@
displayName="Add El Reference..." kind="action" name="AddItem">
<EntityData EntityName="VPEGlobalElReference">
<AttributeData AttributeName="location" Mandatory="no"/>
- <AttributeData AttributeName="scope" Mandatory="no"/>
+ <!--AttributeData AttributeName="scope" Mandatory="no"/-->
<AttributeData AttributeName="prefix" Mandatory="no"/>
</EntityData>
</XActionItem>
@@ -259,7 +259,7 @@
displayName="Edit El Reference..." kind="action" name="EditItem">
<EntityData EntityName="VPEGlobalElReference">
<AttributeData AttributeName="location"/>
- <AttributeData AttributeName="scope" Mandatory="no"/>
+ <!--AttributeData AttributeName="scope" Mandatory="no"/-->
<AttributeData AttributeName="prefix" Mandatory="no"/>
</EntityData>
</XActionItem>
15 years, 7 months
JBoss Tools SVN: r10639 - trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-03 05:51:09 -0400 (Fri, 03 Oct 2008)
New Revision: 10639
Modified:
trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java
Log:
Error in JUnit tests
Modified: trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java 2008-10-02 20:47:21 UTC (rev 10638)
+++ trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/BaseAddReferenceSupport.java 2008-10-03 09:51:09 UTC (rev 10639)
@@ -68,11 +68,16 @@
if(initialPrefix != null) {
setAttributeValue(0, "prefix", initialPrefix); //$NON-NLS-1$
}
- final XAttributeConstraintL scopeAttribute = ((XAttributeConstraintL) getTarget().getModelEntity().getAttribute("scope") //$NON-NLS-1$
+ if(getTarget().getModelEntity().getAttribute("scope") != null) {
+ final XAttributeConstraintL scopeAttribute = ((XAttributeConstraintL) getTarget().getModelEntity().getAttribute("scope") //$NON-NLS-1$
.getConstraint());
- if (scopeAttribute != null) {
- scopeNames = scopeAttribute.getValues();
- }
+ if (scopeAttribute != null) {
+ scopeNames = scopeAttribute.getValues();
+ }
+ } else {
+ //just in case. should not happen
+ scopeNames = ResourceReference.SCOPE_NAMES;
+ }
int scopeIndex = ((Integer)getProperties().get("scope")).intValue(); //$NON-NLS-1$
if(scopeIndex == 1 && scopeNames.length == 1){
15 years, 7 months
JBoss Tools SVN: r10638 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-02 16:47:21 -0400 (Thu, 02 Oct 2008)
New Revision: 10638
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
fileset wizard was also missing error messages in title area dialog
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-10-02 20:17:01 UTC (rev 10637)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-10-02 20:47:21 UTC (rev 10638)
@@ -11,7 +11,10 @@
package org.jboss.ide.eclipse.archives.ui.wizards.pages;
import java.util.ArrayList;
+import java.util.Arrays;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -35,9 +38,12 @@
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
+import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension;
+import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
+import org.jboss.ide.eclipse.archives.core.util.PathUtils;
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveFilesetDestinationComposite;
@@ -241,11 +247,22 @@
srcDestComposite.addChangeListener(new ArchiveSourceDestinationComposite.ChangeListener() {
public void compositeChanged() {
+ validate();
changePreview();
}
});
}
+ private boolean validate () {
+ String errorMessage = null;
+ if( !srcDestComposite.isValid() )
+ errorMessage = srcDestComposite.getErrorMessage();
+ setErrorMessage(errorMessage);
+ setPageComplete(errorMessage == null);
+ return errorMessage == null;
+ }
+
+
public IArchiveNode getRootNode () {
return (IArchiveNode) destinationComposite.getPackageNodeDestination();
}
15 years, 7 months
JBoss Tools SVN: r10637 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-02 16:17:01 -0400 (Thu, 02 Oct 2008)
New Revision: 10637
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java
Log:
JBIDE-2649 missed file somehow
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2008-10-02 18:32:53 UTC (rev 10636)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2008-10-02 20:17:01 UTC (rev 10637)
@@ -83,7 +83,7 @@
Object element = ((IStructuredSelection)selection).getFirstElement();
IProject project = getProject(element);
- if( project != null && project != currentProject ) {
+ if( project != null && project != currentProject && project.isOpen()) {
currentProject = project;
jiggleViewerInput();
}
15 years, 7 months
JBoss Tools SVN: r10636 - trunk/as/tests/org.jboss.ide.eclipse.as.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-02 14:32:53 -0400 (Thu, 02 Oct 2008)
New Revision: 10636
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties
Log:
fix archives test errors. missing resources were added to build: testOutput and projectPieces folders
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2008-10-02 18:17:06 UTC (rev 10635)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2008-10-02 18:32:53 UTC (rev 10636)
@@ -1,8 +1,9 @@
-source.. = src/
bin.includes = META-INF/,\
jbossastest.jar,\
- projects/
+ projects/,\
+ testOutputs/,\
+ projectPieces/
source.jbossastest.jar = src/
-jars.compile.order = .
+jars.compile.order = jbossastest.jar
output.jbossastest.jar = bin/
source.jbossastest.jar = src/
15 years, 7 months
JBoss Tools SVN: r10635 - in trunk/vpe: tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-02 14:17:06 -0400 (Thu, 02 Oct 2008)
New Revision: 10635
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPageTest.java
Log:
fix for VPE JUnit test errors
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2008-10-02 18:03:55 UTC (rev 10634)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2008-10-02 18:17:06 UTC (rev 10635)
@@ -24,6 +24,8 @@
public class VpeEditorPreferencesPage extends TabbedPreferencesPage implements IWorkbenchPreferencePage {
+
+ public static final String ID = "org.jboss.tools.vpe.editor";
public VpeEditorPreferencesPage() {
addPreferencePage(new GeneralPage());
addPreferencePage(new TemplatesPreferencePage());
@@ -34,8 +36,8 @@
Preferences preferences = VpePlugin.getDefault().getPluginPreferences();
PreferenceDialog prefsdlg = PreferencesUtil.createPreferenceDialogOn(
PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- "org.jboss.tools.vpe.editor", new String[] {
- "org.jboss.tools.vpe.editor" }, null);
+ ID, new String[] {
+ ID }, null);
prefsdlg.open();
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPageTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPageTest.java 2008-10-02 18:03:55 UTC (rev 10634)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPageTest.java 2008-10-02 18:17:06 UTC (rev 10635)
@@ -9,7 +9,7 @@
public void testVpeEditorPreferencesPageShow() {
PreferenceDialog prefDialog =
WorkbenchUtils.createPreferenceDialog(
- VpeEditorPreferencesPage.class.getName());
+ VpeEditorPreferencesPage.ID);
try {
prefDialog.setBlockOnOpen(false);
15 years, 7 months
JBoss Tools SVN: r10634 - trunk/vpe/tests/org.jboss.tools.vpe.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-02 14:03:55 -0400 (Thu, 02 Oct 2008)
New Revision: 10634
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties
Log:
fix vpe test exceptions:
java.lang.NullPointerException
at org.eclipse.core.internal.runtime.Activator.getURLConverter(Activator.java:313)
at org.eclipse.core.runtime.FileLocator.resolve(FileLocator.java:186)
at org.jboss.tools.vpe.test.TemplateSchemeValidateTest.setUp(TemplateSchemeValidateTest.java:79)
schema folder added to bbuild
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2008-10-02 16:22:12 UTC (rev 10633)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2008-10-02 18:03:55 UTC (rev 10634)
@@ -2,7 +2,8 @@
testOk-plugin.xml,\
testFailure-plugin.xml,\
templates/,\
- vpe-tests.jar
+ vpe-tests.jar,\
+ scheme/
src.includes = META-INF/,\
build.properties,\
src/,\
15 years, 7 months