Remove unnecessary NON-NLS.
Change-Id: Ic157a62e462245222399531aaa0b37e3334cd3b6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
index 916cd0c..36af80a 100644
--- a/ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
+++ b/ds/org.eclipse.pde.ds.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.ds.core;singleton:=true
-Bundle-Version: 1.1.600.qualifier
+Bundle-Version: 1.1.700.qualifier
Bundle-Activator: org.eclipse.pde.internal.ds.core.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.core.filebuffers;bundle-version="[3.3.0,4.0.0)",
diff --git a/ds/org.eclipse.pde.ds.core/pom.xml b/ds/org.eclipse.pde.ds.core/pom.xml
index 91a8931..6e93921 100644
--- a/ds/org.eclipse.pde.ds.core/pom.xml
+++ b/ds/org.eclipse.pde.ds.core/pom.xml
@@ -20,6 +20,6 @@
</parent>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.ds.core</artifactId>
- <version>1.1.600-SNAPSHOT</version>
+ <version>1.1.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
index 8c730b7..e3574a9 100644
--- a/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
+++ b/ds/org.eclipse.pde.ds.core/src/org/eclipse/pde/internal/ds/core/text/DSDocumentFactory.java
@@ -49,7 +49,7 @@
// TODO this logic needs to be pushed up somehow... we shouldn't care
// about the namespace prefix
- int index = name.indexOf(':'); //$NON-NLS-1$
+ int index = name.indexOf(':');
if (index != -1) {
name = name.substring(index + 1);
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/NLResourceHelper.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/NLResourceHelper.java
index 9e7ead7..e1c38a7 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/NLResourceHelper.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/NLResourceHelper.java
@@ -83,7 +83,7 @@
return s.substring(1);
}
- int ix = s.indexOf(' '); //$NON-NLS-1$
+ int ix = s.indexOf(' ');
String key = ix == -1 ? s : s.substring(0, ix);
String dflt = ix == -1 ? s : s.substring(ix + 1);
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
index 0d93f80..9529eb8 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/ExtensionsErrorReporter.java
@@ -622,7 +622,7 @@
// be careful: people have the option to use the format:
// fullqualifiedName:staticMethod
- int index = value.indexOf(':'); //$NON-NLS-1$
+ int index = value.indexOf(':');
if (index != -1) {
value = value.substring(0, index);
}
diff --git a/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentHandler.java b/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentHandler.java
index 7a0c049..d81ff99 100644
--- a/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentHandler.java
+++ b/ui/org.eclipse.pde.core/text/org/eclipse/pde/internal/core/text/DocumentHandler.java
@@ -182,7 +182,7 @@
int index = lineText.indexOf("</" + node.getXMLTagName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
if (index == -1) {
- index = lineText.indexOf('>'); //$NON-NLS-1$
+ index = lineText.indexOf('>');
if (index == -1) {
endIndex = column;
} else {
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/EquinoxInitializer.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/EquinoxInitializer.java
index f1e2713..108b640 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/EquinoxInitializer.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/EquinoxInitializer.java
@@ -75,7 +75,7 @@
protected String getAutoStart(String bundleID) {
if (fStartLevels.containsKey(bundleID)) {
String value = fStartLevels.get(bundleID).toString();
- return value.substring(value.indexOf(':') + 1); //$NON-NLS-1$
+ return value.substring(value.indexOf(':') + 1);
}
return super.getAutoStart(bundleID);
}
@@ -84,7 +84,7 @@
protected String getStartLevel(String bundleID) {
if (fStartLevels.containsKey(bundleID)) {
String value = fStartLevels.get(bundleID).toString();
- return value.substring(0, value.indexOf(':')); //$NON-NLS-1$
+ return value.substring(0, value.indexOf(':'));
}
return super.getStartLevel(bundleID);
}
@@ -99,7 +99,7 @@
StringTokenizer tokenizer = new StringTokenizer(value, ","); //$NON-NLS-1$
while (tokenizer.hasMoreTokens()) {
String tokenValue = tokenizer.nextToken();
- int index = tokenValue.indexOf('@'); //$NON-NLS-1$
+ int index = tokenValue.indexOf('@');
if (index > 0) {
String bundle = tokenValue.substring(0, index).trim();
fStartLevels.put(bundle, getStartValue(tokenValue.substring(index)));
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java
index 4053692..cb67441 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/compare/ManifestStructureCreator.java
@@ -128,7 +128,7 @@
}
private String extractKey(String headerBuffer) {
- int assign = headerBuffer.indexOf(':'); //$NON-NLS-1$
+ int assign = headerBuffer.indexOf(':');
if (assign != -1)
return headerBuffer.substring(0, assign);
return headerBuffer;
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
index e06b7b0..da03791 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
@@ -58,7 +58,7 @@
public FeatureSearchItemsFilter() {
super();
String pattern = patternMatcher.getPattern();
- if (pattern.indexOf('*') != 0 && pattern.indexOf('?') != 0 && pattern.indexOf('.') != 0) {//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (pattern.indexOf('*') != 0 && pattern.indexOf('?') != 0 && pattern.indexOf('.') != 0) {
pattern = "*" + pattern; //$NON-NLS-1$
patternMatcher.setPattern(pattern);
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java
index aa8c2c6..ecf3267 100755
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java
@@ -44,7 +44,7 @@
public PluginSearchItemsFilter() {
super();
String pattern = patternMatcher.getPattern();
- if (pattern.indexOf('*') != 0 && pattern.indexOf('?') != 0 && pattern.indexOf('.') != 0) {//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (pattern.indexOf('*') != 0 && pattern.indexOf('?') != 0 && pattern.indexOf('.') != 0) {
pattern = "*" + pattern; //$NON-NLS-1$
patternMatcher.setPattern(pattern);
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
index aeea97a..f42bcde 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
@@ -112,9 +112,9 @@
String s1 = e1.toString();
String s2 = e2.toString();
if (s1.contains(" ")) //$NON-NLS-1$
- s1 = s1.substring(0, s1.indexOf(' ')); //$NON-NLS-1$
+ s1 = s1.substring(0, s1.indexOf(' '));
if (s2.contains(" ")) //$NON-NLS-1$
- s2 = s2.substring(0, s2.indexOf(' ')); //$NON-NLS-1$
+ s2 = s2.substring(0, s2.indexOf(' '));
return super.compare(viewer, s1, s2);
}
});
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java
index 5f5caab..7cccb3a 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java
@@ -371,7 +371,7 @@
return;
}
version = version.trim();
- int comInd = version.indexOf(','); //$NON-NLS-1$
+ int comInd = version.indexOf(',');
int lastPos = version.length() - 1;
char first = version.charAt(0);
char last = version.charAt(lastPos);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
index 6420016..81f7c1b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
@@ -195,9 +195,9 @@
String s1 = e1.toString();
String s2 = e2.toString();
if (s1.contains(" ")) //$NON-NLS-1$
- s1 = s1.substring(0, s1.indexOf(' ')); //$NON-NLS-1$
+ s1 = s1.substring(0, s1.indexOf(' '));
if (s2.contains(" ")) //$NON-NLS-1$
- s2 = s2.substring(0, s2.indexOf(' ')); //$NON-NLS-1$
+ s2 = s2.substring(0, s2.indexOf(' '));
return super.compare(viewer, s1, s2);
}
});
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
index 1d67e6e..4de9457 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
@@ -124,7 +124,7 @@
private void initializeExpectedValues() {
// source folder name, package name, class name
- int loc = className.indexOf(':'); //$NON-NLS-1$
+ int loc = className.indexOf(':');
if (loc != -1) {
if (loc < className.length()) {
initialValues.classArgs = className.substring(loc + 1, className.length());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaJavaAttributeDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaJavaAttributeDetails.java
index e3edef7..c2c1959 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaJavaAttributeDetails.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaJavaAttributeDetails.java
@@ -63,7 +63,7 @@
String basedOn = getAttribute().getBasedOn();
if ((basedOn != null) && (basedOn.length() > 0)) {
- int index = basedOn.indexOf(':'); //$NON-NLS-1$
+ int index = basedOn.indexOf(':');
if (index == -1) {
String className = basedOn.substring(basedOn.lastIndexOf(".") + 1); //$NON-NLS-1$
if ((className.length() > 1) && (className.charAt(0) == 'I')) {
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
index 6b9cbac..8eea149 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
@@ -183,7 +183,7 @@
if (value == null) {
getTarget().setNL(null);
} else {
- int index = value.indexOf('-'); //$NON-NLS-1$
+ int index = value.indexOf('-');
if (index > 0)
value = value.substring(0, index);
getTarget().setNL(value.trim());
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TextUtil.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TextUtil.java
index 79c4a30..a6b1869 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TextUtil.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/TextUtil.java
@@ -142,7 +142,7 @@
value = value.trim();
while (value.length() > 0 && !Character.isLetter(value.charAt(0)))
value = value.substring(1, value.length());
- int loc = value.indexOf(':'); //$NON-NLS-1$
+ int loc = value.indexOf(':');
if (loc != -1 && loc > 0)
value = value.substring(0, loc);
else if (loc == 0)
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
index 2ce7846..8755221 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
@@ -106,7 +106,7 @@
private String wMatch = "*"; //$NON-NLS-1$
protected void setMatchText(String match) {
- if (match.indexOf('*') != 0 & match.indexOf('?') != 0 & match.indexOf('.') != 0) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (match.indexOf('*') != 0 & match.indexOf('?') != 0 & match.indexOf('.') != 0) {
match = "*" + match; //$NON-NLS-1$
}
wMatch = match + "*"; //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java
index bc964e5..8a3d17b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/target/TargetDefinitionContentPage.java
@@ -345,7 +345,7 @@
fNLCombo = SWTFactory.createCombo(group, SWT.SINGLE | SWT.BORDER, 1, fNLChoices.toArray(new String[fNLChoices.size()]));
fNLCombo.addModifyListener(e -> {
String value = fNLCombo.getText();
- int index = value.indexOf('-'); //$NON-NLS-1$
+ int index = value.indexOf('-');
if (index > 0)
value = value.substring(0, index);
getTargetDefinition().setNL(getModelValue(value));
