Use contains instead of indexOf
Change-Id: Idd1f7d559496ca6806e39ed7d5caab50bbcf31b5
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java
index 56fef96..ed5d29c 100644
--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java
+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/ApiPlugin.java
@@ -649,7 +649,7 @@
boolean mustRebuild = false;
for (Bundle allFragment : allFragments) {
// We only care about
- if (allFragment.getSymbolicName().indexOf(EE_DESCRIPTION_PREFIX) >= 0) {
+ if (allFragment.getSymbolicName().contains(EE_DESCRIPTION_PREFIX)) {
NameVersionDescriptor current = new NameVersionDescriptor(allFragment.getSymbolicName(), allFragment.getVersion().toString());
if (knownFragments.contains(current)) {
knownFragments.remove(current);
@@ -697,7 +697,7 @@
private String getListOfEEFragments(Bundle[] allFragments) {
StringBuilder result = new StringBuilder();
for (Bundle allFragment : allFragments) {
- if (allFragment.getSymbolicName().indexOf(EE_DESCRIPTION_PREFIX) >= 0) {
+ if (allFragment.getSymbolicName().contains(EE_DESCRIPTION_PREFIX)) {
result.append(allFragment.getSymbolicName());
result.append(';');
result.append(allFragment.getVersion().toString());
diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java
index 6df8d27..381cb75 100644
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java
+++ b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSImplementationTestCase.java
@@ -78,7 +78,7 @@
component.setImplementation(Implementation);
String content = component.toString();
- assertTrue(content.indexOf("class=\"" + className + "\"") != -1);
+ assertTrue(content.contains("class=\"" + className + "\""));
IDSImplementation Implementation0 = component.getImplementation();
assertNotNull(Implementation0);
diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java
index e3e46f8..482d13d 100644
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java
+++ b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSPropertiesTestCase.java
@@ -124,7 +124,7 @@
String content = component.toString();
- assertTrue(content.indexOf("entry=\""+entry+"\"") != -1);
+ assertTrue(content.contains("entry=\""+entry+"\""));
IDSProperties[] PropertiesElements = component.getPropertiesElements();
IDSProperties Properties0 = PropertiesElements[0];
diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java
index a358857..39f3efb 100644
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java
+++ b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSProvideTestCase.java
@@ -47,7 +47,7 @@
provide.setInterface(interfaceName);
String content = fModel.getDSComponent().toString();
- assertTrue(content.indexOf(interfaceName) != -1);
+ assertTrue(content.contains(interfaceName));
assertEquals(provide.getName(), interfaceName);
@@ -74,7 +74,7 @@
String content = component.toString();
- assertTrue(content.indexOf("interface=\"java.lang.Runnable\"") != -1);
+ assertTrue(content.contains("interface=\"java.lang.Runnable\""));
IDSService service0 = component.getService();
assertNotNull(service0);
diff --git a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java
index 126efc2..8c585a5 100644
--- a/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java
+++ b/ds/org.eclipse.pde.ds.tests/src/org/eclipse/pde/internal/ds/tests/DSServiceTestCase.java
@@ -62,7 +62,7 @@
service.setServiceFactory(false);
String string = fModel.getDSComponent().toString();
- assertTrue(string.indexOf("servicefactory=\"false\"") != -1);
+ assertTrue(string.contains("servicefactory=\"false\""));
assertTrue(service.getServiceFactory() == false);
@@ -200,7 +200,7 @@
String content = component.toString();
- assertTrue(content.indexOf("servicefactory=\"true\"") != -1);
+ assertTrue(content.contains("servicefactory=\"true\""));
IDSService service0 = component.getService();
assertNotNull(service0);
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathUtilCore.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathUtilCore.java
index 038c137..b1c2393 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathUtilCore.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathUtilCore.java
@@ -151,29 +151,29 @@
}
public static boolean containsVariables(String name) {
- return name.indexOf("$os$") != -1 //$NON-NLS-1$
- || name.indexOf("$ws$") != -1 //$NON-NLS-1$
- || name.indexOf("$nl$") != -1 //$NON-NLS-1$
- || name.indexOf("$arch$") != -1; //$NON-NLS-1$
+ return name.contains("$os$") //$NON-NLS-1$
+ || name.contains("$ws$") //$NON-NLS-1$
+ || name.contains("$nl$") //$NON-NLS-1$
+ || name.contains("$arch$"); //$NON-NLS-1$
}
public static String expandLibraryName(String source) {
if (source == null || source.length() == 0) {
return ""; //$NON-NLS-1$
}
- if (source.indexOf("$ws$") != -1) { //$NON-NLS-1$
+ if (source.contains("$ws$")) { //$NON-NLS-1$
source = source.replaceAll("\\$ws\\$", //$NON-NLS-1$
"ws" + IPath.SEPARATOR + TargetPlatform.getWS()); //$NON-NLS-1$
}
- if (source.indexOf("$os$") != -1) { //$NON-NLS-1$
+ if (source.contains("$os$")) { //$NON-NLS-1$
source = source.replaceAll("\\$os\\$", //$NON-NLS-1$
"os" + IPath.SEPARATOR + TargetPlatform.getOS()); //$NON-NLS-1$
}
- if (source.indexOf("$nl$") != -1) { //$NON-NLS-1$
+ if (source.contains("$nl$")) { //$NON-NLS-1$
source = source.replaceAll("\\$nl\\$", //$NON-NLS-1$
"nl" + IPath.SEPARATOR + TargetPlatform.getNL()); //$NON-NLS-1$
}
- if (source.indexOf("$arch$") != -1) { //$NON-NLS-1$
+ if (source.contains("$arch$")) { //$NON-NLS-1$
source = source.replaceAll("\\$arch\\$", //$NON-NLS-1$
"arch" + IPath.SEPARATOR + TargetPlatform.getOSArch()); //$NON-NLS-1$
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java
index 3fea5cd..965d75d 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BuildErrorReporter.java
@@ -1002,7 +1002,7 @@
String[] tokens = includes.getTokens();
for (String tokenBasic : tokens) {
String token = tokenBasic.trim();
- if (token.indexOf("*") != -1) { //$NON-NLS-1$
+ if (token.contains("*")) { //$NON-NLS-1$
// skip entries with wildcards
continue;
}
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 6af7205..95f5d1a 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
@@ -579,7 +579,7 @@
}
ArrayList<String> paths = new ArrayList<>();
- if (location.indexOf("$nl$") != -1) { //$NON-NLS-1$
+ if (location.contains("$nl$")) { //$NON-NLS-1$
StringTokenizer tokenizer = new StringTokenizer(TargetPlatform.getNL(), "_"); //$NON-NLS-1$
String language = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String country = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/JarManifestErrorReporter.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/JarManifestErrorReporter.java
index c825fda..b649a48 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/JarManifestErrorReporter.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/JarManifestErrorReporter.java
@@ -86,7 +86,7 @@
try {
IRegion lineRegion = fTextDocument.getLineInformation(l);
String lineStr = fTextDocument.get(lineRegion.getOffset(), lineRegion.getLength());
- if (lineStr.indexOf(valueSubstring) >= 0) {
+ if (lineStr.contains(valueSubstring)) {
return l + 1;
}
} catch (BadLocationException ble) {
@@ -100,7 +100,7 @@
for (int l = header.getLineNumber() + 1; l < header.getLineNumber() + header.getLinesSpan(); l++) {
lineRegion = fTextDocument.getLineInformation(l);
lineStr += fTextDocument.get(lineRegion.getOffset() + 1/* the space */, lineRegion.getLength());
- if (lineStr.indexOf(valueSubstring) >= 0) {
+ if (lineStr.contains(valueSubstring)) {
return l;
}
}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java
index c2237c1..fae08ca 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java
@@ -352,10 +352,10 @@
}
private boolean containsParagraph(String input) {
- if (input.indexOf("<p>") != -1) { //$NON-NLS-1$
+ if (input.contains("<p>")) { //$NON-NLS-1$
return true;
}
- if (input.indexOf("</p>") != -1) { //$NON-NLS-1$
+ if (input.contains("</p>")) { //$NON-NLS-1$
return true;
}
return false;
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java
index ac66da4..0ef2e9e 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePluginBase.java
@@ -575,7 +575,7 @@
else {
singletonValue = Constants.SINGLETON_DIRECTIVE + "=true"; //$NON-NLS-1$
}
- if (value.indexOf(singletonValue) != -1) {
+ if (value.contains(singletonValue)) {
return;
}
getBundle().setHeader(Constants.BUNDLE_SYMBOLICNAME, value + "; " + singletonValue); //$NON-NLS-1$
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/ManifestUtils.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/ManifestUtils.java
index e8dd3a6..827ce95 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/ManifestUtils.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/ManifestUtils.java
@@ -274,7 +274,7 @@
}
private static String splitOnComma(String value) {
- if (value.length() < MANIFEST_MAXLINE || value.indexOf(MANIFEST_LINE_SEPARATOR) >= 0) {
+ if (value.length() < MANIFEST_MAXLINE || value.contains(MANIFEST_LINE_SEPARATOR)) {
return value; // assume the line is already split
}
String[] values = ManifestElement.getArrayFromList(value);
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java
index 890c3b5..a492fcd 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchArgumentsHelper.java
@@ -271,7 +271,7 @@
File[] files = bundleFile.listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
- return name.indexOf(IPDEBuildConstants.BUNDLE_EQUINOX_LAUNCHER) >= 0;
+ return name.contains(IPDEBuildConstants.BUNDLE_EQUINOX_LAUNCHER);
}
});
for (File file : files) {
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java
index 6c4e228..7c7a47d 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/LaunchConfigurationHelper.java
@@ -53,7 +53,7 @@
public static void synchronizeManifests(ILaunchConfiguration config, File configDir) {
try {
String programArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
- if (programArgs.indexOf("-clean") != -1) //$NON-NLS-1$
+ if (programArgs.contains("-clean")) //$NON-NLS-1$
return;
} catch (CoreException e) {
}
@@ -150,7 +150,7 @@
boolean autostart = configuration.getAttribute(IPDELauncherConstants.DEFAULT_AUTO_START, false);
// Special processing for launching with p2 (simple configurator)
- if (osgiBundles != null && osgiBundles.indexOf(IPDEBuildConstants.BUNDLE_SIMPLE_CONFIGURATOR) != -1 && bundles.containsKey(IPDEBuildConstants.BUNDLE_SIMPLE_CONFIGURATOR)) {
+ if (osgiBundles != null && osgiBundles.contains(IPDEBuildConstants.BUNDLE_SIMPLE_CONFIGURATOR) && bundles.containsKey(IPDEBuildConstants.BUNDLE_SIMPLE_CONFIGURATOR)) {
// Write out P2 files (bundles.txt)
URL bundlesTxt = null;
diff --git a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java
index d7a95b1..027d001 100644
--- a/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java
+++ b/ui/org.eclipse.pde.launching/src/org/eclipse/pde/launching/JUnitLaunchConfigurationDelegate.java
@@ -280,7 +280,7 @@
}
// For p2 target, add "-Declipse.p2.data.area=@config.dir/p2" unless already specified by user
if (fAllBundles.containsKey("org.eclipse.equinox.p2.core")) { //$NON-NLS-1$
- if (vmArgs.indexOf("-Declipse.p2.data.area=") < 0) { //$NON-NLS-1$
+ if (!vmArgs.contains("-Declipse.p2.data.area=")) { //$NON-NLS-1$
vmArgs = concatArg(vmArgs, "-Declipse.p2.data.area=@config.dir" + File.separator + "p2"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
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 68e019b..e4d33b2 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
@@ -111,9 +111,9 @@
public int compare(Viewer viewer, Object e1, Object e2) {
String s1 = e1.toString();
String s2 = e2.toString();
- if (s1.indexOf(" ") != -1) //$NON-NLS-1$
+ if (s1.contains(" ")) //$NON-NLS-1$
s1 = s1.substring(0, s1.indexOf(" ")); //$NON-NLS-1$
- if (s2.indexOf(" ") != -1) //$NON-NLS-1$
+ if (s2.contains(" ")) //$NON-NLS-1$
s2 = s2.substring(0, s2.indexOf(" ")); //$NON-NLS-1$
return super.compare(viewer, s1, s2);
}
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 ca2bcce..f03f83f 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
@@ -194,9 +194,9 @@
public int compare(Viewer viewer, Object e1, Object e2) {
String s1 = e1.toString();
String s2 = e2.toString();
- if (s1.indexOf(" ") != -1) //$NON-NLS-1$
+ if (s1.contains(" ")) //$NON-NLS-1$
s1 = s1.substring(0, s1.indexOf(" ")); //$NON-NLS-1$
- if (s2.indexOf(" ") != -1) //$NON-NLS-1$
+ if (s2.contains(" ")) //$NON-NLS-1$
s2 = s2.substring(0, s2.indexOf(" ")); //$NON-NLS-1$
return super.compare(viewer, s1, s2);
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
index a6072e5..82ebe9f 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
@@ -365,7 +365,7 @@
}
public String validate() {
- if (fEeButton.getSelection() && fEeCombo.getText().indexOf(PDEUIMessages.BasicLauncherTab_unbound) != -1)
+ if (fEeButton.getSelection() && fEeCombo.getText().contains(PDEUIMessages.BasicLauncherTab_unbound))
return NLS.bind(PDEUIMessages.BasicLauncherTab_noJreForEeMessage, parseEESelection(fEeCombo.getText()));
return null;
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java
index c078724..076b270 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/NLSFragmentGenerator.java
@@ -94,7 +94,7 @@
@Override
public boolean matches(Object object) {
String path = object.toString();
- return path.indexOf(BIN) != -1 || path.endsWith(SLASH) || path.endsWith(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
+ return path.contains(BIN) || path.endsWith(SLASH) || path.endsWith(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR);
}
});
@@ -114,7 +114,7 @@
@Override
public boolean matches(Object object) {
String path = object.toString();
- return path.indexOf(BIN) != -1 || path.endsWith(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
+ return path.contains(BIN) || path.endsWith(ICoreConstants.BUILD_FILENAME_DESCRIPTOR);
}
});
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
index 8681543..eaf8621 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
@@ -523,7 +523,7 @@
String value = iter.next().toString();
buffer.append(value);
- if (value.indexOf(";version=") == -1 && (version != null) && (values.size() == 1)) { //$NON-NLS-1$
+ if (!value.contains(";version=") && (version != null) && (values.size() == 1)) { //$NON-NLS-1$
buffer.append(";version=\"").append(version).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifest.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifest.java
index f6f90fb..20261d9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifest.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/OrganizeManifest.java
@@ -240,7 +240,7 @@
// allKeys must NOT have any duplicates
for (int j = 0; j < allKeys.size(); j++) {
String akey = '%' + allKeys.get(j) + '%';
- if (entry.indexOf(akey) != -1)
+ if (entry.contains(akey))
allKeys.remove(allKeys.get(j--));
if (allKeys.isEmpty())
return;
