From f208f9c64ac476c9eb8f692daadbc2671e784e9b Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 17 Apr 2012 20:47:51 +0400 Subject: [PATCH] 'isSubclass' method refactoring --- .../org/jetbrains/jet/lang/resolve/DescriptorUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index b2ac1dcf3e2..8827c70dd77 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -281,17 +281,16 @@ public class DescriptorUtils { } public static boolean isSubclass(@NotNull ClassDescriptor subClass, @NotNull ClassDescriptor superClass) { - DeclarationDescriptor superOriginal = superClass.getOriginal(); - return hasEqualSuperType(subClass.getDefaultType(), superOriginal); + return isSubtypeOfClass(subClass.getDefaultType(), superClass.getOriginal()); } - private static boolean hasEqualSuperType(@NotNull JetType type, @NotNull DeclarationDescriptor superOriginal) { + private static boolean isSubtypeOfClass(@NotNull JetType type, @NotNull DeclarationDescriptor superClass) { DeclarationDescriptor descriptor = type.getConstructor().getDeclarationDescriptor(); - if (descriptor != null && superOriginal.equals(descriptor.getOriginal())) { + if (descriptor != null && superClass == descriptor.getOriginal()) { return true; } for (JetType superType : type.getConstructor().getSupertypes()) { - if (hasEqualSuperType(superType, superOriginal)) { + if (isSubtypeOfClass(superType, superClass)) { return true; } }