Use String.contains instead of indexOf

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

14 files changed, 36 insertions, 36 deletions

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
index 2ea5bf807..caddf429d 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BaseHelpSystem.java
@@ -196,7 +196,7 @@ public final class BaseHelpSystem {
 
 	public static URL resolve(String href, boolean documentOnly) {
 		String url = null;
-		if (href == null || href.indexOf("://") != -1 //$NON-NLS-1$
+		if (href == null || href.contains("://") //$NON-NLS-1$
 				   || isFileProtocol(href))
 			url = href;
 		else {
@@ -216,7 +216,7 @@ public final class BaseHelpSystem {
 
 	public static URL resolve(String href, String servlet) {
 		String url = null;
-		if (href == null || href.indexOf("://") != -1 //$NON-NLS-1$
+		if (href == null || href.contains("://") //$NON-NLS-1$
 		   || isFileProtocol(href)) {
 			url = href;
 		}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
index 8ee39938f..0fa246b4c 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/BookmarkManager.java
@@ -120,7 +120,7 @@ public class BookmarkManager extends Observable {
 			// separate the url and title by vertical bar
 
 			// check for duplicates
-			if (bookmarks.indexOf("," + encode(bookmarkURL) + "|") != -1) //$NON-NLS-1$ //$NON-NLS-2$
+			if (bookmarks.contains("," + encode(bookmarkURL) + "|")) //$NON-NLS-1$ //$NON-NLS-2$
 				return;
 			bookmarks = bookmarks
 					+ "," + encode(bookmarkURL) + "|" + encode(title); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
index c7f750b0c..db11a9cc7 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java
@@ -31,11 +31,11 @@ public class HelpBasePreferenceInitializer extends
 
 		String os = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); //$NON-NLS-1$
 
-		if (os.indexOf("windows") != -1) { //$NON-NLS-1$
+		if (os.contains("windows")) { //$NON-NLS-1$
 			prefs
 					.put("custom_browser_path", //$NON-NLS-1$
 							"\"C:\\Program Files\\Internet Explorer\\IEXPLORE.EXE\" %1"); //$NON-NLS-1$
-		} else if (os.indexOf("linux") != -1) { //$NON-NLS-1$
+		} else if (os.contains("linux")) { //$NON-NLS-1$
 			prefs.put("custom_browser_path", //$NON-NLS-1$
 					"konqueror %1"); //$NON-NLS-1$
 		} else {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java
index 63c681ba9..174553313 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/util/TString.java
@@ -24,7 +24,7 @@ public class TString {
 			return in;
 		if (oldPat.length() == 1 && newPat.length() == 1)
 			return in.replace(oldPat.charAt(0), newPat.charAt(0));
-		if (in.indexOf(oldPat) < 0)
+		if (!in.contains(oldPat))
 			return in;
 		int lastIndex = 0;
 		int newIndex = 0;
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java
index 1810c9c48..78d97e608 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaBrowserAdapter.java
@@ -191,13 +191,13 @@ public class MozillaBrowserAdapter implements IBrowser {
 		private boolean errorsInOutput(StreamConsumer outputs, StreamConsumer errors) {
 			try {
 				outputs.join(1000);
-				if (outputs.getLastLine() != null && (outputs.getLastLine().indexOf("No running window found") >= 0 //$NON-NLS-1$
-						|| outputs.getLastLine().indexOf("not running on display") >= 0)) {//$NON-NLS-1$
+				if (outputs.getLastLine() != null && (outputs.getLastLine().contains("No running window found") //$NON-NLS-1$
+						|| outputs.getLastLine().contains("not running on display"))) {//$NON-NLS-1$
 					return true;
 				}
 				errors.join(1000);
-				if (errors.getLastLine() != null && (errors.getLastLine().indexOf("No running window found") >= 0 //$NON-NLS-1$
-						|| errors.getLastLine().indexOf("not running on display") >= 0)) {//$NON-NLS-1$
+				if (errors.getLastLine() != null && (errors.getLastLine().contains("No running window found") //$NON-NLS-1$
+						|| errors.getLastLine().contains("not running on display"))) {//$NON-NLS-1$
 
 					return true;
 				}
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
index 4c96eb64d..40fe8686b 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/browser/MozillaFactory.java
@@ -74,13 +74,13 @@ public class MozillaFactory implements IBrowserFactory, IExecutableExtension {
 		try {
 			outputs.join(1000);
 			if (outputs.getLastLine() != null
-					&& outputs.getLastLine().indexOf("no " + executable + " in") >= 0) {//$NON-NLS-1$ //$NON-NLS-2$
+					&& outputs.getLastLine().contains("no " + executable + " in")) {//$NON-NLS-1$ //$NON-NLS-2$
 
 				return true;
 			}
 			errors.join(1000);
 			if (errors.getLastLine() != null
-					&& errors.getLastLine().indexOf("no " + executable + " in") >= 0) { //$NON-NLS-1$ //$NON-NLS-2$
+					&& errors.getLastLine().contains("no " + executable + " in")) { //$NON-NLS-1$ //$NON-NLS-2$
 				return true;
 			}
 		} catch (InterruptedException ie) {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
index a4b48b383..04f17582f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/protocols/HelpURLConnection.java
@@ -126,7 +126,7 @@ public class HelpURLConnection extends URLConnection {
 			throw new IOException("Resource not found."); //$NON-NLS-1$
 		}
 
-		if (getFile() == null || "".equals(getFile()) || getFile().indexOf("..\\") >= 0) { //$NON-NLS-1$ //$NON-NLS-2$
+		if (getFile() == null || "".equals(getFile()) || getFile().contains("..\\")) { //$NON-NLS-1$ //$NON-NLS-2$
 			throw new IOException("Resource not found."); //$NON-NLS-1$
 		}
 
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
index 9397a66a3..107076697 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
@@ -1060,10 +1060,10 @@ public class SearchIndex implements IHelpSearchIndex {
 				|| fileName.endsWith(".xml") //$NON-NLS-1$
 				|| fileName.endsWith(".txt")) { //$NON-NLS-1$
 			// indexable
-		} else if (fileName.indexOf(".htm#") >= 0 //$NON-NLS-1$
-				|| fileName.indexOf(".html#") >= 0 //$NON-NLS-1$
-				|| fileName.indexOf(".xhtml#") >= 0 //$NON-NLS-1$
-				|| fileName.indexOf(".xml#") >= 0) { //$NON-NLS-1$
+		} else if (fileName.contains(".htm#") //$NON-NLS-1$
+				|| fileName.contains(".html#") //$NON-NLS-1$
+				|| fileName.contains(".xhtml#") //$NON-NLS-1$
+				|| fileName.contains(".xml#")) { //$NON-NLS-1$
 			url = url.substring(0, url.lastIndexOf('#'));
 			// its a fragment, index whole document
 		} else {
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java
index 8ec7a035e..f851f6d70 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/xhtml/XHTMLContentDescriber.java
@@ -37,7 +37,7 @@ public class XHTMLContentDescriber implements IContentDescriber {
 			char[] chars = new char[BUFFER_SIZE];
 			reader.read(chars);
 			String str = new String(chars);
-			return (str.indexOf(XHTML_DTD_PREFIX) != -1) ? VALID : INVALID;
+			return (str.contains(XHTML_DTD_PREFIX)) ? VALID : INVALID;
 		}
 		catch (Exception e) {
 			return INDETERMINATE;
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java
index 1d6ceabc6..e9b827508 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java
@@ -116,7 +116,7 @@ public class BrowserPart extends AbstractFormPart implements IHelpPart {
 			@Override
 			public void changed(LocationEvent event) {
 				String url = event.location;
-				boolean isResult = url.indexOf("resultof")!=-1; //$NON-NLS-1$
+				boolean isResult = url.contains("resultof"); //$NON-NLS-1$
 				BrowserPart.this.parent.browserChanged(url);
 				BrowserPart.this.url = url;
 				updateSyncTocAction();
@@ -172,7 +172,7 @@ public class BrowserPart extends AbstractFormPart implements IHelpPart {
 			IStatusLineManager statusLine = BrowserPart.this.parent.getStatusLineManager();
 			if (statusLine != null)
 				statusLine.setMessage(event.text);
-			if (event.text.indexOf("://") != -1) //$NON-NLS-1$
+			if (event.text.contains("://")) //$NON-NLS-1$
 				statusURL = event.text;
 		});
 		browser.addOpenWindowListener(event -> {
@@ -253,7 +253,7 @@ public class BrowserPart extends AbstractFormPart implements IHelpPart {
 				IScopeContext instanceScope = InstanceScope.INSTANCE;
 				IEclipsePreferences prefs = instanceScope.getNode(HelpBasePlugin.PLUGIN_ID);
 				prefs.putBoolean(HIGHLIGHT_ON, highlightAction.isChecked());
-				if (browser.getUrl().indexOf("resultof")!=-1) browser.execute("setHighlight(" +highlightAction.isChecked()+");"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				if (browser.getUrl().contains("resultof")) browser.execute("setHighlight(" +highlightAction.isChecked()+");"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 		};
 		highlightAction.setChecked(highlight);
@@ -401,8 +401,8 @@ public class BrowserPart extends AbstractFormPart implements IHelpPart {
 	}
 
 	private boolean redirectLink(final String url) {
-		if (url.indexOf("/topic/") != -1) { //$NON-NLS-1$
-			if (url.indexOf("noframes") == -1) { //$NON-NLS-1$
+		if (url.contains("/topic/")) { //$NON-NLS-1$
+			if (!url.contains("noframes")) { //$NON-NLS-1$
 				return true;
 			}
 		} else if (url.indexOf("livehelp/?pluginID=")>0) { //$NON-NLS-1$
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
index 82d56d1cb..f4128df83 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
@@ -1354,7 +1354,7 @@ public class ReusableHelpPart implements IHelpUIConstants,
 	}
 
 	public boolean isHelpResource(String url) {
-		if (url == null || url.indexOf("://") == -1) //$NON-NLS-1$
+		if (url == null || !url.contains("://")) //$NON-NLS-1$
 			return true;
 		return false;
 	}
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
index 3f2a2d76d..51517945c 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
@@ -205,7 +205,7 @@ public class UrlUtil {
 		}
 
 		if (new WebappPreferences().isRestrictTopicParameter()) {
-		    if (path.indexOf(":/") >= 0) {  //$NON-NLS-1$
+		    if (path.contains(":/")) {  //$NON-NLS-1$
 			    return false;
 		    }
 		}
@@ -266,7 +266,7 @@ public class UrlUtil {
 		    return false;
         agent=agent.toLowerCase(Locale.ENGLISH);
 		// sample substring Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)
-		return agent.indexOf("bot") >= 0 || agent.indexOf("crawl") >= 0//$NON-NLS-1$ //$NON-NLS-2$
+		return agent.contains("bot") || agent.contains("crawl")//$NON-NLS-1$ //$NON-NLS-2$
                 || request.getParameter("bot") != null;//$NON-NLS-1$
     }
 
@@ -280,10 +280,10 @@ public class UrlUtil {
 		    return false;
 		agent=agent.toLowerCase(Locale.ENGLISH);
 		// sample substring Gecko/20020508
-		if (agent.indexOf("like gecko") >= 0) { //$NON-NLS-1$
+		if (agent.contains("like gecko")) { //$NON-NLS-1$
 			return false;
 		}
-		return agent.indexOf("gecko") >= 0; //$NON-NLS-1$
+		return agent.contains("gecko"); //$NON-NLS-1$
 	}
 
 	public static boolean isIE(HttpServletRequest request) {
@@ -303,7 +303,7 @@ public class UrlUtil {
 		}
 		//
 
-		return (agent.indexOf("msie") >= 0); //$NON-NLS-1$
+		return (agent.contains("msie")); //$NON-NLS-1$
 	}
 
 	public static String getIEVersion(HttpServletRequest request) {
@@ -341,7 +341,7 @@ public class UrlUtil {
 		if (agent==null)
 		    return false;
 		agent=agent.toLowerCase(Locale.ENGLISH);
-		return agent.indexOf("konqueror") >= 0; //$NON-NLS-1$
+		return agent.contains("konqueror"); //$NON-NLS-1$
 	}
 
 	/**
@@ -359,7 +359,7 @@ public class UrlUtil {
 		if (agent==null)
 		    return false;
 		agent=agent.toLowerCase(Locale.ENGLISH);
-		return agent.indexOf("mozilla/5") >= 0; //$NON-NLS-1$
+		return agent.contains("mozilla/5"); //$NON-NLS-1$
 	}
 
 	public static String getMozillaVersion(HttpServletRequest request) {
@@ -371,7 +371,7 @@ public class UrlUtil {
 		if (agent==null)
 		    return "0"; //$NON-NLS-1$
 		agent=agent.toLowerCase(Locale.ENGLISH);
-		if (agent.indexOf("mozilla/5") < 0) //$NON-NLS-1$
+		if (!agent.contains("mozilla/5")) //$NON-NLS-1$
 			return "0"; //$NON-NLS-1$
 		int start = agent.indexOf("rv:") + "rv:".length(); //$NON-NLS-1$ //$NON-NLS-2$
 		if (start < "rv:".length() || start >= agent.length()) //$NON-NLS-1$
@@ -391,7 +391,7 @@ public class UrlUtil {
 		if (agent==null)
 		    return false;
 		agent=agent.toLowerCase(Locale.ENGLISH);
-		return agent.indexOf("opera") >= 0; //$NON-NLS-1$
+		return agent.contains("opera"); //$NON-NLS-1$
 	}
 
 	public static String getOperaVersion(String agent) {
@@ -417,7 +417,7 @@ public class UrlUtil {
 		if (agent==null)
 		    return false;
 		agent=agent.toLowerCase(Locale.ENGLISH);
-		return agent.indexOf("safari/") >= 0; //$NON-NLS-1$
+		return agent.contains("safari/"); //$NON-NLS-1$
 	}
 
 	public static String getSafariVersion(HttpServletRequest request) {
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
index 20470287f..e7aaf9bb1 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
@@ -89,7 +89,7 @@ public class EclipseConnector {
 		    //System.out.println("Transfer " + url); //$NON-NLS-1$
 			// Redirect if the request includes PLUGINS_ROOT and is not a content request
 			int index = url.lastIndexOf(HelpURLConnection.PLUGINS_ROOT);
-			if (index!= -1 && url.indexOf("content/" + HelpURLConnection.PLUGINS_ROOT) == -1) {  //$NON-NLS-1$
+			if (index!= -1 && !url.contains("content/" + HelpURLConnection.PLUGINS_ROOT)) {  //$NON-NLS-1$
 				StringBuilder redirectURL = new StringBuilder();
 
 				redirectURL.append(req.getContextPath());
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/utils/JSonHelper.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/utils/JSonHelper.java
index 693be9d1a..56019b24d 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/utils/JSonHelper.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/utils/JSonHelper.java
@@ -59,7 +59,7 @@ public final class JSonHelper {
 		if (str == null) {
 			return ""; //$NON-NLS-1$
 		}
-		if (str.indexOf(DOUBLEQUOTE) < 0) {
+		if (!str.contains(DOUBLEQUOTE)) {
 			return DOUBLEQUOTE + str + DOUBLEQUOTE;
 		}
 		return DOUBLEQUOTE + str.replaceAll(DOUBLEQUOTE, "\\\\" + DOUBLEQUOTE) + DOUBLEQUOTE; //$NON-NLS-1$