diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java index 13995f871b6..ee56f4cc061 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java @@ -18,19 +18,24 @@ package org.jetbrains.jet.lang.resolve.java; import com.intellij.psi.PsiClass; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; +import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; +import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_CLASS; +import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_PACKAGE; + public class JavaResolverPsiUtils { private JavaResolverPsiUtils() { } public static boolean isCompiledKotlinClass(@NotNull PsiClass psiClass) { - return DescriptorResolverUtils.isCompiledKotlinClass(new JavaClassImpl(psiClass)); + JavaClass javaClass = new JavaClassImpl(psiClass); + return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_CLASS) != null; } public static boolean isCompiledKotlinPackageClass(@NotNull PsiClass psiClass) { - return DescriptorResolverUtils.isCompiledKotlinPackageClass(new JavaClassImpl(psiClass)); + JavaClass javaClass = new JavaClassImpl(psiClass); + return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_PACKAGE) != null; } public static boolean isCompiledKotlinClassOrPackageClass(@NotNull PsiClass psiClass) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index 400a87317d0..a56d795ebcc 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -34,23 +34,12 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_CLASS; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_PACKAGE; - public final class DescriptorResolverUtils { public static final FqName OBJECT_FQ_NAME = new FqName("java.lang.Object"); private DescriptorResolverUtils() { } - public static boolean isCompiledKotlinPackageClass(@NotNull JavaClass javaClass) { - return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_PACKAGE) != null; - } - - public static boolean isCompiledKotlinClass(@NotNull JavaClass javaClass) { - return javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED && javaClass.findAnnotation(KOTLIN_CLASS) != null; - } - @NotNull public static Collection resolveOverrides( @NotNull Name name,