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

---
 .../lang/resolve/java/JavaDescriptorResolver.java  |  6 ------
 .../java/JavaDescriptorSignatureResolver.java      | 14 +++++++++-----
 2 files changed, 9 insertions(+), 11 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 aeac90324f5..6501524163d 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
@@ -203,12 +203,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         }
     }
 
-    static boolean isJavaLangObject(JetType type) {
-        ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor();
-        return classifierDescriptor instanceof ClassDescriptor &&
-               DescriptorUtils.getFQName(classifierDescriptor).equalsTo(OBJECT_FQ_NAME);
-    }
-
 
     @Nullable
     public NamespaceDescriptor resolveNamespace(@NotNull FqName qualifiedName, @NotNull DescriptorSearchRule searchRule) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java
index d67fdd94e49..d971bc974d0 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java
@@ -21,11 +21,9 @@ import com.intellij.psi.*;
 import jet.typeinfo.TypeInfoVariance;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
-import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptorImpl;
+import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolveData.ResolverClassData;
 import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
 import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
@@ -57,6 +55,12 @@ public class JavaDescriptorSignatureResolver {
         this.semanticServices = javaSemanticServices;
     }
 
+    private static boolean isJavaLangObject(@NotNull JetType type) {
+        ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor();
+        return classifierDescriptor instanceof ClassDescriptor &&
+               DescriptorUtils.getFQName(classifierDescriptor).equalsTo(JavaDescriptorResolver.OBJECT_FQ_NAME);
+    }
+
     private enum TypeParameterDescriptorOrigin {
         JAVA,
         KOTLIN,
@@ -142,7 +146,7 @@ public class JavaDescriptorSignatureResolver {
             return new JetTypeJetSignatureReader(semanticServices, JetStandardLibrary.getInstance(), typeVariableResolver) {
                 @Override
                 protected void done(@NotNull JetType jetType) {
-                    if (JavaDescriptorResolver.isJavaLangObject(jetType)) {
+                    if (isJavaLangObject(jetType)) {
                         return;
                     }
                     upperBounds.add(jetType);