From 794018089a4dde0619666dec9d80aa22b84fc9e6 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 6 Feb 2017 16:35:03 +0100 Subject: [PATCH] cleanup: use com.intellij.psi.PsiElementVisitor.EMPTY_VISITOR --- .../equalsAndHashcode/EqualsAndHashcodeBase.java | 4 ++-- .../miscGenerics/GenericsInspectionToolBase.java | 3 +-- .../codeInspection/nullable/NullableStuffInspectionBase.java | 2 +- .../src/com/siyeh/ig/BaseInspection.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcodeBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcodeBase.java index 3e6c971c56ad..4e66714e5679 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcodeBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcodeBase.java @@ -67,12 +67,12 @@ public class EqualsAndHashcodeBase extends BaseJavaBatchLocalInspectionTool { return CachedValueProvider.Result.create(Pair.create(myEquals, myHashCode), psiObjectClass); }); - if (pair == null) return new PsiElementVisitor() {}; + if (pair == null) return PsiElementVisitor.EMPTY_VISITOR; //jdk wasn't configured for the project final PsiMethod myEquals = pair.first; final PsiMethod myHashCode = pair.second; - if (myEquals == null || myHashCode == null || !myEquals.isValid() || !myHashCode.isValid()) return new PsiElementVisitor() {}; + if (myEquals == null || myHashCode == null || !myEquals.isValid() || !myHashCode.isValid()) return PsiElementVisitor.EMPTY_VISITOR; return new JavaElementVisitor() { @Override public void visitClass(PsiClass aClass) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java index c00730f0bfd4..e50cedca8c85 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java @@ -38,8 +38,7 @@ public abstract class GenericsInspectionToolBase extends BaseJavaBatchLocalInspe @Override public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) { PsiFile file = holder.getFile(); - if (!PsiUtil.isLanguageLevel5OrHigher(file)) return new PsiElementVisitor() { - }; + if (!PsiUtil.isLanguageLevel5OrHigher(file)) return PsiElementVisitor.EMPTY_VISITOR; return super.buildVisitor(holder, isOnTheFly); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java index 8a2de15a585c..9dced73577b8 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java @@ -86,7 +86,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) { final PsiFile file = holder.getFile(); if (!PsiUtil.isLanguageLevel5OrHigher(file) || nullabilityAnnotationsNotAvailable(file)) { - return new PsiElementVisitor() { }; + return PsiElementVisitor.EMPTY_VISITOR; } return new JavaElementVisitor() { @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java index dd4361cb0962..6b1fb0b66755 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/BaseInspection.java @@ -122,7 +122,7 @@ public abstract class BaseInspection extends BaseJavaBatchLocalInspectionTool { final PsiFile file = holder.getFile(); assert file.isPhysical(); if (!shouldInspect(file)) { - return new PsiElementVisitor() { }; + return PsiElementVisitor.EMPTY_VISITOR; } final BaseInspectionVisitor visitor = buildVisitor(); visitor.setProblemsHolder(holder);