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
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java
+1 -1
View File
@@ -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) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java
+1 -1
View File
@@ -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);
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.java
+2 -2
View File
@@ -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);
}
}