azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-04 22:51:06 +04:00
parent 5a7c1551d2
commit ea7f0ff6e5
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+8 -10
View File
@@ -445,17 +445,15 @@ public final class JavaPropertyResolver {
boolean isStatic boolean isStatic
) { ) {
PsiClass psiClass = scopeData.getPsiClass(); PsiClass psiClass = scopeData.getPsiClass();
if (psiClass != null && psiClass.isEnum() && isStatic) { if (psiClass == null || !psiClass.isEnum() || !isStatic) {
final String qualifiedName = psiClass.getQualifiedName();
assert qualifiedName != null;
final ClassDescriptor classDescriptor = classResolver.resolveClass(new FqName(qualifiedName));
assert classDescriptor != null;
final ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor();
assert classObjectDescriptor != null;
return classObjectDescriptor;
}
else {
return owner; return owner;
} }
final String qualifiedName = psiClass.getQualifiedName();
assert qualifiedName != null;
final ClassDescriptor classDescriptor = classResolver.resolveClass(new FqName(qualifiedName));
assert classDescriptor != null;
final ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor();
assert classObjectDescriptor != null;
return classObjectDescriptor;
} }
} }