MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

jsr-299 + 330

Browse Source
This commit is contained in:
sergey.vasiliev
2009-11-03 01:07:45 +03:00
parent ec0d030571
commit b32bd182fb
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/codeInsight/AnnotationUtil.java
+3 -3
View File
@@ -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;
platform/lang-api/src/com/intellij/psi/AliasingPsiTarget.java
+8 -3
View File
@@ -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);
}
}
}