diff options
18 files changed, 27 insertions, 20 deletions
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java index 8ddebe39ee..e5712b04b6 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java +++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2018 IBM Corporation and others. + * Copyright (c) 2001, 2019 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -535,6 +535,13 @@ public class OffsetStatusLineContributionItem extends StatusLineContributionItem modelHandlerContentTypeLabel.setText(SSEUIMessages.OffsetStatusLineContributionItem_5 + model.getModelHandler().getAssociatedContentTypeId() + " (" + model.getModelHandler() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ modelHandlerContentTypeLabel.setBackground(composite.getBackground()); + Text encodingLabel = new Text(composite, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY); + gd = new GridData(SWT.FILL, SWT.FILL, true, false); + gd.horizontalSpan = 2; + encodingLabel.setLayoutData(gd); + encodingLabel.setText(model.getStructuredDocument().getEncodingMemento().toString()); + encodingLabel.setBackground(composite.getBackground()); + final Text counts = new Text(composite, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY); gd = new GridData(SWT.FILL, SWT.FILL, true, false); gd.horizontalSpan = 2; diff --git a/web/features/org.eclipse.wst.web_core.feature/feature.xml b/web/features/org.eclipse.wst.web_core.feature/feature.xml index 25d0ba903b..343bf7985f 100644 --- a/web/features/org.eclipse.wst.web_core.feature/feature.xml +++ b/web/features/org.eclipse.wst.web_core.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml index 9a2644fec3..8e8ed411f3 100644 --- a/web/features/org.eclipse.wst.web_sdk.feature/feature.xml +++ b/web/features/org.eclipse.wst.web_sdk.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/web/features/org.eclipse.wst.web_tests.feature/feature.xml b/web/features/org.eclipse.wst.web_tests.feature/feature.xml index e7abdc6980..48e6dbc7b8 100644 --- a/web/features/org.eclipse.wst.web_tests.feature/feature.xml +++ b/web/features/org.eclipse.wst.web_tests.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/web/features/org.eclipse.wst.web_ui.feature/feature.xml b/web/features/org.eclipse.wst.web_ui.feature/feature.xml index efc2027767..83357e61e5 100644 --- a/web/features/org.eclipse.wst.web_ui.feature/feature.xml +++ b/web/features/org.eclipse.wst.web_ui.feature/feature.xml @@ -18,7 +18,7 @@ provider-name="%providerName" plugin="org.eclipse.wst.web.ui" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/web/features/org.eclipse.wst.web_userdoc.feature/feature.xml b/web/features/org.eclipse.wst.web_userdoc.feature/feature.xml index 48ff6e8e74..05d3686809 100644 --- a/web/features/org.eclipse.wst.web_userdoc.feature/feature.xml +++ b/web/features/org.eclipse.wst.web_userdoc.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml index 07baf25eb9..16e6f58463 100644 --- a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml +++ b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml index f2d88731a9..89237cb400 100644 --- a/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml +++ b/xml/features/org.eclipse.wst.xml_sdk.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml index 8f46c4167f..a6d21f9c25 100644 --- a/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml +++ b/xml/features/org.eclipse.wst.xml_tests.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml index 38892bfc11..7972946414 100644 --- a/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml +++ b/xml/features/org.eclipse.wst.xml_ui.feature/feature.xml @@ -18,7 +18,7 @@ provider-name="%providerName" plugin="org.eclipse.wst.xml.ui" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xml/features/org.eclipse.wst.xml_userdoc.feature/feature.xml b/xml/features/org.eclipse.wst.xml_userdoc.feature/feature.xml index 807520070a..4e52a2a8fa 100644 --- a/xml/features/org.eclipse.wst.xml_userdoc.feature/feature.xml +++ b/xml/features/org.eclipse.wst.xml_userdoc.feature/feature.xml @@ -17,7 +17,7 @@ version="3.15.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml b/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml index 4d068ab948..d0ea1c5f3c 100644 --- a/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml +++ b/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml @@ -15,11 +15,11 @@ <feature id="org.eclipse.wst.xml.xpath2.processor.feature" label="%featureName" - version="2.0.301.qualifier" + version="2.0.302.qualifier" provider-name="%providerName" plugin="org.eclipse.wst.xml.xpath2" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml b/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml index ecbbcf6b22..5c73f7b42d 100644 --- a/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml +++ b/xpath/features/org.eclipse.wst.xml.xpath2.processor.feature/pom.xml @@ -23,7 +23,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xml.xpath2.processor.feature</artifactId> - <version>2.0.301-SNAPSHOT</version> + <version>2.0.302-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>PsychoPath XPath 2.0 Processor Feature</name> diff --git a/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/feature.xml b/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/feature.xml index 58bf54d7f9..f14c81d44b 100644 --- a/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/feature.xml +++ b/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/feature.xml @@ -15,11 +15,11 @@ <feature id="org.eclipse.wst.xml.xpath2.processor.sdk.feature" label="%featureName" - version="2.0.100.qualifier" + version="2.0.101.qualifier" provider-name="%providerName" plugin="org.eclipse.wst.xml.xpath2" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml b/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml index 6b61297794..d20b774266 100644 --- a/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml +++ b/xpath/features/org.eclipse.wst.xml.xpath2.processor.sdk.feature/pom.xml @@ -23,7 +23,7 @@ <groupId>org.eclipse.webtools.sourceediting</groupId> <artifactId>org.eclipse.wst.xml.xpath2.processor.sdk.feature</artifactId> - <version>2.0.100-SNAPSHOT</version> + <version>2.0.101-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>PsychoPath XPath 2.0 Processor: SDK Feature</name> </project> diff --git a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml index 3cd333828e..ed84828ffb 100644 --- a/xsl/features/org.eclipse.wst.xsl.feature/feature.xml +++ b/xsl/features/org.eclipse.wst.xsl.feature/feature.xml @@ -19,7 +19,7 @@ provider-name="%providerName" plugin="org.eclipse.wst.xsl" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml index 7921c4a2a6..3c606c6eb6 100644 --- a/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml +++ b/xsl/features/org.eclipse.wst.xsl_sdk.feature/feature.xml @@ -18,7 +18,7 @@ version="1.1.900.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description diff --git a/xsl/features/org.eclipse.wst.xsl_tests.feature/feature.xml b/xsl/features/org.eclipse.wst.xsl_tests.feature/feature.xml index 8da0fbe1f4..304437a0e5 100644 --- a/xsl/features/org.eclipse.wst.xsl_tests.feature/feature.xml +++ b/xsl/features/org.eclipse.wst.xsl_tests.feature/feature.xml @@ -18,7 +18,7 @@ version="1.1.900.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" - license-feature-version="2.0.0.qualifier"> + license-feature-version="0.0.0"> <description> %description |