azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constant for annotation class name

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-17 00:27:20 +04:00
parent 9d781640af
commit e01b0a3713
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+2 -1
View File
@@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.OverridingUtil;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; 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.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
@@ -92,7 +93,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
isAbstract = true; isAbstract = true;
isInterface = true; isInterface = true;
isAnnotation = true; isAnnotation = true;
signature.getInterfaces().add("java/lang/annotation/Annotation"); signature.getInterfaces().add(JdkNames.JLA_ANNOTATION.getInternalName());
} }
if (!jetClass.hasModifier(JetTokens.OPEN_KEYWORD) && !isAbstract) { if (!jetClass.hasModifier(JetTokens.OPEN_KEYWORD) && !isAbstract) {
isFinal = true; isFinal = true;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+1 -1
View File
@@ -899,7 +899,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
if (resolved != null && JvmStdlibNames.JET_OBJECT.getFqName().equalsTo(resolved.getQualifiedName())) { if (resolved != null && JvmStdlibNames.JET_OBJECT.getFqName().equalsTo(resolved.getQualifiedName())) {
continue; continue;
} }
if (resolved != null && annotation && resolved.getQualifiedName().equals("java.lang.annotation.Annotation")) { if (resolved != null && annotation && JdkNames.JLA_ANNOTATION.getFqName().equalsTo(resolved.getQualifiedName())) {
continue; continue;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java
+1
View File
@@ -23,5 +23,6 @@ public class JdkNames {
public static final JvmClassName JL_OBJECT = JvmClassName.byInternalName("java/lang/Object"); 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 JL_STRING = JvmClassName.byInternalName("java/lang/String");
public static final JvmClassName JLA_ANNOTATION = JvmClassName.byInternalName("java/lang/annotation/Annotation");
} }