From 6aca05023a4bc539a1fb4595bed036080552a260 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 5 Feb 2014 09:47:14 +0100 Subject: [PATCH] OBJECT_FQ_NAME moved to DescriptorResolverUtils --- .../resolve/java/kotlinSignature/PropagationHeuristics.java | 4 ++-- .../resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt | 4 ++-- .../lang/resolve/java/resolver/DescriptorResolverUtils.java | 2 ++ .../jet/lang/resolve/java/resolver/JavaSupertypeResolver.java | 1 - .../jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java | 3 +-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java index 948c322a6ca..f0b1181588f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.Visibilities; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypeResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.structure.*; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaTypeSubstitutorImpl; @@ -234,7 +234,7 @@ class PropagationHeuristics { return !method.isConstructor() && !method.isStatic() && method.getVisibility() != Visibilities.PRIVATE && - !JavaSupertypeResolver.OBJECT_FQ_NAME.equals(method.getContainingClass().getFqName()); + !DescriptorResolverUtils.OBJECT_FQ_NAME.equals(method.getContainingClass().getFqName()); } } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt index 49e17004d7c..dc667518fb6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -136,11 +136,11 @@ class LazyJavaClassDescriptor( private val _supertypes = c.storageManager.createLazyValue> { val supertypes = jClass.getSupertypes() if (supertypes.isEmpty()) - if (jClass.getFqName() == JavaSupertypeResolver.OBJECT_FQ_NAME) { + if (jClass.getFqName() == DescriptorResolverUtils.OBJECT_FQ_NAME) { listOf(KotlinBuiltIns.getInstance().getAnyType()) } else { - val jlObject = c.javaClassResolver.resolveClassByFqName(JavaSupertypeResolver.OBJECT_FQ_NAME)?.getDefaultType() + val jlObject = c.javaClassResolver.resolveClassByFqName(DescriptorResolverUtils.OBJECT_FQ_NAME)?.getDefaultType() // If java.lang.Object is not found, we simply use Any to recover listOf(jlObject ?: KotlinBuiltIns.getInstance().getAnyType()) } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index ee7fd345113..0631f3712c2 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -40,6 +40,8 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqNameSafe; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClassObject; public final class DescriptorResolverUtils { + public static final FqName OBJECT_FQ_NAME = new FqName("java.lang.Object"); + private DescriptorResolverUtils() { } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java index bd09ad509c8..17ac782d025 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java @@ -35,7 +35,6 @@ import java.util.List; import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES; public final class JavaSupertypeResolver { - public static final FqName OBJECT_FQ_NAME = new FqName("java.lang.Object"); private JavaTypeTransformer typeTransformer; private JavaClassResolver classResolver; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java index 5bc5c00ba5a..2814b54a0f7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor; import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypeResolver; import org.jetbrains.jet.lang.resolve.java.structure.*; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; @@ -353,7 +352,7 @@ public class SingleAbstractMethodUtils { } assert classifier instanceof JavaClass : "Classifier should be a class here: " + classifier; JavaClass javaClass = (JavaClass) classifier; - if (JavaSupertypeResolver.OBJECT_FQ_NAME.equals(javaClass.getFqName())) { + if (DescriptorResolverUtils.OBJECT_FQ_NAME.equals(javaClass.getFqName())) { return true; } for (JavaMethod method : javaClass.getMethods()) {