This commit was manufactured by cvs2svn to create tag 'R3_1_2'.
diff --git a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
index 2e156fd..120c672 100644
--- a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.xsl.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.wst.xsl.core.internal.XSLCorePlugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.301,2.0.0)",
diff --git a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-2.0.xsd b/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-2.0.xsd
index 91fd200..0550df5 100644
--- a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-2.0.xsd
+++ b/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-2.0.xsd
@@ -112,8 +112,7 @@
so the Schema for schemas needs to be imported
-->
-<xs:import namespace="http://www.w3.org/2001/XMLSchema"
- schemaLocation="http://www.w3.org/2001/XMLSchema.xsd"/>
+<xs:import namespace="http://www.w3.org/2001/XMLSchema"/>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
<xs:annotation>
diff --git a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
index 3465f09..02ba3cb 100644
--- a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.xsl.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.wst.xsl.ui.internal.XSLUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java
index 85658ae..7c579a6 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java
@@ -97,7 +97,7 @@
public ArrayList<ICompletionProposal> getCompletionProposals() {
proposals.clear();
- adjustXPathStart();
+ adjustXPathStart(SELECT_ATTRIBUTE);
int offset = getReplacementBeginPosition();
IDOMAttr attrNode = getAttribute(SELECT_ATTRIBUTE);
@@ -121,10 +121,11 @@
* 1. Adjust the matchString (This should have been calculated earlier)
* 2. Get the current tokens offset position..this will be the starting offset.
* 3. Get the replacement length...this is the difference between the token offset and the next token or end of the string
+ * @param attrName TODO
*/
- protected void adjustXPathStart() {
+ protected void adjustXPathStart(String attrName) {
IDOMElement elem = (IDOMElement)getNode();
- IDOMAttr xpathNode = (IDOMAttr)elem.getAttributeNode(SELECT_ATTRIBUTE);
+ IDOMAttr xpathNode = (IDOMAttr)elem.getAttributeNode(attrName);
if (xpathNode == null) {
return;
}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.java
index 54a76a6..e0b2754 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.java
@@ -56,7 +56,7 @@
@Override
public ArrayList<ICompletionProposal> getCompletionProposals() {
- adjustXPathStart();
+ adjustXPathStart(ATTR_TEST);
int offset = getReplacementBeginPosition();
IDOMAttr attrNode = (IDOMAttr)((IDOMElement)getNode()).getAttributeNode(ATTR_TEST);
@@ -68,25 +68,4 @@
return getAllCompletionProposals();
}
- /**
- * This needs to setup the content assistance correctly. Here is what needs to happen:
- * 1. Adjust the matchString (This should have been calculated earlier)
- * 2. Get the current tokens offset position..this will be the starting offset.
- * 3. Get the replacement length...this is the difference between the token offset and the next token or end of the string
- */
- @Override
- protected void adjustXPathStart() {
- IDOMElement elem = (IDOMElement)getNode();
- IDOMAttr xpathNode = (IDOMAttr)elem.getAttributeNode(ATTR_TEST);
-
- if (xpathNode != null) {
- String xpathString = xpathNode.getValue();
- int startOffset = xpathNode.getValueRegionStartOffset();
- int tokenOffset = getReplacementBeginPosition() - xpathNode.getValueRegionStartOffset();
- int tokenPosition = getXPathSeperatorPos(tokenOffset, xpathString);
- int newStartOffset = startOffset + tokenPosition - 1;
-
- replacementLength = getReplacementBeginPosition() - startOffset;
- }
- }
}
diff --git a/bundles/org.eclipse.wst.xsl/about.ini b/bundles/org.eclipse.wst.xsl/about.ini
index fda5a40..3090c89 100644
--- a/bundles/org.eclipse.wst.xsl/about.ini
+++ b/bundles/org.eclipse.wst.xsl/about.ini
@@ -7,25 +7,5 @@
# Property "aboutText" contains blurb for "About" dialog (translated)
aboutText=%blurb
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
+featureImage=icons/WTP_icon_x32_v2.png
diff --git a/bundles/org.eclipse.wst.xsl/about.properties b/bundles/org.eclipse.wst.xsl/about.properties
index e460f94..15f32ab 100644
--- a/bundles/org.eclipse.wst.xsl/about.properties
+++ b/bundles/org.eclipse.wst.xsl/about.properties
@@ -6,7 +6,7 @@
#
# Do not translate any values surrounded by {}
-blurb=WTP XSL Tools\n\
+blurb=Eclipse XSL Developer Tools\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
diff --git a/bundles/org.eclipse.wst.xsl/build.properties b/bundles/org.eclipse.wst.xsl/build.properties
index e4aae79..1694922 100644
--- a/bundles/org.eclipse.wst.xsl/build.properties
+++ b/bundles/org.eclipse.wst.xsl/build.properties
@@ -4,5 +4,4 @@
about.mappings,\
about.properties,\
plugin.properties,\
- wtp_prod32.gif,\
- wtp_prod32.png
+ icons/
diff --git a/bundles/org.eclipse.wst.xsl/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.wst.xsl/icons/WTP_icon_x32_v2.png
new file mode 100644
index 0000000..6f09c2a
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsl/icons/WTP_icon_x32_v2.png
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl/plugin.properties b/bundles/org.eclipse.wst.xsl/plugin.properties
index d294200..a240e51 100644
--- a/bundles/org.eclipse.wst.xsl/plugin.properties
+++ b/bundles/org.eclipse.wst.xsl/plugin.properties
@@ -1,3 +1,3 @@
#Properties file for org.eclipse.wst.xsl
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = WTP XSL Tools
\ No newline at end of file
+Bundle-Vendor.0 = Eclipse Web Tools Platform
+Bundle-Name.0 = Eclipse XSL Developer Tools
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl/wtp_prod32.gif b/bundles/org.eclipse.wst.xsl/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/bundles/org.eclipse.wst.xsl/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl/wtp_prod32.png b/bundles/org.eclipse.wst.xsl/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/bundles/org.eclipse.wst.xsl/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xsl.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xsl.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl.feature/feature.properties b/features/org.eclipse.wst.xsl.feature/feature.properties
index ad75ba0..c9bb4be 100644
--- a/features/org.eclipse.wst.xsl.feature/feature.properties
+++ b/features/org.eclipse.wst.xsl.feature/feature.properties
@@ -5,10 +5,10 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=XSL Tools
+featureName=Eclipse XSL Developer Tools
# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse Web Tools Platform
# "updateSiteName" property - label for the update site
updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
diff --git a/features/org.eclipse.wst.xsl.feature/feature.xml b/features/org.eclipse.wst.xsl.feature/feature.xml
index 65b4dee..bf2cde6 100644
--- a/features/org.eclipse.wst.xsl.feature/feature.xml
+++ b/features/org.eclipse.wst.xsl.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.xsl.feature"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.0.2.qualifier"
provider-name="%providerName"
plugin="org.eclipse.wst.xsl">
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/feature.xml b/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
index a8de780..514c458 100644
--- a/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.wst.xsl_sdk.feature"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.0.2.qualifier"
provider-name="%providerName">
<description>
