From ea7f0ff6e56d630d38061d714d0207d29cf21c5b Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Sun, 4 Nov 2012 22:51:06 +0400 Subject: [PATCH] Minor refactoring --- .../java/resolver/JavaPropertyResolver.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java index 31dbd67b9a6..9cad70f6a36 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java @@ -445,17 +445,15 @@ public final class JavaPropertyResolver { boolean isStatic ) { PsiClass psiClass = scopeData.getPsiClass(); - 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 { + if (psiClass == null || !psiClass.isEnum() || !isStatic) { 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; } }