From b32bd182fb6b66b08a4b36288ec7c06f248d4044 Mon Sep 17 00:00:00 2001
From: "sergey.vasiliev" <sergey.vasiliev@jetbrains.com>
Date: Tue, 3 Nov 2009 01:07:45 +0300
Subject: [PATCH] jsr-299 + 330

---
 .../src/com/intellij/codeInsight/AnnotationUtil.java  |  6 +++---
 .../src/com/intellij/psi/AliasingPsiTarget.java       | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java b/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
index 8f072750f153..7e731b1e8fac 100644
--- a/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
+++ b/java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
@@ -128,9 +128,9 @@ public class AnnotationUtil {
   }
 
   @NotNull
-  public static PsiAnnotation[] findAnnotations(final PsiMember psiMember, @NotNull Collection<String> annotationNames) {
-    if (psiMember == null) return PsiAnnotation.EMPTY_ARRAY;
-    final PsiModifierList modifierList = psiMember.getModifierList();
+  public static PsiAnnotation[] findAnnotations(final PsiModifierListOwner modifierListOwner, @NotNull Collection<String> annotationNames) {
+    if (modifierListOwner == null) return PsiAnnotation.EMPTY_ARRAY;
+    final PsiModifierList modifierList = modifierListOwner.getModifierList();
     if (modifierList == null) return PsiAnnotation.EMPTY_ARRAY;
     final PsiAnnotation[] annotations = modifierList.getAnnotations();
     ArrayList<PsiAnnotation> result = null;
diff --git a/platform/lang-api/src/com/intellij/psi/AliasingPsiTarget.java b/platform/lang-api/src/com/intellij/psi/AliasingPsiTarget.java
index 930e4d929ad3..35e2b9a646a6 100644
--- a/platform/lang-api/src/com/intellij/psi/AliasingPsiTarget.java
+++ b/platform/lang-api/src/com/intellij/psi/AliasingPsiTarget.java
@@ -33,13 +33,13 @@ public class AliasingPsiTarget extends DelegatePsiTarget implements PomRenameabl
     return setAliasName(newName);
   }
 
-  @NotNull
+   @NotNull
   public String getName() {
     return StringUtil.notNullize(getNameAlias(((PsiNamedElement)getNavigationElement()).getName()));
   }
 
-  @Nullable
-  public AliasingPsiTarget setAliasName(@Nullable String newAliasName) {
+  @NotNull
+  public AliasingPsiTarget setAliasName(@NotNull String newAliasName) {
     return this;
   }
 
@@ -48,4 +48,9 @@ public class AliasingPsiTarget extends DelegatePsiTarget implements PomRenameabl
     return delegatePsiTargetName;
   }
 
+  protected void renameTargets(@NotNull String newDelegateName) {
+    if (!newDelegateName.equals(((PsiNamedElement)getNavigationElement()).getName())) {
+      ((PsiNamedElement)getNavigationElement()).setName(newDelegateName);
+    }
+  }
 }
\ No newline at end of file