diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/EmptyClassInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/EmptyClassInspectionBase.java
new file mode 100644
index 000000000000..490f08156919
--- /dev/null
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/EmptyClassInspectionBase.java
@@ -0,0 +1,172 @@
+/*
+ * 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.codeInsight.AnnotationUtil;
+import com.intellij.psi.*;
+import com.intellij.psi.util.FileTypeUtils;
+import com.intellij.psi.util.InheritanceUtil;
+import com.siyeh.InspectionGadgetsBundle;
+import com.siyeh.ig.BaseInspection;
+import com.siyeh.ig.BaseInspectionVisitor;
+import com.siyeh.ig.InspectionGadgetsFix;
+import com.siyeh.ig.fixes.AddToIgnoreIfAnnotatedByListQuickFix;
+import com.siyeh.ig.ui.ExternalizableStringSet;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+public class EmptyClassInspectionBase extends BaseInspection {
+  @SuppressWarnings({"PublicField"})
+  public final ExternalizableStringSet ignorableAnnotations = new ExternalizableStringSet();
+  @SuppressWarnings({"PublicField"})
+  public boolean ignoreClassWithParameterization = false;
+  @SuppressWarnings({"PublicField"})
+  public boolean ignoreThrowables = true;
+
+  @Override
+  @NotNull
+  public String getDisplayName() {
+    return InspectionGadgetsBundle.message("empty.class.display.name");
+  }
+
+  @Override
+  @NotNull
+  protected String buildErrorString(Object... infos) {
+    final Object element = infos[0];
+    if (element instanceof PsiAnonymousClass) {
+      return InspectionGadgetsBundle.message("empty.anonymous.class.problem.descriptor");
+    }
+    else if (element instanceof PsiClass) {
+      return InspectionGadgetsBundle.message("empty.class.problem.descriptor");
+    }
+    else {
+      return InspectionGadgetsBundle.message("empty.class.file.without.class.problem.descriptor");
+    }
+  }
+
+  @NotNull
+  @Override
+  protected InspectionGadgetsFix[] buildFixes(Object... infos) {
+    final Object info = infos[0];
+    if (!(info instanceof PsiModifierListOwner)) {
+      return InspectionGadgetsFix.EMPTY_ARRAY;
+    }
+    return AddToIgnoreIfAnnotatedByListQuickFix.build((PsiModifierListOwner)info, ignorableAnnotations);
+  }
+
+  @Override
+  public BaseInspectionVisitor buildVisitor() {
+    return new EmptyClassVisitor();
+  }
+
+  private class EmptyClassVisitor extends BaseInspectionVisitor {
+
+    @Override
+    public void visitFile(PsiFile file) {
+      if (!(file instanceof PsiJavaFile)) {
+        return;
+      }
+      final PsiJavaFile javaFile = (PsiJavaFile)file;
+      if (javaFile.getClasses().length != 0) {
+        return;
+      }
+      @NonNls final String fileName = javaFile.getName();
+      if ("package-info.java".equals(fileName)) {
+        return;
+      }
+      registerError(file, file);
+    }
+
+    @Override
+    public void visitClass(@NotNull PsiClass aClass) {
+      //don't call super, to prevent drilldown
+      if (FileTypeUtils.isInServerPageFile(aClass.getContainingFile())) {
+        return;
+      }
+      if (aClass.isInterface() || aClass.isEnum() || aClass.isAnnotationType()) {
+        return;
+      }
+      if (aClass instanceof PsiTypeParameter) {
+        return;
+      }
+      final PsiMethod[] constructors = aClass.getConstructors();
+      if (constructors.length > 0) {
+        return;
+      }
+      final PsiMethod[] methods = aClass.getMethods();
+      if (methods.length > 0) {
+        return;
+      }
+      final PsiField[] fields = aClass.getFields();
+      if (fields.length > 0) {
+        return;
+      }
+      final PsiClassInitializer[] initializers = aClass.getInitializers();
+      if (initializers.length > 0) {
+        return;
+      }
+      if (ignoreClassWithParameterization && isSuperParametrization(aClass)) {
+        return;
+      }
+      if (AnnotationUtil.isAnnotated(aClass, ignorableAnnotations)) {
+        return;
+      }
+      if (ignoreThrowables && InheritanceUtil.isInheritor(aClass, "java.lang.Throwable")) {
+        return;
+      }
+      registerClassError(aClass, aClass);
+    }
+
+    private boolean hasTypeArguments(PsiReferenceList extendsList) {
+      if (extendsList == null) {
+        return false;
+      }
+      final PsiJavaCodeReferenceElement[] referenceElements = extendsList.getReferenceElements();
+      for (PsiJavaCodeReferenceElement referenceElement : referenceElements) {
+        final PsiReferenceParameterList parameterList = referenceElement.getParameterList();
+        if (parameterList == null) {
+          continue;
+        }
+        final PsiType[] typeArguments = parameterList.getTypeArguments();
+        if (typeArguments.length != 0) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    private boolean isSuperParametrization(PsiClass aClass) {
+      if (!(aClass instanceof PsiAnonymousClass)) {
+        final PsiReferenceList extendsList = aClass.getExtendsList();
+        final PsiReferenceList implementsList = aClass.getImplementsList();
+        return hasTypeArguments(extendsList) || hasTypeArguments(implementsList);
+      }
+      final PsiAnonymousClass anonymousClass = (PsiAnonymousClass)aClass;
+      final PsiJavaCodeReferenceElement reference = anonymousClass.getBaseClassReference();
+      final PsiReferenceParameterList parameterList = reference.getParameterList();
+      if (parameterList == null) {
+        return false;
+      }
+      final PsiTypeElement[] elements = parameterList.getTypeParameterElements();
+      for (PsiTypeElement element : elements) {
+        if (element != null) {
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+}
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java
index 85a6dff51fde..1ec10f36c85b 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/EmptyClassInspection.java
@@ -15,55 +15,14 @@
  */
 package com.siyeh.ig.classlayout;
 
-import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInspection.util.SpecialAnnotationsUtil;
-import com.intellij.psi.*;
-import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.util.ui.CheckBox;
 import com.siyeh.InspectionGadgetsBundle;
-import com.siyeh.ig.BaseInspection;
-import com.siyeh.ig.BaseInspectionVisitor;
-import com.siyeh.ig.InspectionGadgetsFix;
-import com.siyeh.ig.fixes.AddToIgnoreIfAnnotatedByListQuickFix;
-import com.intellij.psi.util.FileTypeUtils;
-import com.siyeh.ig.ui.ExternalizableStringSet;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
 
-public class EmptyClassInspection extends BaseInspection {
-
-  @SuppressWarnings({"PublicField"})
-  public final ExternalizableStringSet ignorableAnnotations = new ExternalizableStringSet();
-
-  @SuppressWarnings({"PublicField"})
-  public boolean ignoreClassWithParameterization = false;
-
-  @SuppressWarnings({"PublicField"})
-  public boolean ignoreThrowables = true;
-
-  @Override
-  @NotNull
-  public String getDisplayName() {
-    return InspectionGadgetsBundle.message("empty.class.display.name");
-  }
-
-  @Override
-  @NotNull
-  protected String buildErrorString(Object... infos) {
-    final Object element = infos[0];
-    if (element instanceof PsiAnonymousClass) {
-      return InspectionGadgetsBundle.message("empty.anonymous.class.problem.descriptor");
-    }
-    else if (element instanceof PsiClass) {
-      return InspectionGadgetsBundle.message("empty.class.problem.descriptor");
-    }
-    else {
-      return InspectionGadgetsBundle.message("empty.class.file.without.class.problem.descriptor");
-    }
-  }
+public class EmptyClassInspection extends EmptyClassInspectionBase {
 
   @Override
   public JComponent createOptionsPanel() {
@@ -89,117 +48,4 @@ public class EmptyClassInspection extends BaseInspection {
     panel.add(checkBox2, constraints);
     return panel;
   }
-
-  @NotNull
-  @Override
-  protected InspectionGadgetsFix[] buildFixes(Object... infos) {
-    final Object info = infos[0];
-    if (!(info instanceof PsiModifierListOwner)) {
-      return InspectionGadgetsFix.EMPTY_ARRAY;
-    }
-    return AddToIgnoreIfAnnotatedByListQuickFix.build((PsiModifierListOwner)info, ignorableAnnotations);
-  }
-
-  @Override
-  public BaseInspectionVisitor buildVisitor() {
-    return new EmptyClassVisitor();
-  }
-
-  private class EmptyClassVisitor extends BaseInspectionVisitor {
-
-    @Override
-    public void visitFile(PsiFile file) {
-      if (!(file instanceof PsiJavaFile)) {
-        return;
-      }
-      final PsiJavaFile javaFile = (PsiJavaFile)file;
-      if (javaFile.getClasses().length != 0) {
-        return;
-      }
-      @NonNls final String fileName = javaFile.getName();
-      if ("package-info.java".equals(fileName)) {
-        return;
-      }
-      registerError(file, file);
-    }
-
-    @Override
-    public void visitClass(@NotNull PsiClass aClass) {
-      //don't call super, to prevent drilldown
-      if (FileTypeUtils.isInServerPageFile(aClass.getContainingFile())) {
-        return;
-      }
-      if (aClass.isInterface() || aClass.isEnum() || aClass.isAnnotationType()) {
-        return;
-      }
-      if (aClass instanceof PsiTypeParameter) {
-        return;
-      }
-      final PsiMethod[] constructors = aClass.getConstructors();
-      if (constructors.length > 0) {
-        return;
-      }
-      final PsiMethod[] methods = aClass.getMethods();
-      if (methods.length > 0) {
-        return;
-      }
-      final PsiField[] fields = aClass.getFields();
-      if (fields.length > 0) {
-        return;
-      }
-      final PsiClassInitializer[] initializers = aClass.getInitializers();
-      if (initializers.length > 0) {
-        return;
-      }
-      if (ignoreClassWithParameterization && isSuperParametrization(aClass)) {
-        return;
-      }
-      if (AnnotationUtil.isAnnotated(aClass, ignorableAnnotations)) {
-        return;
-      }
-      if (ignoreThrowables && InheritanceUtil.isInheritor(aClass, "java.lang.Throwable")) {
-        return;
-      }
-      registerClassError(aClass, aClass);
-    }
-
-    private boolean hasTypeArguments(PsiReferenceList extendsList) {
-      if (extendsList == null) {
-        return false;
-      }
-      final PsiJavaCodeReferenceElement[] referenceElements = extendsList.getReferenceElements();
-      for (PsiJavaCodeReferenceElement referenceElement : referenceElements) {
-        final PsiReferenceParameterList parameterList = referenceElement.getParameterList();
-        if (parameterList == null) {
-          continue;
-        }
-        final PsiType[] typeArguments = parameterList.getTypeArguments();
-        if (typeArguments.length != 0) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    private boolean isSuperParametrization(PsiClass aClass) {
-      if (!(aClass instanceof PsiAnonymousClass)) {
-        final PsiReferenceList extendsList = aClass.getExtendsList();
-        final PsiReferenceList implementsList = aClass.getImplementsList();
-        return hasTypeArguments(extendsList) || hasTypeArguments(implementsList);
-      }
-      final PsiAnonymousClass anonymousClass = (PsiAnonymousClass)aClass;
-      final PsiJavaCodeReferenceElement reference = anonymousClass.getBaseClassReference();
-      final PsiReferenceParameterList parameterList = reference.getParameterList();
-      if (parameterList == null) {
-        return false;
-      }
-      final PsiTypeElement[] elements = parameterList.getTypeParameterElements();
-      for (PsiTypeElement element : elements) {
-        if (element != null) {
-          return true;
-        }
-      }
-      return false;
-    }
-  }
 }
\ No newline at end of file