From e01b0a37136bf0d5a6f2dcf993f80930dd910d9a Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sun, 17 Jun 2012 00:27:20 +0400 Subject: [PATCH] constant for annotation class name --- .../org/jetbrains/jet/codegen/ImplementationBodyCodegen.java | 3 ++- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 2 +- .../src/org/jetbrains/jet/lang/resolve/java/JdkNames.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index a7167d14f42..729d1174f61 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; +import org.jetbrains.jet.lang.resolve.java.JdkNames; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; @@ -92,7 +93,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { isAbstract = true; isInterface = true; isAnnotation = true; - signature.getInterfaces().add("java/lang/annotation/Annotation"); + signature.getInterfaces().add(JdkNames.JLA_ANNOTATION.getInternalName()); } if (!jetClass.hasModifier(JetTokens.OPEN_KEYWORD) && !isAbstract) { isFinal = true; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 770b216df53..1f311550599 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -899,7 +899,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes if (resolved != null && JvmStdlibNames.JET_OBJECT.getFqName().equalsTo(resolved.getQualifiedName())) { continue; } - if (resolved != null && annotation && resolved.getQualifiedName().equals("java.lang.annotation.Annotation")) { + if (resolved != null && annotation && JdkNames.JLA_ANNOTATION.getFqName().equalsTo(resolved.getQualifiedName())) { continue; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java index 759a6bad9dc..352658c8d37 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java @@ -23,5 +23,6 @@ public class JdkNames { public static final JvmClassName JL_OBJECT = JvmClassName.byInternalName("java/lang/Object"); public static final JvmClassName JL_STRING = JvmClassName.byInternalName("java/lang/String"); + public static final JvmClassName JLA_ANNOTATION = JvmClassName.byInternalName("java/lang/annotation/Annotation"); }