From aabf57945474cd74ab2c49975d9bdbca6ddb04ab Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 8 Sep 2015 19:03:31 +0300 Subject: [PATCH] java.lang.annotation.Documented is now special meta annotation + a few unused fields dropped --- .../org/jetbrains/kotlin/load/java/JvmAnnotationNames.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java index 76e6728c97f..f62ec52cc78 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java @@ -41,12 +41,10 @@ public final class JvmAnnotationNames { public static final String DATA_FIELD_NAME = "data"; public static final Name DEFAULT_ANNOTATION_MEMBER_NAME = Name.identifier("value"); public static final Name TARGET_ANNOTATION_MEMBER_NAME = Name.identifier("allowedTargets"); - public static final Name RETENTION_ANNOTATION_PARAMETER_NAME = Name.identifier("retention"); - public static final Name REPEATABLE_ANNOTATION_PARAMETER_NAME = Name.identifier("repeatable"); - public static final Name DOCUMENTED_ANNOTATION_PARAMETER_NAME = Name.identifier("mustBeDocumented"); public static final FqName TARGET_ANNOTATION = new FqName("java.lang.annotation.Target"); public static final FqName RETENTION_ANNOTATION = new FqName("java.lang.annotation.Retention"); + public static final FqName DOCUMENTED_ANNOTATION = new FqName("java.lang.annotation.Documented"); public static final FqName JETBRAINS_NOT_NULL_ANNOTATION = new FqName("org.jetbrains.annotations.NotNull"); public static final FqName JETBRAINS_NULLABLE_ANNOTATION = new FqName("org.jetbrains.annotations.Nullable"); @@ -133,7 +131,7 @@ public final class JvmAnnotationNames { for (FqName fqName : Arrays.asList(JETBRAINS_NOT_NULL_ANNOTATION, JETBRAINS_NULLABLE_ANNOTATION)) { NULLABILITY_ANNOTATIONS.add(JvmClassName.byFqNameWithoutInnerClasses(fqName)); } - for (FqName fqName : Arrays.asList(TARGET_ANNOTATION, RETENTION_ANNOTATION)) { + for (FqName fqName : Arrays.asList(TARGET_ANNOTATION, RETENTION_ANNOTATION, DOCUMENTED_ANNOTATION)) { SPECIAL_META_ANNOTATIONS.add(JvmClassName.byFqNameWithoutInnerClasses(fqName)); } }