From 8fcaf511dc925ceb5d51222ad77cbbee3fb6c2dd Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 7 Jan 2014 00:42:34 +0400 Subject: [PATCH] Methods renamed to avoid ambiguity --- .../jet/cli/jvm/compiler/CliVirtualFileFinder.java | 2 +- .../jet/lang/resolve/kotlin/VirtualFileFinder.java | 2 +- .../resolve/kotlin/VirtualFileKotlinClassFinder.java | 4 ++-- .../lang/resolve/java/resolver/JavaClassResolver.java | 2 +- .../java/resolver/JavaPackageFragmentProviderImpl.java | 2 +- .../resolve/kotlin/AnnotationDescriptorDeserializer.java | 9 +++++---- .../jet/lang/resolve/kotlin/KotlinClassFinder.java | 2 +- .../jet/plugin/libraries/DecompiledNavigationUtils.java | 2 +- .../jet/plugin/vfilefinder/IDEVirtualFileFinder.java | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java index 14769a89378..4ba102ac3fb 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java @@ -35,7 +35,7 @@ public class CliVirtualFileFinder implements VirtualFileFinder { @Nullable @Override - public VirtualFile find(@NotNull FqName className) { + public VirtualFile findVirtualFile(@NotNull FqName className) { for (VirtualFile root : classPath) { VirtualFile fileInRoot = findFileInRoot(className.asString(), root); if (fileInRoot != null) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java index 9217ed2338c..96765ffb32b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java @@ -24,5 +24,5 @@ import org.jetbrains.jet.lang.resolve.name.FqName; public interface VirtualFileFinder { // TODO: support scope @Nullable - VirtualFile find(@NotNull FqName className); + VirtualFile findVirtualFile(@NotNull FqName className); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.java index 43ae75ffb11..eece2534f99 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.java @@ -33,8 +33,8 @@ public class VirtualFileKotlinClassFinder implements KotlinClassFinder { @Nullable @Override - public KotlinJvmBinaryClass find(@NotNull FqName fqName) { - VirtualFile file = virtualFileFinder.find(fqName); + public KotlinJvmBinaryClass findKotlinClass(@NotNull FqName fqName) { + VirtualFile file = virtualFileFinder.findVirtualFile(fqName); return file == null ? null : new VirtualFileKotlinClass(file); } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index be5552ac746..629bb9f74f5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -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) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java index da790f12269..cebd6a74b3a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java @@ -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); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java index 9088b36da3f..498dff928d4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorDeserializer.java @@ -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; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java index e7a95e556dc..a243bd383e3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.java @@ -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); } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java index f3473c96a5d..7dd2f59a82b 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java @@ -101,7 +101,7 @@ public final class DecompiledNavigationUtils { return null; } VirtualFileFinder fileFinder = ServiceManager.getService(project, VirtualFileFinder.class); - VirtualFile virtualFile = fileFinder.find(containerFqName); + VirtualFile virtualFile = fileFinder.findVirtualFile(containerFqName); if (virtualFile == null) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java b/idea/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java index cf044fd172a..05b58db01fa 100644 --- a/idea/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java +++ b/idea/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java @@ -40,7 +40,7 @@ public final class IDEVirtualFileFinder implements VirtualFileFinder { @Nullable @Override - public VirtualFile find(@NotNull FqName className) { + public VirtualFile findVirtualFile(@NotNull FqName className) { Collection files = FileBasedIndex.getInstance().getContainingFiles(KotlinClassFileIndex.KEY, className, GlobalSearchScope.allScope(project)); if (files.isEmpty()) {