From bf76fa665ec474ffe466ea4d88ceadc00fea84a3 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Sat, 6 Oct 2012 19:51:51 +0400 Subject: [PATCH] Move method from JavaDescriptorResolver to NamespaceResolver --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 8 +------- .../lang/resolve/java/resolver/NamespaceResolver.java | 9 ++++++++- 2 files changed, 9 insertions(+), 8 deletions(-) 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 ea2032c96bb..fef7378e181 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 @@ -108,7 +108,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes private final CompileTimeConstResolver compileTimeConstResolver = new CompileTimeConstResolver(this); private final AnnotationResolver annotationResolver = new AnnotationResolver(this); private final FunctionResolver functionResolver = new FunctionResolver(this); - private final NamespaceResolver namespaceResolver = new NamespaceResolver(this); + public final NamespaceResolver namespaceResolver = new NamespaceResolver(this); @Inject public void setProject(Project project) { @@ -250,12 +250,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes return namespaceResolver.getJavaPackageScope(fqName, ns); } - @Nullable - public PsiClass getPsiClassForJavaPackageScope(@NotNull FqName packageFQN) { - return psiClassFinder - .findPsiClass(packageFQN.child(Name.identifier(JvmAbi.PACKAGE_CLASS)), PsiClassFinder.RuntimeClassesHandleMode.IGNORE); - } - public static class ValueParameterDescriptors { private final JetType receiverType; private final List descriptors; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/NamespaceResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/NamespaceResolver.java index 6aff69ec243..197de88c91e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/NamespaceResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/NamespaceResolver.java @@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaNamespaceDescriptor; import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collections; @@ -111,7 +112,7 @@ public class NamespaceResolver { lookingForPsi: { - psiClass = javaDescriptorResolver.getPsiClassForJavaPackageScope(fqName); + psiClass = getPsiClassForJavaPackageScope(fqName); psiPackage = javaDescriptorResolver.getSemanticServices().getPsiClassFinder().findPsiPackage(fqName); if (psiClass != null || psiPackage != null) { javaDescriptorResolver.getTrace().record(JavaBindingContext.JAVA_NAMESPACE_KIND, ns, JavaNamespaceKind.PROPER); @@ -167,4 +168,10 @@ public class NamespaceResolver { } return scope; } + + @Nullable + public PsiClass getPsiClassForJavaPackageScope(@NotNull FqName packageFQN) { + return javaDescriptorResolver.getPsiClassFinder() + .findPsiClass(packageFQN.child(Name.identifier(JvmAbi.PACKAGE_CLASS)), PsiClassFinder.RuntimeClassesHandleMode.IGNORE); + } } \ No newline at end of file