From ed01fba4d4b957d99db9780eba516e3de1fdffde Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Wed, 24 Nov 2010 12:06:20 +0300 Subject: [PATCH] CommonClassNames.JAVA_UTIL_ITERATOR --- java/openapi/src/com/intellij/psi/CommonClassNames.java | 1 + .../bugs/IteratorHasNextCallsIteratorNextInspection.java | 3 ++- ...rNextDoesNotThrowNoSuchElementExceptionInspection.java | 2 +- .../ForLoopWithMissingComponentInspection.java | 2 +- .../siyeh/ig/jdk/EnumerationCanBeIterationInspection.java | 4 ++-- .../src/com/siyeh/ig/jdk15/ForCanBeForeachInspection.java | 2 +- .../com/siyeh/ig/jdk15/WhileCanBeForeachInspection.java | 2 +- .../src/com/siyeh/ig/psiutils/IteratorUtils.java | 8 ++++---- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/java/openapi/src/com/intellij/psi/CommonClassNames.java b/java/openapi/src/com/intellij/psi/CommonClassNames.java index af3c4d67de3b..ecee6767d3a1 100644 --- a/java/openapi/src/com/intellij/psi/CommonClassNames.java +++ b/java/openapi/src/com/intellij/psi/CommonClassNames.java @@ -30,6 +30,7 @@ public interface CommonClassNames { @NonNls String JAVA_LANG_RUNTIME_EXCEPTION = "java.lang.RuntimeException"; @NonNls String JAVA_LANG_ENUM = "java.lang.Enum"; @NonNls String JAVA_LANG_ITERABLE = "java.lang.Iterable"; + @NonNls String JAVA_UTIL_ITERATOR = "java.util.Iterator"; @NonNls String JAVA_LANG_DEPRECATED = "java.lang.Deprecated"; @NonNls String JAVA_LANG_ANNOTATION_INHERITED = "java.lang.annotation.Inherited"; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java index 3a7f13a5651f..a65b544fc7da 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.bugs; +import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiMethod; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; @@ -50,7 +51,7 @@ public class IteratorHasNextCallsIteratorNextInspection @Override public void visitMethod(@NotNull PsiMethod method){ // note: no call to super @NonNls final String name = method.getName(); - if (!MethodUtils.methodMatches(method, "java.util.Iterator", null, + if (!MethodUtils.methodMatches(method, CommonClassNames.JAVA_UTIL_ITERATOR, null, HardcodedMethodConstants.HAS_NEXT)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java index c1d10f12f3a4..7ab6fa02594e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java @@ -60,7 +60,7 @@ public class IteratorNextDoesNotThrowNoSuchElementExceptionInspection @Override public void visitMethod(@NotNull PsiMethod method){ // note: no call to super - if (!MethodUtils.methodMatches(method, "java.util.Iterator", null, + if (!MethodUtils.methodMatches(method, CommonClassNames.JAVA_UTIL_ITERATOR, null, HardcodedMethodConstants.NEXT)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java index cfb67296eecc..1930bd65fc85 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java @@ -146,7 +146,7 @@ public class ForLoopWithMissingComponentInspection extends BaseInspection { if(declaredClass == null){ return false; } - if(!ClassUtils.isSubclass(declaredClass, "java.util.Iterator")){ + if(!ClassUtils.isSubclass(declaredClass, CommonClassNames.JAVA_UTIL_ITERATOR)){ return false; } final PsiExpression initialValue = variable.getInitializer(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumerationCanBeIterationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumerationCanBeIterationInspection.java index 6b8a01f72bd7..19a715a24013 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumerationCanBeIterationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumerationCanBeIterationInspection.java @@ -187,7 +187,7 @@ public class EnumerationCanBeIterationInspection extends BaseInspection { if (codeStyleSettings.GENERATE_FINAL_LOCALS) { newStatementText.append("final "); } - newStatementText.append("java.util.Iterator"); + newStatementText.append(CommonClassNames.JAVA_UTIL_ITERATOR); if (parameterType != null) { final String typeText = parameterType.getCanonicalText(); newStatementText.append('<'); @@ -318,7 +318,7 @@ public class EnumerationCanBeIterationInspection extends BaseInspection { final PsiElementFactory factory = facade.getElementFactory(); final GlobalSearchScope scope = GlobalSearchScope.allScope(project); final PsiClass iteratorClass = - facade.findClass("java.util.Iterator", scope); + facade.findClass(CommonClassNames.JAVA_UTIL_ITERATOR, scope); if (iteratorClass == null) { return "iterator"; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/ForCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/ForCanBeForeachInspection.java index c8e8b0aa4d1a..0a581b975b0e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/ForCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/ForCanBeForeachInspection.java @@ -1067,7 +1067,7 @@ public class ForCanBeForeachInspection extends BaseInspection{ if(declaredClass == null){ return false; } - if(!ClassUtils.isSubclass(declaredClass, "java.util.Iterator")){ + if(!ClassUtils.isSubclass(declaredClass, CommonClassNames.JAVA_UTIL_ITERATOR)){ return false; } final PsiExpression initialValue = variable.getInitializer(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/WhileCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/WhileCanBeForeachInspection.java index 5c8fb9ae3ee8..c2447aaaeabe 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/WhileCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/WhileCanBeForeachInspection.java @@ -430,7 +430,7 @@ public class WhileCanBeForeachInspection extends BaseInspection { final PsiVariable variable = (PsiVariable)declaredElement; final PsiType variableType = variable.getType(); final PsiType iteratorType = - TypeUtils.getType("java.util.Iterator", whileStatement); + TypeUtils.getType(CommonClassNames.JAVA_UTIL_ITERATOR, whileStatement); if (iteratorType == null) { return false; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/IteratorUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/IteratorUtils.java index 43b1a3b3990d..2be1ad75404d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/IteratorUtils.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/IteratorUtils.java @@ -52,11 +52,11 @@ public class IteratorUtils { public static boolean isCallToHasNext( PsiMethodCallExpression methodCallExpression) { return MethodCallUtils.isCallToMethod(methodCallExpression, - "java.util.Iterator", PsiType.BOOLEAN, "hasNext"); + CommonClassNames.JAVA_UTIL_ITERATOR, PsiType.BOOLEAN, "hasNext"); } public static boolean isIterator(PsiClass aClass) { - return ClassUtils.isSubclass(aClass, "java.util.Iterator"); + return ClassUtils.isSubclass(aClass, CommonClassNames.JAVA_UTIL_ITERATOR); } private static class CallsIteratorNextVisitor @@ -91,12 +91,12 @@ public class IteratorUtils { super.visitMethodCallExpression(expression); if (checkScanner) { if (!MethodCallUtils.isCallToMethod(expression, - "java.util.Iterator", null, SCANNER_PATTERN)) { + CommonClassNames.JAVA_UTIL_ITERATOR, null, SCANNER_PATTERN)) { return; } } else { if (!MethodCallUtils.isCallToMethod(expression, - "java.util.Iterator", null, + CommonClassNames.JAVA_UTIL_ITERATOR, null, HardcodedMethodConstants.NEXT)) { return; }