Bug 548309 - String.indexOf can be replaced with String.contains

Change-Id: I525283fa5789c02cbf9512a835ce822b5f6dca1a
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

16 files changed, 34 insertions, 34 deletions

diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/Checks.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/Checks.java
index b274b5983f..42a66879a7 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/Checks.java
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/Checks.java
@@ -176,7 +176,7 @@ public class Checks {
 	 */
 	public static RefactoringStatus checkTypeName(String name, IJavaElement context) {
 		//fix for: 1GF5Z0Z: ITPJUI:WINNT - assertion failed after renameType refactoring
-		if (name.indexOf(".") != -1) //$NON-NLS-1$
+		if (name.contains(".")) //$NON-NLS-1$
 			return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.Checks_no_dot);
 		else
 			return checkName(name, JavaConventionsUtil.validateJavaTypeName(name, context));
diff --git a/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF
index 5747a2ccc9..d2ca4fb486 100644
--- a/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.junit.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.junit.core
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.junit.core;singleton:=true
-Bundle-Version: 3.10.500.qualifier
+Bundle-Version: 3.10.600.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.junit.JUnitCorePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.junit.core/pom.xml b/org.eclipse.jdt.junit.core/pom.xml
index a50e45fb8e..27ecf2b585 100644
--- a/org.eclipse.jdt.junit.core/pom.xml
+++ b/org.eclipse.jdt.junit.core/pom.xml
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.junit.core</artifactId>
-  <version>3.10.500-SNAPSHOT</version>
+  <version>3.10.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java
index b204963c5a..93bf572c43 100644
--- a/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java
+++ b/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/JUnitContainerInitializer.java
@@ -228,37 +228,37 @@ public class JUnitContainerInitializer extends ClasspathContainerInitializer {
 		} else {
 			String lastSegment= entry.getPath().lastSegment();
 			if (JUNIT4.equals(version)) {
-				if (lastSegment.indexOf("junit") != -1) { //$NON-NLS-1$
+				if (lastSegment.contains("junit")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT4_JAVADOC;
 				} else {
 					return JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC;
 				}
 			} else if (JUNIT5.equals(version)) {
-				if (lastSegment.indexOf("jupiter.api") != -1) { //$NON-NLS-1$
+				if (lastSegment.contains("jupiter.api")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_JUPITER_API_JAVADOC;
-				} else if (lastSegment.indexOf("jupiter.engine") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("jupiter.engine")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_JUPITER_ENGINE_JAVADOC;
-				} else if (lastSegment.indexOf("jupiter.migrationsupport") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("jupiter.migrationsupport")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_JUPITER_MIGRATIONSUPPORT_JAVADOC;
-				} else if (lastSegment.indexOf("jupiter.params") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("jupiter.params")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_JUPITER_PARAMS_JAVADOC;
-				} else if (lastSegment.indexOf("platform.commons") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("platform.commons")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_PLATFORM_COMMONS_JAVADOC;
-				} else if (lastSegment.indexOf("platform.engine") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("platform.engine")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_PLATFORM_ENGINE_JAVADOC;
-				} else if (lastSegment.indexOf("platform.launcher") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("platform.launcher")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_PLATFORM_LAUNCHER_JAVADOC;
-				} else if (lastSegment.indexOf("platform.runner") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("platform.runner")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_PLATFORM_RUNNER_JAVADOC;
-				} else if (lastSegment.indexOf("platform.suite.api") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("platform.suite.api")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_PLATFORM_SUITE_API_JAVADOC;
-				} else if (lastSegment.indexOf("vintage.engine") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("vintage.engine")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_VINTAGE_ENGINE_JAVADOC;
-				} else if (lastSegment.indexOf("opentest4j") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("opentest4j")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_OPENTEST4J_JAVADOC;
-				} else if (lastSegment.indexOf("apiguardian") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("apiguardian")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT_APIGUARDIAN_JAVADOC;
-				} else if (lastSegment.indexOf("junit") != -1) { //$NON-NLS-1$
+				} else if (lastSegment.contains("junit")) { //$NON-NLS-1$
 					return JUnitPreferencesConstants.JUNIT4_JAVADOC;
 				} else {
 					return JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC;
diff --git a/org.eclipse.jdt.junit/META-INF/MANIFEST.MF b/org.eclipse.jdt.junit/META-INF/MANIFEST.MF
index 369996370c..536856cba3 100644
--- a/org.eclipse.jdt.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.junit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.junit
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.junit;singleton:=true
-Bundle-Version: 3.11.600.qualifier
+Bundle-Version: 3.11.700.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.junit.ui.JUnitPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.junit/pom.xml b/org.eclipse.jdt.junit/pom.xml
index 69cb84a6ee..268f4f40e5 100644
--- a/org.eclipse.jdt.junit/pom.xml
+++ b/org.eclipse.jdt.junit/pom.xml
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.junit</artifactId>
-  <version>3.11.600-SNAPSHOT</version>
+  <version>3.11.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
index ae534bd5ba..5e580cbb4c 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java
@@ -216,7 +216,7 @@ public class JUnitPreferencePage extends PreferencePage implements IWorkbenchPre
 		@Override
 		public Image getColumnImage(Object object, int column) {
 			String name= ((Filter) object).getName();
-			if (name.indexOf(".*") != - 1 || name.equals(JUnitMessages.JUnitMainTab_label_defaultpackage)) {  //$NON-NLS-1$
+			if (name.contains(".*") || name.equals(JUnitMessages.JUnitMainTab_label_defaultpackage)) {  //$NON-NLS-1$
 				//package
 				return IMG_PKG;
 			} else if ("".equals(name)) { //$NON-NLS-1$
diff --git a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TextualTrace.java b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TextualTrace.java
index 33e4d1c181..6765606b4e 100644
--- a/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TextualTrace.java
+++ b/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/TextualTrace.java
@@ -133,7 +133,7 @@ public class TextualTrace {
 
 	private boolean isAStackFrame(String itemLabel) {
 		// heuristic for detecting a stack frame - works for JDK
-		return itemLabel.indexOf(" at ") >= 0; //$NON-NLS-1$
+		return itemLabel.contains(" at "); //$NON-NLS-1$
 	}
 
 	private String readLine(BufferedReader bufferedReader) throws IOException {
diff --git a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
index 037c13c655..e980d46477 100644
--- a/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
+++ b/org.eclipse.jdt.ui.examples.javafamily/src/org/eclipse/jdt/internal/ui/examples/jspeditor/Jsp2JavaTagHandler.java
@@ -84,11 +84,11 @@ public class Jsp2JavaTagHandler implements ITagHandler {
 	@Override
 	public int backTranslateOffsetInLine(String originalLine, String translatedLine, int offsetInTranslatedLine) {
 		int javaPartitionStart= 0;
-		if (originalLine.indexOf("<%") != -1) //$NON-NLS-1$
+		if (originalLine.contains("<%")) //$NON-NLS-1$
 			javaPartitionStart= handleJavaSection(originalLine, offsetInTranslatedLine);
-		else if (originalLine.indexOf("<jsp:useBean id=\"") != -1)  { //$NON-NLS-1$
+		else if (originalLine.contains("<jsp:useBean id=\""))  { //$NON-NLS-1$
 			javaPartitionStart= handleUseBeanTag(originalLine, offsetInTranslatedLine);
-		} else if (originalLine.indexOf("<c:out value=\"${") != -1)  { //$NON-NLS-1$
+		} else if (originalLine.contains("<c:out value=\"${"))  { //$NON-NLS-1$
 			javaPartitionStart= handleTagLib(originalLine, offsetInTranslatedLine);
 		}
 		return javaPartitionStart;
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java
index b89c9d6944..83ab1cea25 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java
@@ -8158,7 +8158,7 @@ public class CleanUpTest extends CleanUpTestCase {
 		assertTrue(entries.length == 1);
 		String message= entries[0].getMessage();
 		assertTrue(message, entries[0].isInfo());
-		assertTrue(message, message.indexOf("ambiguous") != -1);
+		assertTrue(message, message.contains("ambiguous"));
 	}
 
 	public void testOrganizeImports02() throws Exception {
@@ -8177,7 +8177,7 @@ public class CleanUpTest extends CleanUpTestCase {
 		assertTrue(entries.length == 1);
 		String message= entries[0].getMessage();
 		assertTrue(message, entries[0].isInfo());
-		assertTrue(message, message.indexOf("parse") != -1);
+		assertTrue(message, message.contains("parse"));
 	}
 
 	public void testOrganizeImportsBug202266() throws Exception {
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
index 291088cf23..4de1eee4e4 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
@@ -139,7 +139,7 @@ public class QuickFixTest extends TestCase {
 		for (int i= 0; i < proposals.size(); i++) {
 			ICompletionProposal proposal= proposals.get(i);
 			String name= proposal.getDisplayString();
-			if (name == null || name.length() == 0 || name.charAt(0) == '!' || name.indexOf("{0}") != -1 || name.indexOf("{1}") != -1) {
+			if (name == null || name.length() == 0 || name.charAt(0) == '!' || name.contains("{0}") || name.contains("{1}")) {
 				assertTrue("wrong proposal label: " + name, false);
 			}
 			if (proposal.getImage() == null) {
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/NLSSearchTestHelper.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/NLSSearchTestHelper.java
index f567ec75c0..577792e7fa 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/NLSSearchTestHelper.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/search/NLSSearchTestHelper.java
@@ -71,7 +71,7 @@ public class NLSSearchTestHelper {
 			if (match.getElement() instanceof ICompilationUnit) {
 				ICompilationUnit unit= (ICompilationUnit)match.getElement();
 				String field= unit.getSource().substring(match.getOffset(), match.getOffset() + match.getLength());
-				if ((isAccessor && field.indexOf(key) != -1) || (!isAccessor && field.equals(key)))
+				if ((isAccessor && field.contains(key)) || (!isAccessor && field.equals(key)))
 					return;
 			}
 		}
@@ -84,13 +84,13 @@ public class NLSSearchTestHelper {
 			if (match.getElement() instanceof CompilationUnitEntry) {
 				ICompilationUnit unit= ((CompilationUnitEntry)match.getElement()).getCompilationUnit();
 				String field= unit.getSource().substring(match.getOffset(), match.getOffset() + match.getLength());
-				if ((isAccessor && field.indexOf(key) != -1) || (!isAccessor && field.equals(key)))
+				if ((isAccessor && field.contains(key)) || (!isAccessor && field.equals(key)))
 					return;
 			} else if (match.getElement() instanceof FileEntry) {
 				FileEntry entry= (FileEntry)match.getElement();
 				String content= getContent(entry.getPropertiesFile());
 				String propkey= content.substring(match.getOffset(), match.getOffset() + match.getLength());
-				if ((isAccessor && propkey.indexOf(key) != -1) || (!isAccessor && propkey.equals(key)))
+				if ((isAccessor && propkey.contains(key)) || (!isAccessor && propkey.equals(key)))
 					return;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java
index b9da9e6d41..5ab325c692 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchResultRequestor.java
@@ -136,7 +136,7 @@ class NLSSearchResultRequestor extends SearchRequestor {
 		if (javaElement instanceof ISourceReference) {
 			String source= ((ISourceReference) javaElement).getSource();
 			if (source != null) {
-				if (source.indexOf("NLS.initializeMessages") != -1) //$NON-NLS-1$
+				if (source.contains("NLS.initializeMessages")) //$NON-NLS-1$
 					return;
 			}
 		}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaCompletionProposal.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaCompletionProposal.java
index 5ef41a1894..0b48a472db 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaCompletionProposal.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/JavaCompletionProposal.java
@@ -132,7 +132,7 @@ public class JavaCompletionProposal extends AbstractJavaCompletionProposal {
 					}
 				}
 			}
-		} else if (word.indexOf("this.") != -1) { //$NON-NLS-1$
+		} else if (word.contains("this.")) { //$NON-NLS-1$
 			word= word.substring(word.indexOf("this.") + 5); //$NON-NLS-1$
 		}
 		return isPrefix(prefix, word);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDoc2HTMLTextReader.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDoc2HTMLTextReader.java
index e761cda635..b7d01eedfd 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDoc2HTMLTextReader.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavaDoc2HTMLTextReader.java
@@ -107,7 +107,7 @@ public class JavaDoc2HTMLTextReader extends SubstitutionTextReader {
 
 	private String substituteQualification(String qualification) {
 		String result;
-		if (qualification.indexOf("<a") == -1) { //$NON-NLS-1$
+		if (!qualification.contains("<a")) { //$NON-NLS-1$
 			// No tag at all, use smart way
 			result= qualification.replace('#', '.');
 		} else {
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/spelling/engine/DefaultPhoneticHashProvider.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/spelling/engine/DefaultPhoneticHashProvider.java
index 72bb9d9a60..0d91cd82cf 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/spelling/engine/DefaultPhoneticHashProvider.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/spelling/engine/DefaultPhoneticHashProvider.java
@@ -171,7 +171,7 @@ public final class DefaultPhoneticHashProvider implements IPhoneticHashProvider
 
 		for (int index= 0; index < candidates.length; index++) {
 
-			if (token.indexOf(candidates[index]) >= 0)
+			if (token.contains(candidates[index]))
 				return true;
 		}
 		return false;