From d0d3d7b2716fd4737df567e0d78ea9cb070befec Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 23 Sep 2011 17:11:45 +0200
Subject: [PATCH] decouple PsiAnnotationImpl from AnnotationUtil

---
 .../daemon/impl/analysis/AnnotationsHighlightUtil.java         | 3 +--
 .../intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java  | 3 +--
 java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java  | 1 -
 java/openapi/src/com/intellij/psi/CommonClassNames.java        | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
index b1fadafc53b6..564ecfc146c0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.codeInsight.daemon.impl.analysis;
 
-import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.daemon.JavaErrorMessages;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
@@ -312,7 +311,7 @@ public class AnnotationsHighlightUtil {
     if (nameRef == null) return null;
     PsiElement resolved = nameRef.resolve();
     if (!(resolved instanceof PsiClass) ||
-        !AnnotationUtil.TARGET_ANNOTATION_FQ_NAME.equals(((PsiClass) resolved).getQualifiedName())) return null;
+        !CommonClassNames.TARGET_ANNOTATION_FQ_NAME.equals(((PsiClass) resolved).getQualifiedName())) return null;
 
     PsiNameValuePair[] attributes = annotation.getParameterList().getAttributes();
     if (attributes.length < 1) return null;
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java
index 6b4b45d983a3..a89a4aebc903 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.psi.impl.source.tree.java;
 
-import com.intellij.codeInsight.AnnotationUtil;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -151,7 +150,7 @@ public class PsiAnnotationImpl extends JavaStubPsiElement<PsiAnnotationStub> imp
       return !strict;
     }
     PsiClass annotationType = (PsiClass)resolved;
-    PsiAnnotation target = annotationType.getModifierList().findAnnotation(AnnotationUtil.TARGET_ANNOTATION_FQ_NAME);
+    PsiAnnotation target = annotationType.getModifierList().findAnnotation(CommonClassNames.TARGET_ANNOTATION_FQ_NAME);
     if (target == null) {
       //todo hack: ambiguity in spec
       return !strict;
diff --git a/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java b/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
index cac457cd295e..395a559b8af1 100644
--- a/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
+++ b/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
@@ -67,7 +67,6 @@ public class AnnotationUtil {
   @NonNls private static final String[] SIMPLE_NAMES =
     {NOT_NULL_SIMPLE_NAME, NULLABLE_SIMPLE_NAME, NON_NLS_SIMPLE_NAME, PROPERTY_KEY_SIMPLE_NAME, TEST_ONLY_SIMPLE_NAME,
       "Language", "Identifier", "Pattern", "PrintFormat", "RegExp", "Subst"};
-  public static final String TARGET_ANNOTATION_FQ_NAME = "java.lang.annotation.Target";
 
   static {
     ALL_ANNOTATIONS = new HashSet<String>(2);
diff --git a/java/openapi/src/com/intellij/psi/CommonClassNames.java b/java/openapi/src/com/intellij/psi/CommonClassNames.java
index 3d259163c3b8..4fb3775d9b16 100644
--- a/java/openapi/src/com/intellij/psi/CommonClassNames.java
+++ b/java/openapi/src/com/intellij/psi/CommonClassNames.java
@@ -84,4 +84,5 @@ public interface CommonClassNames {
   @NonNls String JAVA_UTIL_ARRAY_LIST = "java.util.ArrayList";
 
   @NonNls String JAVA_LANG_INVOKE_MH_POLYMORPHIC = "java.lang.invoke.MethodHandle.PolymorphicSignature";
+  String TARGET_ANNOTATION_FQ_NAME = "java.lang.annotation.Target";
 }