From dee9902d644697299ac0aa3f5258c3cc4b5f7e67 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Sat, 6 Oct 2012 20:14:48 +0400
Subject: [PATCH] Move util method from JavaDescriptorResolver to ClassResolver

---
 .../lang/resolve/java/JavaDescriptorResolver.java    | 11 -----------
 .../lang/resolve/java/resolver/ClassResolver.java    | 12 +++++++++++-
 2 files changed, 11 insertions(+), 12 deletions(-)

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 dac78a358e8..aeac90324f5 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
@@ -178,7 +178,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
 
     @NotNull
     public Collection<ConstructorDescriptor> resolveConstructors(@NotNull ResolverClassData classData) {
-
         return constructorResolver.resolveConstructors(classData);
     }
 
@@ -204,16 +203,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         }
     }
 
-    @Nullable
-    public static PsiClass getInnerClassClassObject(@NotNull PsiClass outer) {
-        for (PsiClass inner : outer.getInnerClasses()) {
-            if (inner.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) {
-                return inner;
-            }
-        }
-        return null;
-    }
-
     static boolean isJavaLangObject(JetType type) {
         ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor();
         return classifierDescriptor instanceof ClassDescriptor &&
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 77e2ec1a1be..3ec6d2b15ee 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
@@ -229,7 +229,7 @@ public class ClassResolver {
             }
         }
 
-        PsiClass classObjectPsiClass = JavaDescriptorResolver.getInnerClassClassObject(psiClass);
+        PsiClass classObjectPsiClass = getInnerClassClassObject(psiClass);
         if (classObjectPsiClass == null) {
             return null;
         }
@@ -445,4 +445,14 @@ public class ClassResolver {
             }
         }
     }
+
+    @Nullable
+    public static PsiClass getInnerClassClassObject(@NotNull PsiClass outer) {
+        for (PsiClass inner : outer.getInnerClasses()) {
+            if (inner.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) {
+                return inner;
+            }
+        }
+        return null;
+    }
 }
\ No newline at end of file