MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-21 14:37:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

CommonClassNames.JAVA_UTIL_ITERATOR

Browse Source
This commit is contained in:
Maxim Medvedev
2010-11-24 12:06:20 +03:00
parent 92f483e91f
commit ed01fba4d4
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/psi/CommonClassNames.java
+1
View File
@@ -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";
plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java
+2 -1
View File
@@ -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;
}
plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java
+1 -1
View File
@@ -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;
}
plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopWithMissingComponentInspection.java
+1 -1
View File
@@ -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();
plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumerationCanBeIterationInspection.java
+2 -2
View File
@@ -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";
}
plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/ForCanBeForeachInspection.java
+1 -1
View File
@@ -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();
plugins/InspectionGadgets/src/com/siyeh/ig/jdk15/WhileCanBeForeachInspection.java
+1 -1
View File
@@ -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;
}
plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/IteratorUtils.java
+4 -4
View File
@@ -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;
}