diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java index 61a8c281bf29..d544ccbe03c3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java @@ -24,18 +24,6 @@ public abstract class BaseInspectionVisitor extends PsiRecursiveElementVisitor{ m_onTheFly = onTheFly; } - public void visitReferenceExpression(PsiReferenceExpression expression){ - final PsiExpression qualifier = expression.getQualifierExpression(); - if(qualifier != null){ - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = - expression.getParameterList(); - if(typeParameters != null){ - typeParameters.accept(this); - } - } - protected void registerMethodCallError(PsiMethodCallExpression expression){ final PsiReferenceExpression methodExpression = expression.getMethodExpression(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassAccessVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassAccessVisitor.java index a2bc2b9d7c6e..ce189c665cc3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassAccessVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassAccessVisitor.java @@ -18,17 +18,6 @@ class ClassAccessVisitor extends PsiRecursiveElementVisitor { this.currentClass = currentClass; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitMethodCallExpression(PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); final PsiMethod method = expression.resolveMethod(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java index 52d953afbdd1..cfb08257a15e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java @@ -18,7 +18,7 @@ public class InstanceofChainInspection extends StatementInspection { } protected String buildErrorString(PsiElement location) { - return "Chain of 'instanceof' checks indicates abstraction faiulre #loc"; + return "Chain of 'instanceof' checks indicates abstraction failure #loc"; } public BaseInspectionVisitor createVisitor(InspectionManager inspectionManager, boolean onTheFly) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionQueryCalledVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionQueryCalledVisitor.java index 9bc163f729f4..e9c164721d5f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionQueryCalledVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionQueryCalledVisitor.java @@ -39,16 +39,6 @@ public class CollectionQueryCalledVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression exp) { - final PsiExpression qualifier = exp.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = exp.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitForeachStatement(PsiForeachStatement statement) { super.visitForeachStatement(statement); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionUpdateCalledVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionUpdateCalledVisitor.java index 2318aaf659f6..8fe2692b45ed 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionUpdateCalledVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CollectionUpdateCalledVisitor.java @@ -36,16 +36,6 @@ public class CollectionUpdateCalledVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression exp) { - final PsiExpression qualifier = exp.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = exp.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitMethodCallExpression(PsiMethodCallExpression call) { super.visitMethodCallExpression(call); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FloatingPointEqualityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FloatingPointEqualityInspection.java index 7317ee99eeb7..fbd6e737f37f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FloatingPointEqualityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FloatingPointEqualityInspection.java @@ -50,10 +50,10 @@ public class FloatingPointEqualityInspection extends ExpressionInspection { return; } final PsiExpression rhs = expression.getROperand(); - if(!isFloatingPointType(rhs)){ + if(isFloatingPointType(rhs)){ + registerError(expression); return; } - registerError(expression); } private static boolean isFloatingPointType(PsiExpression expression) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java index 479a34714b0c..79dd9d400d0c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java @@ -140,14 +140,7 @@ public class ForLoopThatDoesntUseLoopVariableInspection extends StatementInspect } public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(ref); final PsiElement resolvedElement = ref.resolve(); if (m_variable.equals(resolvedElement)) { m_used = true; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java index ff68f1c05e96..6ccdef9db2f0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java @@ -4,6 +4,8 @@ import com.intellij.codeInspection.InspectionManager; import com.intellij.psi.*; import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.search.SearchScope; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.openapi.project.Project; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.ExpressionInspection; @@ -94,8 +96,9 @@ public class InstanceofIncompatibleInterfaceInspection extends ExpressionInspect return true; } final PsiManager psiManager = aClass.getManager(); + final Project project = psiManager.getProject(); final PsiSearchHelper searchHelper = psiManager.getSearchHelper(); - final SearchScope searchScope = aClass.getUseScope(); + final SearchScope searchScope = GlobalSearchScope.allScope(project); final PsiClass[] inheritors = searchHelper.findInheritors(aClass, searchScope, true); for(int i = 0; i < inheritors.length; i++){ diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ComplexityVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ComplexityVisitor.java index d78bc127a140..c12455886619 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ComplexityVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ComplexityVisitor.java @@ -5,17 +5,6 @@ import com.intellij.psi.*; class ComplexityVisitor extends PsiRecursiveElementVisitor { private int m_complexity = 1; - public void visitReferenceExpression(PsiReferenceExpression expression) { - final PsiExpression qualifier = expression.getQualifierExpression(); - if(qualifier!=null){ - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = expression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitAnonymousClass(PsiAnonymousClass aClass) { // to call to super, to keep this from drilling down } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/CouplingVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/CouplingVisitor.java index cab48ff131fa..bff1ca4d3c25 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/CouplingVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/CouplingVisitor.java @@ -110,17 +110,6 @@ class CouplingVisitor extends PsiRecursiveElementVisitor { } } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitTryStatement(PsiTryStatement statement) { super.visitTryStatement(statement); final PsiParameter[] catchBlockParameters = statement.getCatchBlockParameters(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CallToSuperCloneVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CallToSuperCloneVisitor.java index 5a6ce9f96227..c6f07704c840 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CallToSuperCloneVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CallToSuperCloneVisitor.java @@ -25,17 +25,6 @@ class CallToSuperCloneVisitor extends PsiRecursiveElementVisitor { m_callToSuperCloneFound = true; } - public void visitReferenceExpression(PsiReferenceExpression expression) { - final PsiExpression qualifier = expression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = expression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public boolean isCallToSuperCloneFound() { return m_callToSuperCloneFound; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/ImplicitNumericConversionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/ImplicitNumericConversionInspection.java index 6e91a144c47e..541bc3ce74ff 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/ImplicitNumericConversionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/ImplicitNumericConversionInspection.java @@ -197,6 +197,15 @@ public class ImplicitNumericConversionInspection extends ExpressionInspection { public void visitExpression(PsiExpression exp) { super.visitExpression(exp); + checkExpression(exp); + } + + public void visitReferenceExpression(PsiReferenceExpression expression){ + super.visitReferenceExpression(expression); + checkExpression(expression); + } + + private void checkExpression(PsiExpression exp){ final PsiElement parent = exp.getParent(); if(parent!=null && parent instanceof PsiParenthesizedExpression) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/LocalVariableAccessVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/LocalVariableAccessVisitor.java index 8b80ce447c11..8e62c77815f1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/LocalVariableAccessVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/LocalVariableAccessVisitor.java @@ -14,15 +14,8 @@ class LocalVariableAccessVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression ref) { + super.visitReferenceExpression(ref); final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } if (qualifier != null && !(qualifier instanceof PsiThisExpression)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/RefusedBequestInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/RefusedBequestInspection.java index 3632190628bc..047c45cdda0b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/RefusedBequestInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/RefusedBequestInspection.java @@ -79,16 +79,6 @@ public class RefusedBequestInspection extends MethodInspection { this.methodToSearchFor = methodToSearchFor; } - public void visitReferenceExpression(PsiReferenceExpression expression) { - final PsiExpression qualifier = expression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = expression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitMethodCallExpression(PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/SwitchStatementDensityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/SwitchStatementDensityInspection.java index ab0e539ab380..42ada41fc7db 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/SwitchStatementDensityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/SwitchStatementDensityInspection.java @@ -74,17 +74,6 @@ public class SwitchStatementDensityInspection extends StatementInspection { private static class StatementCountVisitor extends PsiRecursiveElementVisitor { private int numStatements = 0; - public void visitReferenceExpression(PsiReferenceExpression expression) { - final PsiExpression qualifier = expression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = expression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitStatement(PsiStatement psiStatement) { super.visitStatement(psiStatement); numStatements++; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchParameterUsedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchParameterUsedVisitor.java index 3147a4ab3335..3b8456fbe720 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchParameterUsedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchParameterUsedVisitor.java @@ -12,14 +12,7 @@ public class CatchParameterUsedVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression reference) { - final PsiExpression qualifier = reference.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = reference.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(reference); final PsiElement element = reference.resolve(); if (m_parameter.equals(element)) { m_used = true; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/CallToSuperFinalizeVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/CallToSuperFinalizeVisitor.java index 48c11611c6be..4856e0f7794a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/CallToSuperFinalizeVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/CallToSuperFinalizeVisitor.java @@ -25,16 +25,6 @@ class CallToSuperFinalizeVisitor extends PsiRecursiveElementVisitor { m_callToSuperFinalizeFound = true; } - public void visitReferenceExpression(PsiReferenceExpression expression) { - final PsiExpression qualifier = expression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = expression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public boolean isCallToSuperFinalizeFound() { return m_callToSuperFinalizeFound; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/ImportIsUsedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/ImportIsUsedVisitor.java index 13629a90c335..bd4ec9c82a15 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/ImportIsUsedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/ImportIsUsedVisitor.java @@ -17,14 +17,7 @@ class ImportIsUsedVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(ref); followReferenceToImport(ref); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java index 6ca96ba78ccd..3c969b96c3e1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java @@ -6,9 +6,10 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiReferenceExpression; import com.siyeh.ig.*; -import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.ig.psiutils.ExpectedTypeUtils; +import com.siyeh.ig.psiutils.ClassUtils; import java.util.HashMap; import java.util.Map; @@ -76,26 +77,38 @@ public class AutoBoxingInspection extends ExpressionInspection { super(inspection, inspectionManager, isOnTheFly); } + public void visitReferenceExpression(PsiReferenceExpression expression){ + super.visitReferenceExpression(expression); + checkExpression(expression); + } + public void visitExpression(PsiExpression expression) { super.visitExpression(expression); + checkExpression(expression); + } + + private void checkExpression(PsiExpression expression) + { final PsiType expressionType = expression.getType(); - if (expressionType == null) { + if(expressionType == null){ return; } - if (!ClassUtils.isPrimitive(expressionType)) { + if(!ClassUtils.isPrimitive(expressionType)){ return; } - final PsiType expectedType = ExpectedTypeUtils.findExpectedType(expression); - if (expectedType == null) { + final PsiType expectedType = + ExpectedTypeUtils.findExpectedType(expression); + if(expectedType == null){ return; } - if (ClassUtils.isPrimitive(expectedType)) { + if(ClassUtils.isPrimitive(expectedType)){ return; } registerError(expression); } + } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java index cf7e7b775410..322b2f1eb26f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java @@ -6,10 +6,11 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiType; +import com.intellij.psi.PsiReferenceExpression; import com.siyeh.ig.*; -import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.ig.psiutils.ExpectedTypeUtils; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.ig.psiutils.ClassUtils; import java.util.HashMap; import java.util.HashSet; @@ -21,7 +22,7 @@ public class AutoUnboxingInspection extends ExpressionInspection { private static final Set s_numberTypes = new HashSet(8); private final AutoUnboxingFix fix = new AutoUnboxingFix(); - static { + static { s_unboxingMethods.put("int", "intValue"); s_unboxingMethods.put("short", "shortValue"); s_unboxingMethods.put("boolean", "booleanValue"); @@ -66,7 +67,9 @@ public class AutoUnboxingInspection extends ExpressionInspection { } public void applyFix(Project project, ProblemDescriptor descriptor) { - if(isQuickFixOnReadOnlyFile(project, descriptor)) return; + if(isQuickFixOnReadOnlyFile(project, descriptor)){ + return; + } final PsiExpression expression = (PsiExpression) descriptor.getPsiElement(); final PsiType type = expression.getType(); @@ -93,28 +96,39 @@ public class AutoUnboxingInspection extends ExpressionInspection { public void visitExpression(PsiExpression expression) { super.visitExpression(expression); + checkExpression(expression); + } + + public void visitReferenceExpression(PsiReferenceExpression expression){ + super.visitReferenceExpression(expression); + checkExpression(expression); + } + + public void checkExpression(PsiExpression expression) { final PsiType expressionType = expression.getType(); - if (expressionType == null) { + if(expressionType == null){ return; } - if(expressionType.getArrayDimensions()>0) - { + if(expressionType.getArrayDimensions() > 0){ return; // a horrible hack to get around what happens when you pass an array to a vararg expression } - if (ClassUtils.isPrimitive(expressionType)) { - return; - } - final PsiType expectedType = ExpectedTypeUtils.findExpectedType(expression); - if (expectedType == null) { + if(ClassUtils.isPrimitive(expressionType)){ return; } + final PsiType expectedType = + ExpectedTypeUtils.findExpectedType(expression); - if (!ClassUtils.isPrimitive(expectedType)) { + if(expectedType == null){ + return; + } + if(!ClassUtils.isPrimitive(expectedType)){ return; } registerError(expression); + } + } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperSetupVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperSetupVisitor.java index 3caf1680e1d4..b47cafa8ee3d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperSetupVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperSetupVisitor.java @@ -25,17 +25,6 @@ class CallToSuperSetupVisitor extends PsiRecursiveElementVisitor { m_callToSuperSetupFound = true; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public boolean isCallToSuperSetupFound() { return m_callToSuperSetupFound; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperTeardownVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperTeardownVisitor.java index e9c261e30d17..71c017b316e4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperTeardownVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/CallToSuperTeardownVisitor.java @@ -25,17 +25,6 @@ class CallToSuperTeardownVisitor extends PsiRecursiveElementVisitor { m_callToSuperTeardownFound = true; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public boolean isCallToSuperTeardownFound() { return m_callToSuperTeardownFound; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CouplingVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CouplingVisitor.java index 552ebc1584aa..e96e5102c465 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CouplingVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CouplingVisitor.java @@ -90,17 +90,6 @@ class CouplingVisitor extends PsiRecursiveElementVisitor { } } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitTryStatement(PsiTryStatement statement) { super.visitTryStatement(statement); final PsiParameter[] catchBlockParameters = statement.getCatchBlockParameters(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityVisitor.java index d988a807c64f..7e664871b374 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityVisitor.java @@ -5,16 +5,6 @@ import com.intellij.psi.*; class CyclomaticComplexityVisitor extends PsiRecursiveElementVisitor { private int m_complexity = 1; - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } } - public void visitAnonymousClass(PsiAnonymousClass aClass) { // to call to super, to keep this from drilling down } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/LoopCountVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/LoopCountVisitor.java index 883d40773b6d..bd92fe62d216 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/LoopCountVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/LoopCountVisitor.java @@ -5,16 +5,6 @@ import com.intellij.psi.*; class LoopCountVisitor extends PsiRecursiveElementVisitor { private int m_count = 0; - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitForStatement(PsiForStatement psiForStatement) { super.visitForStatement(psiForStatement); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java index 1b416111caf9..55a73e360256 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NCSSVisitor.java @@ -5,17 +5,6 @@ import com.intellij.psi.*; class NCSSVisitor extends PsiRecursiveElementVisitor { private int m_statementCount = 0; - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitAnonymousClass(PsiAnonymousClass aClass) { // to call to super, to keep this from drilling down } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NegationCountVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NegationCountVisitor.java index 324e560b5918..cb78ca26e73f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NegationCountVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NegationCountVisitor.java @@ -6,17 +6,6 @@ import com.intellij.psi.tree.IElementType; class NegationCountVisitor extends PsiRecursiveElementVisitor { private int m_count = 0; - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitBinaryExpression(PsiBinaryExpression expression) { super.visitBinaryExpression(expression); final PsiJavaToken sign = expression.getOperationSign(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthVisitor.java index 919e77b08ebb..e791148fd621 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthVisitor.java @@ -6,15 +6,6 @@ class NestingDepthVisitor extends PsiRecursiveElementVisitor { private int m_maximumDepth = 0; private int m_currentDepth = 0; - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } } public void visitAnonymousClass(PsiAnonymousClass aClass) { // to call to super, to keep this from drilling down diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java index 07530c2a31eb..c1d55ce65b0e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ReturnPointCountVisitor.java @@ -5,16 +5,6 @@ import com.intellij.psi.*; class ReturnPointCountVisitor extends PsiRecursiveElementVisitor { private int m_count = 0; - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitAnonymousClass(PsiAnonymousClass aClass) { // no call to super, to keep it from drilling into anonymous classes diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CanBeStaticVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CanBeStaticVisitor.java index cc0eaf70ef24..a93af1208b44 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CanBeStaticVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CanBeStaticVisitor.java @@ -10,14 +10,7 @@ class CanBeStaticVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(ref); final PsiElement element = ref.resolve(); if (element instanceof PsiField) { final PsiField field = (PsiField) element; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassReferenceVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassReferenceVisitor.java index dcea55c5b9bc..33ad410f7269 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassReferenceVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassReferenceVisitor.java @@ -65,14 +65,9 @@ class InnerClassReferenceVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression referenceExpression) { + super.visitReferenceExpression(referenceExpression); final PsiExpression qualifier = referenceExpression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = referenceExpression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + if (qualifier instanceof PsiSuperExpression) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodReferenceVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodReferenceVisitor.java index 08944dc0b146..217010c67c71 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodReferenceVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodReferenceVisitor.java @@ -37,14 +37,8 @@ class MethodReferenceVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression expression) { - final PsiExpression qualifier = expression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = expression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(expression); + final PsiElement element = expression.resolve(); if (element instanceof PsiField) { m_referencesStaticallyAccessible &= isFieldStaticallyAccessible((PsiField) element); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java index ca1bc0e434cb..e7a658cede72 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringVariableIsAppendedToVisitor.java @@ -12,17 +12,6 @@ public class StringVariableIsAppendedToVisitor extends PsiRecursiveElementVisito this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression referenceExpression) { - final PsiExpression qualifier = referenceExpression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = referenceExpression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitAssignmentExpression(PsiAssignmentExpression assignment) { super.visitAssignmentExpression(assignment); final PsiExpression lhs = assignment.getLExpression(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableAccessVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableAccessVisitor.java index 81e7ade3e479..45873e37dad2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableAccessVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableAccessVisitor.java @@ -16,14 +16,9 @@ class VariableAccessVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression ref) { + super.visitReferenceExpression(ref); final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + if (qualifier != null && !(qualifier instanceof PsiThisExpression)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableIsModifiedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableIsModifiedVisitor.java index 00b6f2c184ef..1881d1f18294 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableIsModifiedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableIsModifiedVisitor.java @@ -11,16 +11,6 @@ public class VariableIsModifiedVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitMethodCallExpression(PsiMethodCallExpression call) { super.visitMethodCallExpression(call); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAccessedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAccessedVisitor.java index b81ebe74bef2..d8049710c9e6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAccessedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAccessedVisitor.java @@ -11,17 +11,6 @@ public class ArrayContentsAccessedVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitForeachStatement(PsiForeachStatement statement) { super.visitForeachStatement(statement); final PsiExpression qualifier = statement.getIteratedValue(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java index 52425044a0d9..708ddd2b4217 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ArrayContentsAssignedVisitor.java @@ -11,17 +11,6 @@ public class ArrayContentsAssignedVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitAssignmentExpression(PsiAssignmentExpression assignment) { super.visitAssignmentExpression(assignment); final PsiJavaToken operationSign = assignment.getOperationSign(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ControlFlowUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ControlFlowUtils.java index a18d0f995919..a6f2f90726ca 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ControlFlowUtils.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ControlFlowUtils.java @@ -340,9 +340,6 @@ public class ControlFlowUtils { // do nothing, to keep drilling into inner classes } - public void visitReferenceExpression(PsiReferenceExpression ref) { - } - public void visitReturnStatement(PsiReturnStatement returnStatement) { super.visitReturnStatement(returnStatement); m_found = true; @@ -362,9 +359,6 @@ public class ControlFlowUtils { return m_found; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - } - public void visitBreakStatement(PsiBreakStatement breakStatement) { super.visitBreakStatement(breakStatement); final PsiStatement exitedStatement = breakStatement.findExitedStatement(); @@ -392,9 +386,6 @@ public class ControlFlowUtils { return m_found; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - } - public void visitContinueStatement(PsiContinueStatement statement) { super.visitContinueStatement(statement); final PsiIdentifier labelIdentifier = statement.getLabelIdentifier(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ExceptionUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ExceptionUtils.java index cf43f112b16c..121b8491cf4e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ExceptionUtils.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ExceptionUtils.java @@ -55,10 +55,6 @@ public class ExceptionUtils { m_factory = factory; } - public void visitReferenceExpression(PsiReferenceExpression expression) { - - } - public void visitMethodCallExpression(PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); final PsiMethod method = expression.resolveMethod(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java index add8e764f276..2885b8c8f642 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java @@ -132,16 +132,6 @@ public class ImportUtils { this.fullyQualifiedName = fullyQualifiedName; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitReferenceElement(PsiJavaCodeReferenceElement ref) { final String text = ref.getText(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java index 942886e388ef..24dc805e69db 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java @@ -11,17 +11,6 @@ public class RecursionVisitor extends PsiRecursiveElementVisitor { m_method = method; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitMethodCallExpression(PsiMethodCallExpression psiMethodCallExpression) { super.visitMethodCallExpression(psiMethodCallExpression); final PsiMethod method = psiMethodCallExpression.resolveMethod(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/SideEffectChecker.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/SideEffectChecker.java index 916c4848bd7d..2165598650db 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/SideEffectChecker.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/SideEffectChecker.java @@ -22,16 +22,6 @@ public class SideEffectChecker { return m_mayHaveSideEffects; } - public void visitReferenceExpression(PsiReferenceExpression expression) { - final PsiExpression qualifier = expression.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = expression.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitAssignmentExpression(PsiAssignmentExpression expression) { super.visitAssignmentExpression(expression); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedFromVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedFromVisitor.java index ce462ce91a32..68d44f6f1e19 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedFromVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedFromVisitor.java @@ -11,17 +11,6 @@ public class VariableAssignedFromVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitAssignmentExpression(PsiAssignmentExpression assignment) { super.visitAssignmentExpression(assignment); final PsiExpression arg = assignment.getRExpression(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedVisitor.java index 9e9581effff6..aadb29fbe915 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableAssignedVisitor.java @@ -12,17 +12,6 @@ public class VariableAssignedVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitAssignmentExpression(PsiAssignmentExpression assignment) { super.visitAssignmentExpression(assignment); final PsiExpression arg = assignment.getLExpression(); @@ -62,7 +51,7 @@ public class VariableAssignedVisitor extends PsiRecursiveElementVisitor { assigned = true; } } - + public void visitPostfixExpression(PsiPostfixExpression postfixExpression) { super.visitPostfixExpression(postfixExpression); final PsiJavaToken operationSign = postfixExpression.getOperationSign(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariablePassedAsArgumentVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariablePassedAsArgumentVisitor.java index eecaec637c05..e0b4d486c4ab 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariablePassedAsArgumentVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariablePassedAsArgumentVisitor.java @@ -11,16 +11,6 @@ public class VariablePassedAsArgumentVisitor extends PsiRecursiveElementVisitor this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitMethodCallExpression(PsiMethodCallExpression call) { super.visitMethodCallExpression(call); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableReturnedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableReturnedVisitor.java index 1dba78f91cdd..4bd90d4dfec3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableReturnedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableReturnedVisitor.java @@ -11,16 +11,6 @@ public class VariableReturnedVisitor extends PsiRecursiveElementVisitor { this.variable = variable; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitReturnStatement(PsiReturnStatement returnStatement) { super.visitReturnStatement(returnStatement); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java index 1fc860ca2663..9a9b63b6f226 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedInInnerClassVisitor.java @@ -20,14 +20,8 @@ public class VariableUsedInInnerClassVisitor extends PsiRecursiveElementVisitor } public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(ref); + if (!m_inInnerClass) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedVisitor.java index ec762cd402ec..907860f0ffb3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/VariableUsedVisitor.java @@ -12,14 +12,8 @@ public class VariableUsedVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(ref); + final PsiElement referent = ref.resolve(); if (referent == null) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java index dd4ce38eb841..77b542539b65 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java @@ -134,18 +134,6 @@ public class IOResourceInspection extends ExpressionInspection{ this.streamToClose = streamToClose; } - public void visitReferenceExpression(PsiReferenceExpression ref){ - final PsiExpression qualifier = ref.getQualifierExpression(); - if(qualifier != null){ - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = - ref.getParameterList(); - if(typeParameters != null){ - typeParameters.accept(this); - } - } - public void visitMethodCallExpression(PsiMethodCallExpression call){ super.visitMethodCallExpression(call); final PsiReferenceExpression methodExpression = @@ -187,18 +175,6 @@ public class IOResourceInspection extends ExpressionInspection{ this.ioResource = streamToClose; } - public void visitReferenceExpression(PsiReferenceExpression ref){ - final PsiExpression qualifier = ref.getQualifierExpression(); - if(qualifier != null){ - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = - ref.getParameterList(); - if(typeParameters != null){ - typeParameters.accept(this); - } - } - public void visitNewExpression(PsiNewExpression expression){ super.visitNewExpression(expression); if(!isIOResource(expression)){ diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java index e0cb2bf814f2..4aebb2408035 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java @@ -124,17 +124,6 @@ public class JDBCResourceInspection extends ExpressionInspection { this.streamToClose = streamToClose; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitMethodCallExpression(PsiMethodCallExpression call) { super.visitMethodCallExpression(call); final PsiReferenceExpression methodExpression = call.getMethodExpression(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VariableAccessVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VariableAccessVisitor.java index d31e309177ad..2496e896b547 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VariableAccessVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VariableAccessVisitor.java @@ -16,14 +16,9 @@ class VariableAccessVisitor extends PsiRecursiveElementVisitor { } public void visitReferenceExpression(PsiReferenceExpression ref) { + super.visitReferenceExpression(ref); final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + if (qualifier != null && !(qualifier instanceof PsiThisExpression)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/ForCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/ForCanBeForeachInspection.java index 743a782277a7..25a5dc8b880f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/ForCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/ForCanBeForeachInspection.java @@ -620,17 +620,6 @@ public class ForCanBeForeachInspection extends StatementInspection { this.arrayName = arrayName; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitAssignmentExpression(PsiAssignmentExpression exp) { super.visitAssignmentExpression(exp); final PsiExpression lhs = exp.getLExpression(); @@ -655,18 +644,6 @@ public class ForCanBeForeachInspection extends StatementInspection { this.iteratorName = iteratorName; } - - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitMethodCallExpression(PsiMethodCallExpression callExpression) { super.visitMethodCallExpression(callExpression); final PsiReferenceExpression methodExpression = @@ -704,16 +681,6 @@ public class ForCanBeForeachInspection extends StatementInspection { this.iteratorName = iteratorName; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitAssignmentExpression(PsiAssignmentExpression exp) { super.visitAssignmentExpression(exp); @@ -740,16 +707,6 @@ public class ForCanBeForeachInspection extends StatementInspection { this.iteratorName = iteratorName; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } public void visitMethodCallExpression(PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); @@ -784,14 +741,8 @@ public class ForCanBeForeachInspection extends StatementInspection { } public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } + super.visitReferenceExpression(ref); + final PsiElement element = ref.resolve(); if (!indexVariable.equals(element)) { return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnusedLabelInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnusedLabelInspection.java index c2471ae3e53e..ad2e2933a4cd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnusedLabelInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnusedLabelInspection.java @@ -78,17 +78,6 @@ public class UnusedLabelInspection extends StatementInspection { return m_found; } - public void visitReferenceExpression(PsiReferenceExpression ref) { - final PsiExpression qualifier = ref.getQualifierExpression(); - if (qualifier != null) { - qualifier.accept(this); - } - final PsiReferenceParameterList typeParameters = ref.getParameterList(); - if (typeParameters != null) { - typeParameters.accept(this); - } - } - public void visitContinueStatement(PsiContinueStatement continueStatement) { super.visitContinueStatement(continueStatement); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/VariableUsedInInnerClassVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/VariableUsedInInnerClassVisitor.java index e527cdad943a..7f813697b781 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/VariableUsedInInnerClassVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/VariableUsedInInnerClassVisitor.java @@ -24,11 +24,7 @@ public class VariableUsedInInnerClassVisitor extends PsiRecursiveElementVisitor public void visitReferenceExpression(PsiReferenceExpression reference) { - final PsiExpression qualifier = reference.getQualifierExpression(); - if(qualifier!=null) - { - qualifier.accept(this); - } + super.visitReferenceExpression(reference); if(m_inInnerClass) { final PsiElement element = reference.resolve();