SOEs in other Cls places

This commit is contained in:
peter
2010-06-23 18:57:37 +04:00
parent 98a413e8a8
commit 33d58a0265
2 changed files with 2 additions and 2 deletions
@@ -494,7 +494,7 @@ public class ClsClassImpl extends ClsRepositoryPsiElement<PsiClassStub<?>> imple
@NotNull
public PsiElement getNavigationElement() {
PsiClass aClass = getSourceMirrorClass();
return aClass != null ? aClass.getNavigationElement() : this;
return aClass != null && aClass != this ? aClass.getNavigationElement() : this;
}
public ItemPresentation getPresentation() {
@@ -228,7 +228,7 @@ public class ClsFieldImpl extends ClsRepositoryPsiElement<PsiFieldStub> implemen
public PsiElement getNavigationElement() {
PsiClass sourceClassMirror = ((ClsClassImpl)getParent()).getSourceMirrorClass();
PsiElement sourceFieldMirror = sourceClassMirror != null ? sourceClassMirror.findFieldByName(getName(), false) : null;
return sourceFieldMirror != null ? sourceFieldMirror.getNavigationElement() : this;
return sourceFieldMirror != null && sourceFieldMirror != this ? sourceFieldMirror.getNavigationElement() : this;
}
public ItemPresentation getPresentation() {