From 227d50945c84201f59e45afeb42ca693d13d2d3e Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 27 Apr 2012 10:43:14 +0400 Subject: [PATCH] Cleanup --- .../jet/lang/resolve/OverrideResolver.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index c3884183e53..065764e8a4b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -298,21 +298,13 @@ public class OverrideResolver { } public static void collectMissingImplementations(MutableClassDescriptor classDescriptor, Set abstractNoImpl, Set manyImpl) { - - for (DeclarationDescriptor descriptor : classDescriptor.getScopeForMemberLookup().getAllDescriptors()) { - if (descriptor instanceof CallableMemberDescriptor) { - collectMissingImplementations((CallableMemberDescriptor) descriptor, abstractNoImpl, manyImpl); - } + for (CallableMemberDescriptor descriptor : classDescriptor.getAllCallableMembers()) { + collectMissingImplementations(descriptor, abstractNoImpl, manyImpl); } } private static void collectMissingImplementations(CallableMemberDescriptor descriptor, Set abstractNoImpl, Set manyImpl) { - if (descriptor.getKind().isReal()) { - if (descriptor.getModality() == Modality.ABSTRACT) { - //abstractNoImpl.add(descriptor); - } - } - else { + if (!descriptor.getKind().isReal()) { Collection overriddenDeclarations = OverridingUtil.getOverridenDeclarations(descriptor); if (overriddenDeclarations.size() == 0) { throw new IllegalStateException();