From dc477a1feb526b8b65aab27f0313eca1ee421ac4 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 10 Oct 2013 17:34:54 +0400
Subject: [PATCH] moved to analysis

---
 .../ClassInTopLevelPackageInspectionBase.java | 81 +++++++++++++++++++
 .../ClassInTopLevelPackageInspection.java     | 64 +--------------
 2 files changed, 82 insertions(+), 63 deletions(-)
 create mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspectionBase.java

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspectionBase.java
new file mode 100644
index 000000000000..dec9e2e662d2
--- /dev/null
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspectionBase.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2000-2013 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ig.classlayout;
+
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiJavaFile;
+import com.intellij.psi.util.FileTypeUtils;
+import com.siyeh.InspectionGadgetsBundle;
+import com.siyeh.ig.BaseInspection;
+import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.ig.psiutils.ClassUtils;
+import org.jetbrains.annotations.NotNull;
+
+public class ClassInTopLevelPackageInspectionBase extends BaseInspection {
+  @Override
+  @NotNull
+  public String getID() {
+    return "ClassWithoutPackageStatement";
+  }
+
+  @Override
+  @NotNull
+  public String getDisplayName() {
+    return InspectionGadgetsBundle.message(
+      "class.in.top.level.package.display.name");
+  }
+
+  @Override
+  @NotNull
+  protected String buildErrorString(Object... infos) {
+    return InspectionGadgetsBundle.message(
+      "class.in.top.level.package.problem.descriptor");
+  }
+
+  @Override
+  protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
+    return true;
+  }
+
+  @Override
+  public BaseInspectionVisitor buildVisitor() {
+    return new ClassInTopLevelPackageVisitor();
+  }
+
+  private static class ClassInTopLevelPackageVisitor
+    extends BaseInspectionVisitor {
+
+    @Override
+    public void visitClass(@NotNull PsiClass aClass) {
+      // no call to super, so that it doesn't drill down to inner classes
+      if (FileTypeUtils.isInServerPageFile(aClass)) {
+        return;
+      }
+      if (ClassUtils.isInnerClass(aClass)) {
+        return;
+      }
+      final PsiFile file = aClass.getContainingFile();
+      if (!(file instanceof PsiJavaFile)) {
+        return;
+      }
+      if (((PsiJavaFile)file).getPackageStatement() != null) {
+        return;
+      }
+      registerClassError(aClass);
+    }
+  }
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java
index 9b520199f90c..828b4c68d43f 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java
@@ -15,75 +15,13 @@
  */
 package com.siyeh.ig.classlayout;
 
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiJavaFile;
-import com.siyeh.InspectionGadgetsBundle;
-import com.siyeh.ig.BaseInspection;
-import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.fixes.MoveClassFix;
-import com.siyeh.ig.psiutils.ClassUtils;
-import com.intellij.psi.util.FileTypeUtils;
-import org.jetbrains.annotations.NotNull;
 
-public class ClassInTopLevelPackageInspection extends BaseInspection {
-
-  @Override
-  @NotNull
-  public String getID() {
-    return "ClassWithoutPackageStatement";
-  }
-
-  @Override
-  @NotNull
-  public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "class.in.top.level.package.display.name");
-  }
-
-  @Override
-  @NotNull
-  protected String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "class.in.top.level.package.problem.descriptor");
-  }
+public class ClassInTopLevelPackageInspection extends ClassInTopLevelPackageInspectionBase {
 
   @Override
   protected InspectionGadgetsFix buildFix(Object... infos) {
     return new MoveClassFix();
   }
-
-  @Override
-  protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
-    return true;
-  }
-
-  @Override
-  public BaseInspectionVisitor buildVisitor() {
-    return new ClassInTopLevelPackageVisitor();
-  }
-
-  private static class ClassInTopLevelPackageVisitor
-    extends BaseInspectionVisitor {
-
-    @Override
-    public void visitClass(@NotNull PsiClass aClass) {
-      // no call to super, so that it doesn't drill down to inner classes
-      if (FileTypeUtils.isInServerPageFile(aClass)) {
-        return;
-      }
-      if (ClassUtils.isInnerClass(aClass)) {
-        return;
-      }
-      final PsiFile file = aClass.getContainingFile();
-      if (!(file instanceof PsiJavaFile)) {
-        return;
-      }
-      if (((PsiJavaFile)file).getPackageStatement() != null) {
-        return;
-      }
-      registerClassError(aClass);
-    }
-  }
 }
\ No newline at end of file