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

Methods renamed to avoid ambiguity

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-07 00:42:34 +04:00
parent 5fcf9ca448
commit 8fcaf511dc
9 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+1 -1
View File
@@ -187,7 +187,7 @@ public final class JavaClassResolver {
private ClassDescriptor doResolveClass(@NotNull FqName qualifiedName, @NotNull PostponedTasks tasks) {
//TODO: correct scope
KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.find(qualifiedName);
KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.findKotlinClass(qualifiedName);
if (kotlinClass != null) {
ClassDescriptor deserializedDescriptor = deserializedDescriptorResolver.resolveClass(kotlinClass);
if (deserializedDescriptor != null) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java
+1 -1
View File
@@ -144,7 +144,7 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen
JavaPackage javaPackage = javaClassFinder.findPackage(fqName);
if (javaPackage != null) {
FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(fqName);
KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.find(packageClassFqName);
KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.findKotlinClass(packageClassFqName);
if (kotlinClass != null) {
JetScope kotlinPackageScope = deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinClass);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java
+5 -4
View File
@@ -112,10 +112,11 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
@Nullable
private KotlinJvmBinaryClass findKotlinClassByDescriptor(@NotNull ClassOrNamespaceDescriptor descriptor) {
if (descriptor instanceof ClassDescriptor) {
return kotlinClassFinder.find(kotlinFqNameToJavaFqName(naiveKotlinFqName((ClassDescriptor) descriptor)));
return kotlinClassFinder.findKotlinClass(kotlinFqNameToJavaFqName(naiveKotlinFqName((ClassDescriptor) descriptor)));
}
else if (descriptor instanceof PackageFragmentDescriptor) {
return kotlinClassFinder.find(PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) descriptor).getFqName()));
return kotlinClassFinder.findKotlinClass(
PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) descriptor).getFqName()));
}
else {
throw new IllegalStateException("Unrecognized descriptor: " + descriptor);
@@ -266,7 +267,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
if (proto.hasExtension(JavaProtoBuf.implClassName)) {
Name tImplName = nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName));
return kotlinClassFinder.find(containingPackage.getFqName().child(tImplName));
return kotlinClassFinder.findKotlinClass(containingPackage.getFqName().child(tImplName));
}
return null;
}
@@ -283,7 +284,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer
if (proto.hasExtension(JavaProtoBuf.implClassName)) {
Name name = nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName));
FqName fqName = PackageClassUtils.getPackageClassFqName(container.getFqName()).parent().child(name);
return kotlinClassFinder.find(fqName);
return kotlinClassFinder.findKotlinClass(fqName);
}
return null;
}
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java
+1 -1
View File
@@ -22,5 +22,5 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
public interface KotlinClassFinder {
@Nullable
KotlinJvmBinaryClass find(@NotNull FqName fqName);
KotlinJvmBinaryClass findKotlinClass(@NotNull FqName fqName);
}