From 613a298e829791bd7b344e50b8914543e51f5b9b Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Sun, 11 Nov 2012 12:38:18 +0400 Subject: [PATCH] Use the same code to resolve classifiers for JavaClassStaticMembersScope as for non static members --- .../resolve/java/scope/JavaClassStaticMembersScope.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java index 6a72982e4b3..7fbc2cb5cd8 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassStaticMembersScope.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.java.scope; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; @@ -42,11 +41,6 @@ public final class JavaClassStaticMembersScope extends JavaClassMembersScope { this.packageFQN = packageFQN; } - @Override - public ClassifierDescriptor getClassifier(@NotNull Name name) { - return getResolver().resolveClass(packageFQN.child(name), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN); - } - @Override public ClassDescriptor getObjectDescriptor(@NotNull Name name) { //TODO: check that class is an object