From 9398bb7026488b14bd92aba3ba97f1c00c562003 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Mon, 15 Oct 2012 15:15:51 +0400
Subject: [PATCH] Minor refactoring in JavaInnerClassResolver

---
 .../java/resolver/JavaInnerClassResolver.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaInnerClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaInnerClassResolver.java
index fd2da0fdcc9..ee81e156db0 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaInnerClassResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaInnerClassResolver.java
@@ -45,11 +45,17 @@ public final class JavaInnerClassResolver {
         this.classResolver = classResolver;
     }
 
-    public List<ClassDescriptor> resolveInnerClasses(DeclarationDescriptor owner, PsiClass psiClass, boolean staticMembers) {
+    @NotNull
+    public List<ClassDescriptor> resolveInnerClasses(@NotNull DeclarationDescriptor owner, @NotNull PsiClass psiClass, boolean staticMembers) {
         if (staticMembers) {
             return resolveInnerClassesOfClassObject(owner, psiClass);
         }
 
+        return resolveInnerClasses(owner, psiClass);
+    }
+
+    @NotNull
+    private List<ClassDescriptor> resolveInnerClasses(@NotNull DeclarationDescriptor owner, @NotNull PsiClass psiClass) {
         PsiClass[] innerPsiClasses = psiClass.getInnerClasses();
         List<ClassDescriptor> result = new ArrayList<ClassDescriptor>(innerPsiClasses.length);
         for (PsiClass innerPsiClass : innerPsiClasses) {
@@ -69,14 +75,14 @@ public final class JavaInnerClassResolver {
                 || DescriptorResolverUtils.isInnerEnum(innerPsiClass, owner);
     }
 
-    private List<ClassDescriptor> resolveInnerClassesOfClassObject(DeclarationDescriptor owner, PsiClass psiClass) {
-        if (!DescriptorUtils.isClassObject(owner)) {
+    private List<ClassDescriptor> resolveInnerClassesOfClassObject(@NotNull DeclarationDescriptor classObject, @NotNull PsiClass psiClass) {
+        if (!DescriptorUtils.isClassObject(classObject)) {
             return Collections.emptyList();
         }
 
         List<ClassDescriptor> result = Lists.newArrayList();
         // If we're a class object, inner enums of our parent need to be put into us
-        DeclarationDescriptor containingDeclaration = owner.getContainingDeclaration();
+        DeclarationDescriptor containingDeclaration = classObject.getContainingDeclaration();
         for (PsiClass innerPsiClass : psiClass.getInnerClasses()) {
             if (DescriptorResolverUtils.isInnerEnum(innerPsiClass, containingDeclaration)) {
                 ClassDescriptor classDescriptor = resolveInnerClass(innerPsiClass);
@@ -86,6 +92,7 @@ public final class JavaInnerClassResolver {
         return result;
     }
 
+    @NotNull
     private ClassDescriptor resolveInnerClass(@NotNull PsiClass innerPsiClass) {
         String name = innerPsiClass.getQualifiedName();
         assert name != null : "Inner class has no qualified name";