Move util method from JavaDescriptorResolver to DescriptorResolverUtils

This commit is contained in:
Pavel V. Talanov
2012-10-06 20:17:37 +04:00
parent 086fadc9be
commit 55a60b3296
4 changed files with 9 additions and 10 deletions
@@ -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());
}
}
}
@@ -76,7 +76,7 @@ public class JavaDescriptorResolveData {
boolean staticMembers,
@NotNull ClassOrNamespaceDescriptor descriptor
) {
JavaDescriptorResolver.checkPsiClassIsNotJet(psiClass);
DescriptorResolverUtils.checkPsiClassIsNotJet(psiClass);
this.psiClass = psiClass;
this.psiPackage = psiPackage;
@@ -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);
@@ -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);