From 2191073761e5cd61d8eaf65191071737c6b1010b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 19 Aug 2013 16:45:47 +0400 Subject: [PATCH] Minor, remove useless method --- .../resolve/java/DescriptorResolverUtils.java | 4 ++-- .../java/resolver/JavaClassResolver.java | 2 +- .../lang/resolve/java/structure/JavaClass.java | 17 ++++------------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java index 7d1a753d6dd..d7e5e67a60b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java @@ -38,7 +38,7 @@ public final class DescriptorResolverUtils { if (javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED) { FqName fqName = javaClass.getFqName(); if (fqName != null && PackageClassUtils.isPackageClassFqName(fqName)) { - return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_PACKAGE.getFqName().asString()) != null; + return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_PACKAGE.getFqName()) != null; } } return false; @@ -46,7 +46,7 @@ public final class DescriptorResolverUtils { public static boolean isCompiledKotlinClass(@NotNull JavaClass javaClass) { if (javaClass.getOriginKind() == JavaClass.OriginKind.COMPILED) { - return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_CLASS.getFqName().asString()) != null; + return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_CLASS.getFqName()) != null; } return false; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index e343f8aba6e..c264f3ebb87 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -216,7 +216,7 @@ public final class JavaClassResolver { } if (KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.equals(qualifiedName.parent())) { - if (javaClass.findAnnotation(JvmAnnotationNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName().asString()) != null) { + if (javaClass.findAnnotation(JvmAnnotationNames.ASSERT_INVISIBLE_IN_RESOLVER.getFqName()) != null) { if (ApplicationManager.getApplication().isInternal()) { LOG.error("classpath is configured incorrectly:" + " class " + qualifiedName + " from runtime must not be loaded by compiler"); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java index b56aac53879..f9fbeb132ef 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java @@ -16,7 +16,10 @@ package org.jetbrains.jet.lang.resolve.java.structure; -import com.intellij.psi.*; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiCompiledElement; +import com.intellij.psi.PsiTypeParameter; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,18 +59,6 @@ public class JavaClass extends JavaClassifierImpl return qualifiedName == null ? null : new FqName(qualifiedName); } - @Nullable - public JavaAnnotation findAnnotation(@NotNull String fqName) { - PsiModifierList modifierList = getPsi().getModifierList(); - if (modifierList != null) { - PsiAnnotation annotation = modifierList.findAnnotation(fqName); - if (annotation != null) { - return new JavaAnnotationImpl(annotation); - } - } - return null; - } - @NotNull @Override public Name getName() {