merged CVS and Subversion versions

This commit is contained in:
Eugene Zhuravlev
2005-01-13 15:55:52 +03:00
parent ca0f829972
commit 07c633ce40
2 changed files with 4 additions and 1 deletions
@@ -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;
@@ -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]);
}
}
}