From 852b7e19cc39ea39e00a0250075b6a13b6e90036 Mon Sep 17 00:00:00 2001 From: Alex Tkachman Date: Sun, 23 Sep 2012 14:53:30 +0200 Subject: [PATCH] constant for annotation-less case introduced --- .../jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java index 109e8f34d13..09bbbdff2ae 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java @@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; * @since 6/1/12 */ public class KotlinSignatureAnnotation extends PsiAnnotationWrapper { + public static final KotlinSignatureAnnotation NULL_ANNOTATION = new KotlinSignatureAnnotation(null); private String signature; public KotlinSignatureAnnotation(@Nullable PsiAnnotation psiAnnotation) { @@ -47,6 +48,8 @@ public class KotlinSignatureAnnotation extends PsiAnnotationWrapper { @NotNull public static KotlinSignatureAnnotation get(PsiMethod psiMethod) { - return new KotlinSignatureAnnotation(JavaDescriptorResolver.findAnnotation(psiMethod, JvmStdlibNames.KOTLIN_SIGNATURE.getFqName().getFqName())); + final PsiAnnotation annotation = + JavaDescriptorResolver.findAnnotation(psiMethod, JvmStdlibNames.KOTLIN_SIGNATURE.getFqName().getFqName()); + return annotation != null ? new KotlinSignatureAnnotation(annotation) : NULL_ANNOTATION; } }