From 5442eaf15f6ab2b841166dca42fcdb2198c328c9 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 14 Nov 2013 15:31:51 +0400 Subject: [PATCH] Useless method removed --- .../resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt | 4 ---- .../lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt | 3 --- .../java/lazy/descriptors/LazyJavaPackageFragmentScope.kt | 4 ---- 3 files changed, 11 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 65014f301f8..0843b5e966d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -166,10 +166,6 @@ public class LazyJavaClassMemberScope( override fun getClassifier(name: Name): ClassifierDescriptor? = if (enumClassObject) null else nestedClasses(name) override fun getAllClassNames(): Collection = nestedClassIndex().keySet() - override fun addExtraDescriptors(result: MutableCollection) { - // TODO - } - // TODO override fun getImplicitReceiversHierarchy(): List = listOf() diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index 1b6e7a560c0..9a319cd5312 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -335,14 +335,11 @@ public abstract class LazyJavaMemberScope( result.addAll(getProperties(name)) } - addExtraDescriptors(result) - return result } protected abstract fun getAllPackageNames(): Collection protected abstract fun getAllClassNames(): Collection - protected abstract fun addExtraDescriptors(result: MutableCollection) override fun toString() = "Lazy scope for ${getContainingDeclaration()}" diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt index 23b7f8d75be..db834bae408 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragmentScope.kt @@ -47,10 +47,6 @@ public abstract class LazyJavaPackageFragmentScope( } } - override fun addExtraDescriptors(result: MutableCollection) { - // no extra descriptors - } - override fun getClassifier(name: Name): ClassifierDescriptor? = classes(name) override fun getNamespace(name: Name): NamespaceDescriptor? = c.javaDescriptorResolver.resolveNamespace(getContainingDeclaration().getFqName().child(name), DescriptorSearchRule.INCLUDE_KOTLIN_SOURCES)