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 3421beeb9ce..4bdcc90b90f 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 @@ -189,7 +189,6 @@ public class LazyJavaClassMemberScope( // namespaces should be resolved elsewhere override fun getPackage(name: Name) = null - override fun getAllPackageNames(): Collection = listOf() override fun toString() = "Lazy java member scope for " + jClass.getFqName() } \ No newline at end of file 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 c98f6e97bf5..fa2d5ffab38 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 @@ -277,14 +277,6 @@ public abstract class LazyJavaMemberScope( private fun computeAllDescriptors(): MutableCollection { val result = LinkedHashSet() - for (name in getAllPackageNames()) { - val descriptor = getPackage(name) - if (descriptor != null) { - // Null signifies that a package found in Java is not present in Kotlin - result.add(descriptor) - } - } - for (name in getAllClassNames()) { val descriptor = getClassifier(name) if (descriptor != null) { @@ -310,7 +302,6 @@ public abstract class LazyJavaMemberScope( // Do nothing } - protected abstract fun getAllPackageNames(): Collection protected abstract fun getAllClassNames(): Collection 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 055e5a0b8a5..2f0093ecb4d 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 @@ -58,7 +58,6 @@ public abstract class LazyJavaPackageFragmentScope( // Package fragments are not nested override fun getPackage(name: Name) = null - final override fun getAllPackageNames() = listOf() abstract fun getSubPackages(): Collection override fun getImplicitReceiversHierarchy(): List = listOf()