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 9df9e2b7838..85f5fd862bf 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
@@ -109,6 +109,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
     private final AnnotationResolver annotationResolver = new AnnotationResolver(this);
     public final FunctionResolver functionResolver = new FunctionResolver(this);
     public final NamespaceResolver namespaceResolver = new NamespaceResolver(this);
+    private final InnerClassResolver innerClassResolver = new InnerClassResolver(this);
 
     @Inject
     public void setProject(Project project) {
@@ -533,52 +534,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
     }
 
     public List<ClassDescriptor> resolveInnerClasses(DeclarationDescriptor owner, PsiClass psiClass, boolean staticMembers) {
-        if (staticMembers) {
-            return resolveInnerClassesOfClassObject(owner, psiClass);
-        }
-
-        PsiClass[] innerPsiClasses = psiClass.getInnerClasses();
-        List<ClassDescriptor> r = new ArrayList<ClassDescriptor>(innerPsiClasses.length);
-        for (PsiClass innerPsiClass : innerPsiClasses) {
-            if (innerPsiClass.hasModifierProperty(PsiModifier.PRIVATE)) {
-                // TODO: hack against inner classes
-                continue;
-            }
-            if (innerPsiClass.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) {
-                continue;
-            }
-            if (isInnerEnum(innerPsiClass, owner)) {
-                // Inner enums will be put later into our class object
-                continue;
-            }
-            ClassDescriptor classDescriptor = resolveInnerClass(innerPsiClass);
-            r.add(classDescriptor);
-        }
-        return r;
-    }
-
-    private List<ClassDescriptor> resolveInnerClassesOfClassObject(DeclarationDescriptor owner, PsiClass psiClass) {
-        if (!DescriptorUtils.isClassObject(owner)) {
-            return new ArrayList<ClassDescriptor>(0);
-        }
-
-        List<ClassDescriptor> r = new ArrayList<ClassDescriptor>(0);
-        // If we're a class object, inner enums of our parent need to be put into us
-        DeclarationDescriptor containingDeclaration = owner.getContainingDeclaration();
-        for (PsiClass innerPsiClass : psiClass.getInnerClasses()) {
-            if (isInnerEnum(innerPsiClass, containingDeclaration)) {
-                ClassDescriptor classDescriptor = resolveInnerClass(innerPsiClass);
-                r.add(classDescriptor);
-            }
-        }
-        return r;
-    }
-
-    private ClassDescriptor resolveInnerClass(@NotNull PsiClass innerPsiClass) {
-        String name = innerPsiClass.getQualifiedName();
-        assert name != null : "Inner class has no qualified name";
-        ClassDescriptor classDescriptor = classResolver.resolveClass(new FqName(name), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN);
-        assert classDescriptor != null : "Couldn't resolve class " + name;
-        return classDescriptor;
+        return innerClassResolver.resolveInnerClasses(owner, psiClass, staticMembers);
     }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/InnerClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/InnerClassResolver.java
new file mode 100644
index 00000000000..28894ed2c8b
--- /dev/null
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/InnerClassResolver.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.java.resolver;
+
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiModifier;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
+import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
+import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
+import org.jetbrains.jet.lang.resolve.java.JvmAbi;
+import org.jetbrains.jet.lang.resolve.name.FqName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InnerClassResolver {
+    private final JavaDescriptorResolver javaDescriptorResolver;
+
+    public InnerClassResolver(JavaDescriptorResolver javaDescriptorResolver) {
+        this.javaDescriptorResolver = javaDescriptorResolver;
+    }
+
+    public List<ClassDescriptor> resolveInnerClasses(DeclarationDescriptor owner, PsiClass psiClass, boolean staticMembers) {
+        if (staticMembers) {
+            return resolveInnerClassesOfClassObject(owner, psiClass);
+        }
+
+        PsiClass[] innerPsiClasses = psiClass.getInnerClasses();
+        List<ClassDescriptor> r = new ArrayList<ClassDescriptor>(innerPsiClasses.length);
+        for (PsiClass innerPsiClass : innerPsiClasses) {
+            if (innerPsiClass.hasModifierProperty(PsiModifier.PRIVATE)) {
+                // TODO: hack against inner classes
+                continue;
+            }
+            if (innerPsiClass.getName().equals(JvmAbi.CLASS_OBJECT_CLASS_NAME)) {
+                continue;
+            }
+            if (JavaDescriptorResolver.isInnerEnum(innerPsiClass, owner)) {
+                // Inner enums will be put later into our class object
+                continue;
+            }
+            ClassDescriptor classDescriptor = resolveInnerClass(innerPsiClass);
+            r.add(classDescriptor);
+        }
+        return r;
+    }
+
+    public List<ClassDescriptor> resolveInnerClassesOfClassObject(DeclarationDescriptor owner, PsiClass psiClass) {
+        if (!DescriptorUtils.isClassObject(owner)) {
+            return new ArrayList<ClassDescriptor>(0);
+        }
+
+        List<ClassDescriptor> r = new ArrayList<ClassDescriptor>(0);
+        // If we're a class object, inner enums of our parent need to be put into us
+        DeclarationDescriptor containingDeclaration = owner.getContainingDeclaration();
+        for (PsiClass innerPsiClass : psiClass.getInnerClasses()) {
+            if (JavaDescriptorResolver.isInnerEnum(innerPsiClass, containingDeclaration)) {
+                ClassDescriptor classDescriptor = resolveInnerClass(innerPsiClass);
+                r.add(classDescriptor);
+            }
+        }
+        return r;
+    }
+
+    public ClassDescriptor resolveInnerClass(@NotNull PsiClass innerPsiClass) {
+        String name = innerPsiClass.getQualifiedName();
+        assert name != null : "Inner class has no qualified name";
+        ClassDescriptor classDescriptor =
+                javaDescriptorResolver.getClassResolver().resolveClass(new FqName(name), DescriptorSearchRule.IGNORE_IF_FOUND_IN_KOTLIN);
+        assert classDescriptor != null : "Couldn't resolve class " + name;
+        return classDescriptor;
+    }
+}
\ No newline at end of file