azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBJECT_FQ_NAME moved to DescriptorResolverUtils

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-05 09:47:14 +01:00
committed by Alexander Udalov
parent ab3b8d63df
commit 6aca05023a
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.Visibilities; 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.*;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaTypeSubstitutorImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaTypeSubstitutorImpl;
@@ -234,7 +234,7 @@ class PropagationHeuristics {
return !method.isConstructor() && return !method.isConstructor() &&
!method.isStatic() && !method.isStatic() &&
method.getVisibility() != Visibilities.PRIVATE && method.getVisibility() != Visibilities.PRIVATE &&
!JavaSupertypeResolver.OBJECT_FQ_NAME.equals(method.getContainingClass().getFqName()); !DescriptorResolverUtils.OBJECT_FQ_NAME.equals(method.getContainingClass().getFqName());
} }
} }
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+2 -2
View File
@@ -136,11 +136,11 @@ class LazyJavaClassDescriptor(
private val _supertypes = c.storageManager.createLazyValue<Collection<JetType>> { private val _supertypes = c.storageManager.createLazyValue<Collection<JetType>> {
val supertypes = jClass.getSupertypes() val supertypes = jClass.getSupertypes()
if (supertypes.isEmpty()) if (supertypes.isEmpty())
if (jClass.getFqName() == JavaSupertypeResolver.OBJECT_FQ_NAME) { if (jClass.getFqName() == DescriptorResolverUtils.OBJECT_FQ_NAME) {
listOf(KotlinBuiltIns.getInstance().getAnyType()) listOf(KotlinBuiltIns.getInstance().getAnyType())
} }
else { 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 // If java.lang.Object is not found, we simply use Any to recover
listOf(jlObject ?: KotlinBuiltIns.getInstance().getAnyType()) listOf(jlObject ?: KotlinBuiltIns.getInstance().getAnyType())
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
+2
View File
@@ -40,6 +40,8 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqNameSafe;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClassObject; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClassObject;
public final class DescriptorResolverUtils { public final class DescriptorResolverUtils {
public static final FqName OBJECT_FQ_NAME = new FqName("java.lang.Object");
private DescriptorResolverUtils() { private DescriptorResolverUtils() {
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java
-1
View File
@@ -35,7 +35,6 @@ import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES; import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.IGNORE_KOTLIN_SOURCES;
public final class JavaSupertypeResolver { public final class JavaSupertypeResolver {
public static final FqName OBJECT_FQ_NAME = new FqName("java.lang.Object");
private JavaTypeTransformer typeTransformer; private JavaTypeTransformer typeTransformer;
private JavaClassResolver classResolver; private JavaClassResolver classResolver;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java
+1 -2
View File
@@ -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.SamAdapterDescriptor;
import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor; 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.DescriptorResolverUtils;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypeResolver;
import org.jetbrains.jet.lang.resolve.java.structure.*; import org.jetbrains.jet.lang.resolve.java.structure.*;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name; 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; assert classifier instanceof JavaClass : "Classifier should be a class here: " + classifier;
JavaClass javaClass = (JavaClass) classifier; JavaClass javaClass = (JavaClass) classifier;
if (JavaSupertypeResolver.OBJECT_FQ_NAME.equals(javaClass.getFqName())) { if (DescriptorResolverUtils.OBJECT_FQ_NAME.equals(javaClass.getFqName())) {
return true; return true;
} }
for (JavaMethod method : javaClass.getMethods()) { for (JavaMethod method : javaClass.getMethods()) {