diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java index cfd4d34f8e0e..538228db9341 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java @@ -92,7 +92,7 @@ public class CompilerErrorTreeView extends NewErrorTreeViewPanel { final NavigatableMessageElement messageElement = (NavigatableMessageElement)errorTreeElement; final String[] text = messageElement.getText(); if (text.length > 0) { - if (text[0].startsWith("[") && text[0].indexOf("]") != -1) { + if (text[0].startsWith("[") && text[0].contains("]")) { final Navigatable navigatable = messageElement.getNavigatable(); if (navigatable instanceof OpenFileDescriptor) { final OpenFileDescriptor fileDescriptor = (OpenFileDescriptor)navigatable; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java index f58ed9d891fb..f3493c047f3d 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java @@ -79,7 +79,7 @@ public class PsiBasedFormatterModelWithShiftIndentInside extends PsiBasedFormatt @NonNls final String cdataStartMarker = ""; - if(type == XmlTokenType.XML_CDATA_END && whiteSpace.indexOf(cdataEndMarker) == -1) { + if(type == XmlTokenType.XML_CDATA_END && !whiteSpace.contains(cdataEndMarker)) { final ASTNode at = findElementAt(prevNode.getStartOffset()); if (at != null && at.getPsi() instanceof PsiWhiteSpace) { diff --git a/jps/antLayout/src/jetbrains/antlayout/datatypes/JarContainer.java b/jps/antLayout/src/jetbrains/antlayout/datatypes/JarContainer.java index 9d3d93fa7655..bc7fb86ac086 100644 --- a/jps/antLayout/src/jetbrains/antlayout/datatypes/JarContainer.java +++ b/jps/antLayout/src/jetbrains/antlayout/datatypes/JarContainer.java @@ -16,7 +16,7 @@ public class JarContainer extends ZipContainer { protected Zip createTask() { String version = Main.getAntVersion(); Jar task; - if (version != null && (version.indexOf("1.8.0") != -1 || version.indexOf("1.8.1") != -1)) { + if (version != null && (version.contains("1.8.0") || version.contains("1.8.1"))) { task = new PatchedJar(); } else { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java b/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java index eb85d3ee804b..a2dd7a6a2816 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java @@ -39,7 +39,7 @@ public class IdeFocusTraversalPolicy extends LayoutFocusTraversalPolicyExt { final FocusTraversalPolicy focusTraversalPolicy = getFocusTraversalPolicyAwtImpl(component); if (focusTraversalPolicy != null && focusTraversalPolicy != policyToIgnore) { - if (focusTraversalPolicy.getClass().getName().indexOf("LegacyGlueFocusTraversalPolicy") >=0) { + if (focusTraversalPolicy.getClass().getName().contains("LegacyGlueFocusTraversalPolicy")) { return component; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java index aee67c36640c..dbd4d143da39 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java @@ -106,7 +106,7 @@ public class AntUIUtil { String name = AntInstallation.NAME.get(antProperties); component.append(name, SimpleTextAttributes.REGULAR_ATTRIBUTES); String versionString = AntInstallation.VERSION.get(antProperties); - if (name.indexOf(versionString) == -1) + if (!name.contains(versionString)) component.append(" (" + versionString + ")", SimpleTextAttributes.SYNTHETIC_ATTRIBUTES); } diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/PropertyExpander.java b/plugins/ant/src/com/intellij/lang/ant/dom/PropertyExpander.java index f92d7024bc84..448a908d34e6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/PropertyExpander.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/PropertyExpander.java @@ -172,7 +172,7 @@ public class PropertyExpander { String getResult() { final String value = myBuilder.toString(); - if (value.indexOf("$$") >= 0) { + if (value.contains("$$")) { return $$_PATTERN.matcher(value).replaceAll("\\$"); } return value; diff --git a/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/RequestProcessor.java b/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/RequestProcessor.java index 0d41007b846c..b67bc4f956b2 100644 --- a/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/RequestProcessor.java +++ b/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/RequestProcessor.java @@ -318,7 +318,7 @@ public final class RequestProcessor implements IRequestProcessor { } private boolean isValidRequest(String request) { - return responseServices.getValidRequests().indexOf(request) >= 0; + return responseServices.getValidRequests().contains(request); } private void sendRequest(IRequest request, IConnectionStreams connectionStreams) throws CommandAbortedException, IOException { diff --git a/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/command/update/UpdateMessageParser.java b/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/command/update/UpdateMessageParser.java index b36daee74f3d..3451777495f6 100644 --- a/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/command/update/UpdateMessageParser.java +++ b/plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/command/update/UpdateMessageParser.java @@ -103,7 +103,7 @@ public final class UpdateMessageParser extends AbstractMessageParser implements return; } - if (line.indexOf(EXAM_DIR) >= 0) { + if (line.contains(EXAM_DIR)) { return; } @@ -171,7 +171,7 @@ public final class UpdateMessageParser extends AbstractMessageParser implements if (line.length() > 2) { if (line.charAt(1) == ' ') { final String firstChar = line.substring(0, 1); - if (STATES.indexOf(firstChar) >= 0) { + if (STATES.contains(firstChar)) { processFile(line.substring(2), firstChar); } } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java index fcdba50c3130..a7d6189d7b27 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java @@ -184,7 +184,7 @@ class ModeReference extends SimpleAttributeReference implements PsiPolyVariantRe public boolean matches(XmlTag element) { final String s = element.getAttributeValue("mode"); return myMode != null && - s != null && s.indexOf(CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED) == -1 && + s != null && !s.contains(CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED) && super.matches(element); } diff --git a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java index 59ca264bc950..42fbf277a177 100644 --- a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java +++ b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java @@ -377,7 +377,7 @@ public abstract class PydevConsoleCommunication extends AbstractConsoleCommunica // This string always works, // because it is hard-coded in // the XML-RPC library) - if (executed.first != null && executed.first.indexOf(refusedConnPattern) != -1) { + if (executed.first != null && executed.first.contains(refusedConnPattern)) { if (firstCommWorked) { break; } diff --git a/python/src/com/jetbrains/python/lexer/PythonEditorHighlighter.java b/python/src/com/jetbrains/python/lexer/PythonEditorHighlighter.java index 5e7da6d36ad3..f4dbac71c069 100644 --- a/python/src/com/jetbrains/python/lexer/PythonEditorHighlighter.java +++ b/python/src/com/jetbrains/python/lexer/PythonEditorHighlighter.java @@ -45,7 +45,7 @@ public class PythonEditorHighlighter extends LexerEditorHighlighter { int offset = e.getOffset(); int lineNumber = document.getLineNumber(offset); TextRange tr = new TextRange(document.getLineStartOffset(lineNumber), document.getLineEndOffset(lineNumber)); - document.putUserData(KEY, document.getText(tr).indexOf(PyNames.UNICODE_LITERALS) == -1); + document.putUserData(KEY, !document.getText(tr).contains(PyNames.UNICODE_LITERALS)); Boolean hasUnicodeImport = document.getUserData(KEY); if (delegate instanceof PythonHighlightingLexer && (((PythonHighlightingLexer)delegate).getImportOffset() > e.getOffset() @@ -69,7 +69,7 @@ public class PythonEditorHighlighter extends LexerEditorHighlighter { public void setEditor(@NotNull HighlighterClient editor) { Lexer l = getLexer(); if (l instanceof LayeredLexer) { - editor.getDocument().putUserData(KEY, editor.getDocument().getText().indexOf(PyNames.UNICODE_LITERALS) == -1); + editor.getDocument().putUserData(KEY, !editor.getDocument().getText().contains(PyNames.UNICODE_LITERALS)); } super.setEditor(editor); } diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java index 1ba4eb26b126..292db80b92d7 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java @@ -59,7 +59,7 @@ public class XmlFormattingModel extends PsiBasedFormattingModel { final @NonNls String cdataStartMarker = ""; - if(type == XmlTokenType.XML_CDATA_END && whiteSpace.indexOf(cdataEndMarker) == -1) { + if(type == XmlTokenType.XML_CDATA_END && !whiteSpace.contains(cdataEndMarker)) { final ASTNode at = findElementAt(prevNode.getStartOffset()); if (at != null && at.getPsi() instanceof PsiWhiteSpace) {