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

Rename JavaResolverPsiUtils -> JavaResolverUtils

Browse Source
This commit is contained in:
Alexander Udalov
2014-11-11 14:50:11 +03:00
parent be08e33463
commit bb96a8e1fb
8 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java
+3 -3
View File
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils;
import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils;
import javax.swing.*;
@@ -148,11 +148,11 @@ public final class JetDescriptorIconProvider {
return true;
}
else if (declaration instanceof PsiClass) {
return JavaResolverPsiUtils.isCompiledKotlinClassOrPackageClass((PsiClass) declaration);
return JavaResolverUtils.isCompiledKotlinClassOrPackageClass((PsiClass) declaration);
}
else if (declaration instanceof PsiMember) {
PsiClass containingClass = ((PsiMember) declaration).getContainingClass();
return containingClass != null && JavaResolverPsiUtils.isCompiledKotlinClassOrPackageClass(containingClass);
return containingClass != null && JavaResolverUtils.isCompiledKotlinClassOrPackageClass(containingClass);
}
else {
return false;
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.descriptors.serialization.*;
import org.jetbrains.jet.lang.descriptors.ClassKind;
import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils;
import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils;
import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache;
import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass;
import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -138,7 +138,7 @@ public class JetFromJavaDescriptorHelper {
FqName classFQN = new FqName(qualifiedName);
if (JavaResolverPsiUtils.isCompiledKotlinPackageClass(containingClass)) {
if (JavaResolverUtils.isCompiledKotlinPackageClass(containingClass)) {
return classFQN.parent().child(Name.identifier(method.getName()));
}
}