diff --git a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java index 80fbb04e60f7..d67dec73361f 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java @@ -62,7 +62,6 @@ public class AnnotationUtil { @NonNls public static final String TEST_ONLY_SIMPLE_NAME = "TestOnly"; public static final String LANGUAGE = "org.intellij.lang.annotations.Language"; - public static final String REFERENCE = "org.intellij.lang.annotations.Reference"; public static final Set ALL_ANNOTATIONS; diff --git a/platform/annotations/src/org/intellij/lang/annotations/Reference.java b/platform/annotations/src/org/intellij/lang/annotations/Reference.java deleted file mode 100644 index 6e9813c2204d..000000000000 --- a/platform/annotations/src/org/intellij/lang/annotations/Reference.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2006 Sascha Weinreuter - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.intellij.lang.annotations; - -import org.jetbrains.annotations.NonNls; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.*; - -@Retention(RetentionPolicy.CLASS) -@Target({ METHOD, FIELD, PARAMETER, LOCAL_VARIABLE, ANNOTATION_TYPE }) - -public @interface Reference { - @NonNls String value(); -} diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java index e0fbaf61fbc3..a45393313a21 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java @@ -246,11 +246,10 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo if (factory == null) { factory = JavaPsiFacade.getElementFactory(modifierListOwner.getProject()); } - String anno = Language.findLanguageByID(languageId) != null ? AnnotationUtil.LANGUAGE : AnnotationUtil.REFERENCE; - final PsiAnnotation annotation = factory.createAnnotationFromText("@" + anno + "(\"" + languageId + "\")", modifierListOwner); + final PsiAnnotation annotation = factory.createAnnotationFromText("@" + AnnotationUtil.LANGUAGE + "(\"" + languageId + "\")", modifierListOwner); final PsiModifierList list = modifierListOwner.getModifierList(); assert list != null; - final PsiAnnotation existingAnnotation = list.findAnnotation(anno); + final PsiAnnotation existingAnnotation = list.findAnnotation(AnnotationUtil.LANGUAGE); if (existingAnnotation != null) { existingAnnotation.replace(annotation); }