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

Minor, use constants instead of hard-coded strings

Browse Source
This commit is contained in:
Alexander Udalov
2014-03-04 19:23:27 +04:00
parent 36bc7580aa
commit f8d3f8480a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
+6 -3
View File
@@ -37,6 +37,9 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Set; import java.util.Set;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_CLASS;
import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_PACKAGE;
/** /**
* Number of helper methods for searching kotlin element prototypes in java. Methods use java indices for search. * Number of helper methods for searching kotlin element prototypes in java. Methods use java indices for search.
*/ */
@@ -49,7 +52,7 @@ public class JetFromJavaDescriptorHelper {
/* Will iterate through short name caches /* Will iterate through short name caches
Kotlin packages from jar a class files will be collected from java cache Kotlin packages from jar a class files will be collected from java cache
Kotlin package classes from sources will be collected with JetShortNamesCache.getClassesByName */ Kotlin package classes from sources will be collected with JetShortNamesCache.getClassesByName */
return getClassesByAnnotation("KotlinPackage", project, scope); return getClassesByAnnotation(KOTLIN_PACKAGE.shortName().asString(), project, scope);
} }
/** /**
@@ -72,7 +75,7 @@ public class JetFromJavaDescriptorHelper {
static Collection<PsiClass> getCompiledClassesForTopLevelObjects(Project project, GlobalSearchScope scope) { static Collection<PsiClass> getCompiledClassesForTopLevelObjects(Project project, GlobalSearchScope scope) {
Set<PsiClass> jetObjectClasses = Sets.newHashSet(); Set<PsiClass> jetObjectClasses = Sets.newHashSet();
Collection<PsiClass> classesByAnnotation = getClassesByAnnotation("KotlinClass", project, scope); Collection<PsiClass> classesByAnnotation = getClassesByAnnotation(KOTLIN_CLASS.shortName().asString(), project, scope);
for (PsiClass psiClass : classesByAnnotation) { for (PsiClass psiClass : classesByAnnotation) {
ClassKind kind = getCompiledClassKind(psiClass); ClassKind kind = getCompiledClassKind(psiClass);
@@ -166,7 +169,7 @@ public class JetFromJavaDescriptorHelper {
boolean shouldBeExtension boolean shouldBeExtension
) { ) {
Collection<FqName> result = Sets.newHashSet(); Collection<FqName> result = Sets.newHashSet();
Collection<PsiClass> packageClasses = getClassesByAnnotation("KotlinPackage", project, scope); Collection<PsiClass> packageClasses = getClassesByAnnotation(KOTLIN_PACKAGE.shortName().asString(), project, scope);
for (PsiClass psiClass : packageClasses) { for (PsiClass psiClass : packageClasses) {
String qualifiedName = psiClass.getQualifiedName(); String qualifiedName = psiClass.getQualifiedName();
if (qualifiedName == null) { if (qualifiedName == null) {