1 files changed, 3 insertions, 161 deletions

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodMayBeStaticInspection.java
index e73b6cc234d7..5936bb5433a3 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodMayBeStaticInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/MethodMayBeStaticInspection.java
@@ -15,62 +15,22 @@
  */
 package com.siyeh.ig.performance;
 
-import com.intellij.codeInspection.InspectionManager;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.WriteExternalException;
-import com.intellij.psi.*;
-import com.intellij.psi.search.searches.ClassInheritorsSearch;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiModifier;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.makeStatic.MakeMethodStaticProcessor;
 import com.intellij.refactoring.makeStatic.Settings;
-import com.intellij.util.Processor;
-import com.intellij.util.Query;
 import com.siyeh.InspectionGadgetsBundle;
-import com.siyeh.ig.BaseInspection;
-import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.fixes.ChangeModifierFix;
-import com.siyeh.ig.psiutils.ClassUtils;
-import com.siyeh.ig.psiutils.MethodUtils;
-import com.siyeh.ig.psiutils.SerializationUtils;
-import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class MethodMayBeStaticInspection extends BaseInspection {
-
-  private static final String IGNORE_DEFAULT_METHODS_ATTR_NAME = "m_ignoreDefaultMethods";
-  private static final String ONLY_PRIVATE_OR_FINAL_ATTR_NAME = "m_onlyPrivateOrFinal";
-  private static final String IGNORE_EMPTY_METHODS_ATTR_NAME = "m_ignoreEmptyMethods";
-  private static final String REPLACE_QUALIFIER_ATTR_NAME = "m_replaceQualifier";
-  /**
-   * @noinspection PublicField
-   */
-  public boolean m_onlyPrivateOrFinal = false;
-  /**
-   * @noinspection PublicField
-   */
-  public boolean m_ignoreEmptyMethods = true;
-  public boolean m_ignoreDefaultMethods = true;
-  public boolean m_replaceQualifier = true;
-
-  @Override
-  @NotNull
-  public String getDisplayName() {
-    return InspectionGadgetsBundle.message("method.may.be.static.display.name");
-  }
-
-  @Override
-  @NotNull
-  protected String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message("method.may.be.static.problem.descriptor");
-  }
 
+public class MethodMayBeStaticInspection extends MethodMayBeStaticInspectionBase {
   @Override
   protected InspectionGadgetsFix buildFix(Object... infos) {
     return new InspectionGadgetsFix() {
@@ -103,122 +63,4 @@ public class MethodMayBeStaticInspection extends BaseInspection {
     optionsPanel.addCheckbox("Replace qualifier by class name", REPLACE_QUALIFIER_ATTR_NAME);
     return optionsPanel;
   }
-
-  @Override
-  public BaseInspectionVisitor buildVisitor() {
-    return new MethodCanBeStaticVisitor();
-  }
-
-  @Override
-  public void writeSettings(@NotNull Element node) throws WriteExternalException {
-    node.addContent(new Element("option").setAttribute("name", ONLY_PRIVATE_OR_FINAL_ATTR_NAME).setAttribute("value", String.valueOf(m_onlyPrivateOrFinal)));
-    node.addContent(new Element("option").setAttribute("name", IGNORE_EMPTY_METHODS_ATTR_NAME).setAttribute("value", String.valueOf(
-      m_ignoreEmptyMethods)));
-    if (!m_ignoreDefaultMethods) {
-      node.addContent(new Element("option").setAttribute("name", IGNORE_DEFAULT_METHODS_ATTR_NAME).setAttribute("value", "false"));
-    }
-    if (!m_replaceQualifier) {
-      node.addContent(new Element("option").setAttribute("name", REPLACE_QUALIFIER_ATTR_NAME).setAttribute("value", "false"));
-    }
-  }
-
-  private class MethodCanBeStaticVisitor extends BaseInspectionVisitor {
-
-    @Override
-    public void visitMethod(@NotNull PsiMethod method) {
-      super.visitMethod(method);
-      if (method.hasModifierProperty(PsiModifier.STATIC) ||
-          method.hasModifierProperty(PsiModifier.ABSTRACT) ||
-          method.hasModifierProperty(PsiModifier.SYNCHRONIZED) ||
-          method.hasModifierProperty(PsiModifier.NATIVE)) {
-        return;
-      }
-      if (method.isConstructor() || method.getNameIdentifier() == null) {
-        return;
-      }
-      if (m_ignoreDefaultMethods && method.hasModifierProperty(PsiModifier.DEFAULT)) {
-        return;
-      }
-      if (m_ignoreEmptyMethods && MethodUtils.isEmpty(method)) {
-        return;
-      }
-      final PsiClass containingClass = ClassUtils.getContainingClass(method);
-      if (containingClass == null) {
-        return;
-      }
-      final Condition<PsiElement>[] addins = InspectionManager.CANT_BE_STATIC_EXTENSION.getExtensions();
-      for (Condition<PsiElement> addin : addins) {
-        if (addin.value(method)) {
-          return;
-        }
-      }
-      final PsiElement scope = containingClass.getScope();
-      if (!(scope instanceof PsiJavaFile) && !containingClass.hasModifierProperty(PsiModifier.STATIC) && !containingClass.isInterface()) {
-        return;
-      }
-      if (m_onlyPrivateOrFinal && !method.hasModifierProperty(PsiModifier.FINAL) && !method.hasModifierProperty(PsiModifier.PRIVATE)) {
-        return;
-      }
-      if (isExcluded(method) || MethodUtils.hasSuper(method) || MethodUtils.isOverridden(method)) {
-        return;
-      }
-      if (implementsSurprisingInterface(method)) {
-        return;
-      }
-      final MethodReferenceVisitor visitor = new MethodReferenceVisitor(method);
-      method.accept(visitor);
-      if (!visitor.areReferencesStaticallyAccessible()) {
-        return;
-      }
-      registerMethodError(method);
-    }
-
-    private boolean implementsSurprisingInterface(final PsiMethod method) {
-      final PsiClass containingClass = method.getContainingClass();
-      if (containingClass == null) {
-        return false;
-      }
-      final Query<PsiClass> search = ClassInheritorsSearch.search(containingClass, method.getUseScope(), true, true, false);
-      final boolean[] result = new boolean[1];
-      search.forEach(new Processor<PsiClass>() {
-        AtomicInteger count = new AtomicInteger(0);
-
-        @Override
-        public boolean process(PsiClass subClass) {
-          if (count.incrementAndGet() > 5) {
-            result[0] = true;
-            return false;
-          }
-          final PsiReferenceList list = subClass.getImplementsList();
-          if (list == null) {
-            return true;
-          }
-          final PsiJavaCodeReferenceElement[] referenceElements = list.getReferenceElements();
-          for (PsiJavaCodeReferenceElement referenceElement : referenceElements) {
-            final PsiElement target = referenceElement.resolve();
-            if (!(target instanceof PsiClass)) {
-              result[0] = true;
-              return false;
-            }
-            final PsiClass aClass = (PsiClass)target;
-            if (!aClass.isInterface()) {
-              result[0] = true;
-              return false;
-            }
-            if (aClass.findMethodBySignature(method, true) != null) {
-              result[0] = true;
-              return false;
-            }
-          }
-          return true;
-        }
-      });
-      return result[0];
-    }
-
-    private boolean isExcluded(PsiMethod method) {
-      return SerializationUtils.isWriteObject(method) || SerializationUtils.isReadObject(method) ||
-             SerializationUtils.isWriteReplace(method) || SerializationUtils.isReadResolve(method);
-    }
-  }
 }