From 68031c899c2ef5f51ef6fe6131ebaf145296697b Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 18 Aug 2010 14:20:04 +0400
Subject: [PATCH] include self

---
 .../src/com/intellij/psi/util/TypesDistinctProver.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/openapi/src/com/intellij/psi/util/TypesDistinctProver.java b/java/openapi/src/com/intellij/psi/util/TypesDistinctProver.java
index d8f645008c36..a34cb05b525d 100644
--- a/java/openapi/src/com/intellij/psi/util/TypesDistinctProver.java
+++ b/java/openapi/src/com/intellij/psi/util/TypesDistinctProver.java
@@ -52,7 +52,7 @@ public class TypesDistinctProver {
           if (superBound.getArrayDimensions() > 0) return true;
           final PsiClass boundClass1 = PsiUtil.resolveClassInType(TypeConversionUtil.erasure(superBound));
           if (boundClass1 == null || boundClass1 instanceof PsiTypeParameter) return false;
-          return !boundClass1.isInheritor(psiClass2, true);
+          return !InheritanceUtil.isInheritorOrSelf(boundClass1, psiClass2, true);
         }
 
         final PsiType bound = ((PsiWildcardType)type1).getBound();
@@ -112,7 +112,7 @@ public class TypesDistinctProver {
           return try2ProveTypeParameterDistinct(type2, extendsBoundClass);
         }
         if (superBoundClass instanceof PsiTypeParameter) return false;
-        return !superBoundClass.isInheritor(extendsBoundClass, true);
+        return !InheritanceUtil.isInheritorOrSelf(superBoundClass, extendsBoundClass, true);
       }
       return true;
     }
@@ -125,10 +125,10 @@ public class TypesDistinctProver {
                                                     PsiClass boundClass2) {
     if (boundClass1.isInterface() && boundClass2.isInterface()) return false;
     if (boundClass1.isInterface()) {
-      return !(boundClass2.hasModifierProperty(PsiModifier.FINAL) ? boundClass2.isInheritor(boundClass1, true) : true);
+      return !(boundClass2.hasModifierProperty(PsiModifier.FINAL) ? InheritanceUtil.isInheritorOrSelf(boundClass2, boundClass1, true) : true);
     }
     if (boundClass2.isInterface()) {
-      return !(boundClass1.hasModifierProperty(PsiModifier.FINAL) ? boundClass1.isInheritor(boundClass2, true) : true);
+      return !(boundClass1.hasModifierProperty(PsiModifier.FINAL) ? InheritanceUtil.isInheritorOrSelf(boundClass1, boundClass2, true) : true);
     }
 
     if (boundClass1 instanceof PsiTypeParameter) {
@@ -139,7 +139,7 @@ public class TypesDistinctProver {
       return try2ProveTypeParameterDistinct(type1, boundClass2);
     }
 
-    return !boundClass1.isInheritor(boundClass2, true) && !boundClass2.isInheritor(boundClass1, true);
+    return !InheritanceUtil.isInheritorOrSelf(boundClass1, boundClass2, true) && !InheritanceUtil.isInheritorOrSelf(boundClass2, boundClass1, true);
   }
 
   public static boolean try2ProveTypeParameterDistinct(PsiType type, PsiClass typeParameter) {