From f8d3f8480a2ab4a390536e92ee60f7631258f24f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 4 Mar 2014 19:23:27 +0400 Subject: [PATCH] Minor, use constants instead of hard-coded strings --- .../jet/plugin/caches/JetFromJavaDescriptorHelper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java index c5abd36ee52..a0e332cb3a8 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java @@ -37,6 +37,9 @@ import java.util.ArrayList; import java.util.Collection; 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. */ @@ -49,7 +52,7 @@ public class JetFromJavaDescriptorHelper { /* Will iterate through short name caches Kotlin packages from jar a class files will be collected from java cache 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 getCompiledClassesForTopLevelObjects(Project project, GlobalSearchScope scope) { Set jetObjectClasses = Sets.newHashSet(); - Collection classesByAnnotation = getClassesByAnnotation("KotlinClass", project, scope); + Collection classesByAnnotation = getClassesByAnnotation(KOTLIN_CLASS.shortName().asString(), project, scope); for (PsiClass psiClass : classesByAnnotation) { ClassKind kind = getCompiledClassKind(psiClass); @@ -166,7 +169,7 @@ public class JetFromJavaDescriptorHelper { boolean shouldBeExtension ) { Collection result = Sets.newHashSet(); - Collection packageClasses = getClassesByAnnotation("KotlinPackage", project, scope); + Collection packageClasses = getClassesByAnnotation(KOTLIN_PACKAGE.shortName().asString(), project, scope); for (PsiClass psiClass : packageClasses) { String qualifiedName = psiClass.getQualifiedName(); if (qualifiedName == null) {