DependencyClassByFqNameResolver

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -49,7 +49,7 @@ import java.util.*;
 /**
  * @author abreslav
  */
-public class JavaDescriptorResolver {
+public class JavaDescriptorResolver implements DependencyClassByQualifiedNameResolver {
     
     public static final Name JAVA_ROOT = Name.special("<java_root>");
 
@@ -307,6 +307,11 @@ public class JavaDescriptorResolver {
         return clazz;
     }
 
+    @Override
+    public ClassDescriptor resolveClass(@NotNull FqName qualifiedName) {
+        return resolveClass(qualifiedName, DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN);
+    }
+
     private ClassDescriptor resolveClass(@NotNull FqName qualifiedName, @NotNull DescriptorSearchRule searchRule, @NotNull List<Runnable> tasks) {
         if (qualifiedName.getFqName().endsWith(JvmAbi.TRAIT_IMPL_SUFFIX)) {
             // TODO: only if -$$TImpl class is created by Kotlin
@@ -947,6 +952,11 @@ public class JavaDescriptorResolver {
         return scopeData.namespaceDescriptor;
     }
 
+    @Override
+    public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName) {
+        return resolveNamespace(qualifiedName, DescriptorSearchRule.ERROR_IF_FOUND_IN_KOTLIN);
+    }
+
     private NamespaceDescriptorParent resolveParentNamespace(FqName fqName) {
         if (fqName.isRoot()) {
             return FAKE_ROOT_MODULE;