diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java index e4ee08ab48f..b082ddfc20a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java @@ -120,4 +120,10 @@ public final class DescriptorResolverUtils { scopeData.setNamedMembersMap(JavaDescriptorResolverHelper.getNamedMembers(scopeData)); } } + + public static void checkPsiClassIsNotJet(PsiClass psiClass) { + if (psiClass instanceof JetJavaMirrorMarker) { + throw new IllegalStateException("trying to resolve fake jet PsiClass as regular PsiClass: " + psiClass.getQualifiedName()); + } + } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java index 1d069c94199..a2aa1e969d0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolveData.java @@ -76,7 +76,7 @@ public class JavaDescriptorResolveData { boolean staticMembers, @NotNull ClassOrNamespaceDescriptor descriptor ) { - JavaDescriptorResolver.checkPsiClassIsNotJet(psiClass); + DescriptorResolverUtils.checkPsiClassIsNotJet(psiClass); this.psiClass = psiClass; this.psiPackage = psiPackage; 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 6501524163d..d4679f067a4 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 @@ -197,13 +197,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes return namespaceDescriptorCacheByFqn; } - public static void checkPsiClassIsNotJet(PsiClass psiClass) { - if (psiClass instanceof JetJavaMirrorMarker) { - throw new IllegalStateException("trying to resolve fake jet PsiClass as regular PsiClass: " + psiClass.getQualifiedName()); - } - } - - @Nullable public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName, @NotNull DescriptorSearchRule searchRule) { return namespaceResolver.resolveNamespace(qualifiedName, searchRule); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ClassResolver.java index 3ec6d2b15ee..f2adca868e2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ClassResolver.java @@ -142,7 +142,7 @@ public class ClassResolver { throw new IllegalStateException(qualifiedName); } - JavaDescriptorResolver.checkPsiClassIsNotJet(psiClass); + DescriptorResolverUtils.checkPsiClassIsNotJet(psiClass); Name name = Name.identifier(psiClass.getName()); JetClassAnnotation jetClassAnnotation = JetClassAnnotation.get(psiClass); @@ -212,7 +212,7 @@ public class ClassResolver { @NotNull ClassDescriptor containing, @NotNull PsiClass psiClass ) { - JavaDescriptorResolver.checkPsiClassIsNotJet(psiClass); + DescriptorResolverUtils.checkPsiClassIsNotJet(psiClass); if (psiClass.isEnum()) { return createClassObjectDescriptorForEnum(containing, psiClass);