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

remove the unused MemberFilter

Browse Source
This commit is contained in:
peter
2012-01-05 20:38:47 +01:00
parent d3329c8512
commit 9abb4afbdf
1 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/structureView/impl/AddAllMembersProcessor.java
+11 -30
View File
@@ -32,26 +32,20 @@ public class AddAllMembersProcessor extends BaseScopeProcessor {
private final Collection<PsiElement> myAllMembers;
private final PsiClass myPsiClass;
private final Map<MethodSignature,PsiMethod> myMethodsBySignature = new HashMap<MethodSignature, PsiMethod>();
private final MemberFilter myFilter;
public AddAllMembersProcessor(Collection<PsiElement> allMembers, PsiClass psiClass) {
this(allMembers, psiClass, ALL_ACCESSIBLE);
}
public AddAllMembersProcessor(Collection<PsiElement> allMembers, PsiClass psiClass, MemberFilter filter) {
for (PsiElement psiElement : allMembers) {
if (psiElement instanceof PsiMethod) mapMethodBySignature((PsiMethod)psiElement);
}
myAllMembers = allMembers;
myPsiClass = psiClass;
myFilter = filter;
}
public boolean execute(PsiElement element, ResolveState state) {
PsiMember member = (PsiMember)element;
if (!isInteresting(element)) return true;
if (myPsiClass.isInterface() && isObjectMember(element)) return true;
if (!myAllMembers.contains(member) && myFilter.isVisible(member, myPsiClass)) {
if (!myAllMembers.contains(member) && isVisible(member, myPsiClass)) {
if (member instanceof PsiMethod) {
PsiMethod psiMethod = (PsiMethod)member;
if (shouldAdd(psiMethod)) {
@@ -109,30 +103,17 @@ public class AddAllMembersProcessor extends BaseScopeProcessor {
return method.hasModifierProperty(PsiModifier.STATIC);
}
public abstract static class MemberFilter {
public boolean isVisible(PsiMember element, PsiClass psiClass) {
return !isInheritedConstructor(element, psiClass) && PsiUtil.isAccessible(element, psiClass, null) && isVisible(element);
}
private static boolean isInheritedConstructor(PsiMember member, PsiClass psiClass) {
if (!(member instanceof PsiMethod))
return false;
PsiMethod method = (PsiMethod)member;
return method.isConstructor() && method.getContainingClass() != psiClass;
}
protected abstract boolean isVisible(PsiModifierListOwner member);
private boolean isVisible(PsiMember element, PsiClass psiClass) {
return !isInheritedConstructor(element, psiClass) && PsiUtil.isAccessible(element, psiClass, null);
}
public static final MemberFilter ALL_ACCESSIBLE = new MemberFilter() {
protected boolean isVisible(PsiModifierListOwner member) {
return true;
}
};
private static boolean isInheritedConstructor(PsiMember member, PsiClass psiClass) {
if (!(member instanceof PsiMethod))
return false;
PsiMethod method = (PsiMethod)member;
return method.isConstructor() && method.getContainingClass() != psiClass;
}
public static final MemberFilter PUBLIC_ONLY = new MemberFilter() {
protected boolean isVisible(PsiModifierListOwner member) {
return member.hasModifierProperty(PsiModifier.PUBLIC);
}
};
}