From 641ed568f2a5bb6f27bdbf87a159101f8ab27fff Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 11 Nov 2013 13:16:01 +0400 Subject: [PATCH] Extract method --- .../java/resolver/JavaAnnotationResolver.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java index 4deced9d587..55be4353ed9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java @@ -105,11 +105,7 @@ public final class JavaAnnotationResolver { } // Don't process internal jet annotations and jetbrains NotNull annotations - if (fqName.asString().startsWith("jet.runtime.typeinfo.") - || fqName.equals(JETBRAINS_NOT_NULL_ANNOTATION) - || fqName.equals(JvmAnnotationNames.KOTLIN_CLASS) - || fqName.equals(JvmAnnotationNames.KOTLIN_PACKAGE) - ) { + if (isSpecialAnnotation(fqName)) { return null; } @@ -146,6 +142,13 @@ public final class JavaAnnotationResolver { return annotation; } + public static boolean isSpecialAnnotation(@NotNull FqName fqName) { + return fqName.asString().startsWith("jet.runtime.typeinfo.") + || fqName.equals(JETBRAINS_NOT_NULL_ANNOTATION) + || fqName.equals(JvmAnnotationNames.KOTLIN_CLASS) + || fqName.equals(JvmAnnotationNames.KOTLIN_PACKAGE); + } + @Nullable public JavaAnnotation findAnnotationWithExternal(@NotNull JavaAnnotationOwner owner, @NotNull FqName name) { JavaAnnotation annotation = owner.findAnnotation(name);