diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 9ebb4b5c172..90f649c519f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -90,11 +90,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes return namespaceResolver.resolveNamespace(qualifiedName, searchRule); } - @Override - public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName) { - return resolveNamespace(qualifiedName, IGNORE_KOTLIN_SOURCES); - } - @Nullable public JetScope getJavaPackageScope(@NotNull NamespaceDescriptor namespaceDescriptor) { return namespaceResolver.getJavaPackageScopeForExistingNamespaceDescriptor(namespaceDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java index cea1600bef3..2b03cf6f6d9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java @@ -19,14 +19,10 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; public interface DependencyClassByQualifiedNameResolver { @Nullable ClassDescriptor resolveClass(@NotNull FqName qualifiedName); - @Nullable - NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName); - } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolverDummyImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolverDummyImpl.java index 870fc2c3e1c..4a1cd464140 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolverDummyImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolverDummyImpl.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; public class DependencyClassByQualifiedNameResolverDummyImpl implements DependencyClassByQualifiedNameResolver { @@ -26,9 +25,4 @@ public class DependencyClassByQualifiedNameResolverDummyImpl implements Dependen public ClassDescriptor resolveClass(@NotNull FqName qualifiedName) { return null; } - - @Override - public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName) { - return null; - } }