diff options
| author | Lars Vogel | 2019-06-18 08:04:09 +0000 |
|---|---|---|
| committer | Lars Vogel | 2019-06-18 12:41:35 +0000 |
| commit | 12f5f97ce82861982000009e75cf4a0c7af8ee8a (patch) | |
| tree | f969f56b8c683467b30e9a69a1e4ea8c2b7f5f49 /org.eclipse.help.ui | |
| parent | 177d4f34c6e63ee84e2600291ffe0e69f8414a9f (diff) | |
| download | eclipse.platform.ua-12f5f97ce82861982000009e75cf4a0c7af8ee8a.tar.gz eclipse.platform.ua-12f5f97ce82861982000009e75cf4a0c7af8ee8a.tar.xz eclipse.platform.ua-12f5f97ce82861982000009e75cf4a0c7af8ee8a.zip | |
Use String.contains instead of indexOf
Change-Id: I84d41c9ecc1f6b5ca20e39c5ecbbba08ba9e0a93
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'org.eclipse.help.ui')
| -rw-r--r-- | org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BrowserPart.java | 10 | ||||
| -rw-r--r-- | org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java | 2 |
2 files changed, 6 insertions, 6 deletions
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; } |