platform: empty visitor extracted

diff --git a/platform/core-api/src/com/intellij/psi/PsiElementVisitor.java b/platform/core-api/src/com/intellij/psi/PsiElementVisitor.java
index da0d1127efb12a9a0258d854cad99a42283856ff..378bcb7dd884a4498eef8ae14aec59f771e6d069 100644 (file)
--- a/platform/core-api/src/com/intellij/psi/PsiElementVisitor.java
+++ b/platform/core-api/src/com/intellij/psi/PsiElementVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ import com.intellij.psi.templateLanguages.OuterLanguageElement;
  * @see PsiRecursiveElementVisitor
  */
 public abstract class PsiElementVisitor {
+  public static final PsiElementVisitor EMPTY_VISITOR = new PsiElementVisitor() { };
+
   public void visitElement(PsiElement element) {
     ProgressIndicatorProvider.checkCanceled();
   }

diff --git a/plugins/devkit/src/inspections/internal/InternalInspection.java b/plugins/devkit/src/inspections/internal/InternalInspection.java
index 54251a07e002e7449a0a33cebd67b896ff199f27..fce0d410b0d5cd97a258c9430cfcda4924d6d69a 100644 (file)
--- a/plugins/devkit/src/inspections/internal/InternalInspection.java
+++ b/plugins/devkit/src/inspections/internal/InternalInspection.java
@@ -16,7 +16,6 @@
 package org.jetbrains.idea.devkit.inspections.internal;
 
 import com.intellij.codeInspection.BaseJavaLocalInspectionTool;
-import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
@@ -29,15 +28,7 @@ public abstract class InternalInspection extends BaseJavaLocalInspectionTool {
   @NotNull
   @Override
   public final PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
-    return isAllowed(holder) ? buildInternalVisitor(holder, isOnTheFly) : PsiUtil.EMPTY_VISITOR;
-  }
-
-  @NotNull
-  @Override
-  public final PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder,
-                                              boolean isOnTheFly,
-                                              @NotNull LocalInspectionToolSession session) {
-    return isAllowed(holder) ? buildInternalVisitor(holder, isOnTheFly) : PsiUtil.EMPTY_VISITOR;
+    return isAllowed(holder) ? buildInternalVisitor(holder, isOnTheFly) : PsiElementVisitor.EMPTY_VISITOR;
   }
 
   private static boolean isAllowed(ProblemsHolder holder) {

diff --git a/plugins/devkit/src/util/PsiUtil.java b/plugins/devkit/src/util/PsiUtil.java
index 083b450fafc376203322c19cfc6acb7b1197c4d6..fcd63e6e4cc283f104e0c6ebe1ff7b93091c9ccb 100644 (file)
--- a/plugins/devkit/src/util/PsiUtil.java
+++ b/plugins/devkit/src/util/PsiUtil.java
@@ -34,11 +34,8 @@ import org.jetbrains.annotations.Nullable;
 public class PsiUtil {
   private static final Key<Boolean> IDEA_PROJECT = Key.create("idea.internal.inspections.enabled");
   private static final String IDE_PROJECT_MARKER_CLASS = JBList.class.getName();
-  public static final PsiElementVisitor EMPTY_VISITOR = new PsiElementVisitor() {
-  };
 
-  private PsiUtil() {
-  }
+  private PsiUtil() { }
 
   public static boolean isInstantiable(@NotNull PsiClass cls) {
     final PsiModifierList modList = cls.getModifierList();