Use String.contains instead of indexOf

Change-Id: I5126c0ac5a7897a7033d65935fcb5c7db461f798
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

6 files changed, 8 insertions, 8 deletions

diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java
index b79d7f8b8..c7df06c1b 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java
@@ -95,6 +95,6 @@ public class ParseFromString {
 		ICheatSheet cheatSheet = parser.parse(input, CheatSheetParser.SIMPLE_ONLY);
 		assertNull(cheatSheet);
 		assertEquals(Status.ERROR, parser.getStatus().getSeverity());
-		assertTrue(parser.getStatus().getMessage().indexOf("must contain at least one <item>") >= 0);
+		assertTrue(parser.getStatus().getMessage().contains("must contain at least one <item>"));
 	}
 }
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/StatusCheck.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/StatusCheck.java
index 9ebd805af..93c71c020 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/StatusCheck.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/StatusCheck.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.MultiStatus;
 public class StatusCheck {
 
 	public static void assertStatusContains(IStatus status, String text) {
-		if (status.getMessage().indexOf(text) == -1) {
+		if (!status.getMessage().contains(text)) {
 			Assert.fail("Expected status message to contain '" + text + "' actual message is '"
 					+ status.getMessage() + "'");
 		}
@@ -36,11 +36,11 @@ public class StatusCheck {
 		Assert.assertTrue(status instanceof MultiStatus);
 		IStatus[] children = status.getChildren();
 		for (IStatus element : children) {
-			if (element.getMessage().indexOf(text) >= 0) {
+			if (element.getMessage().contains(text)) {
 				return;
 			}
 		}
-		if (status.getMessage().indexOf(text) == -1) {
+		if (!status.getMessage().contains(text)) {
 			Assert.fail("Expected status message to contain '" + text + "' status.toString = '"
 					+ status.toString() + "'");
 		}
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ProducerSerializerTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ProducerSerializerTest.java
index ded1f13e1..2c4aaa4b8 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ProducerSerializerTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/util/ProducerSerializerTest.java
@@ -48,7 +48,7 @@ public class ProducerSerializerTest {
 		IToc[] tocs = HelpSystem.getTocs();
 		for (IToc toc : tocs) {
 			// only look for content in data/help/producer
-			if (toc.getHref().indexOf("data/help/producer/") != -1) {
+			if (toc.getHref().contains("data/help/producer/")) {
 				ITopic[] topics = toc.getTopics();
 				// only goes one level deep - don't need subtopics here
 				for (ITopic topic : topics) {
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
index 1181c901a..ab8e0df3e 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webextension/TitleSearchData.java
@@ -54,7 +54,7 @@ public SearchResult[] getSearchResults() {
 }
 
 private void searchTopic(ITopic topic) {
-	if (topic.getLabel().toLowerCase().indexOf(searchTerm.toLowerCase()) != -1
+	if (topic.getLabel().toLowerCase().contains(searchTerm.toLowerCase())
 		&& topic.getHref() != null) {
 		SearchResult result = new SearchResult();
 		result.title = topic.getLabel();
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroContainer.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroContainer.java
index e6bdc8cab..6e256e0af 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroContainer.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/AbstractIntroContainer.java
@@ -443,7 +443,7 @@ public abstract class AbstractIntroContainer extends AbstractBaseIntroElement {
     public AbstractIntroElement findTarget(AbstractIntroContainer container,
             String path, String extensionId) {
         // resolve path segments if they are incomplete.
-        if (path.indexOf("@")!= -1) { //$NON-NLS-1$
+        if (path.contains("@")) { //$NON-NLS-1$
         	// new in 3.2: dynamic resolution of incomplete target paths
         	IntroModelRoot root = getModelRoot();
         	if (root!=null) {
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
index c558e68af..87e04139e 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/url/IntroURL.java
@@ -614,7 +614,7 @@ public class IntroURL implements IIntroURL {
         StringBuilder url = new StringBuilder();
         url.append("http://org.eclipse.ui.intro/"); //$NON-NLS-1$
         url.append(command.getReplaceValue().trim());
-        if (command.getReplaceValue().indexOf("?") == -1) //$NON-NLS-1$
+        if (!command.getReplaceValue().contains("?")) //$NON-NLS-1$
             // command does not have parameters.
             url.append("?"); //$NON-NLS-1$
         else