From 07c633ce40f64c0dfe582525ffb7ef469ddb80a9 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 13 Jan 2005 15:55:52 +0300 Subject: [PATCH] merged CVS and Subversion versions --- .../AbstractMethodOverridesConcreteMethodInspection.java | 1 + .../siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AbstractMethodOverridesConcreteMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AbstractMethodOverridesConcreteMethodInspection.java index cf70ef9e76ba..6a2b23ff755c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AbstractMethodOverridesConcreteMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AbstractMethodOverridesConcreteMethodInspection.java @@ -49,6 +49,7 @@ public class AbstractMethodOverridesConcreteMethodInspection extends MethodInspe final PsiMethod superMethod = superMethods[i]; final PsiClass superClass = superMethod.getContainingClass(); if (!superClass.isInterface() && + !superClass.getQualifiedName().equals("java.lang.Object") && !superMethod.hasModifierProperty(PsiModifier.ABSTRACT)) { registerMethodError(method); return; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java index 67c58375d719..5fedd57f52b9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java @@ -51,7 +51,9 @@ public class InnerClassOnInterfaceInspection extends ClassInspection { } final PsiClass[] innerClasses = aClass.getInnerClasses(); for (int i = 0; i < innerClasses.length; i++) { - registerClassError(innerClasses[i]); + if (!innerClasses[i].isEnum() && !innerClasses[i].isAnnotationType()) { + registerClassError(innerClasses[i]); + } } }