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

@Nullables

Browse Source
This commit is contained in:
Dmitry Avdeev
2014-09-26 17:43:56 +04:00
parent 9a259efff1
commit 993868da0e
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java
+1
View File
@@ -72,6 +72,7 @@ public class TreeClassChooserFactoryImpl extends TreeClassChooserFactory {
PsiClass base,
boolean acceptsSelf,
boolean acceptInner,
@Nullable
Condition<? super PsiClass> additionalCondition) {
ClassFilter classFilter = new TreeJavaClassChooserDialog.InheritanceJavaClassFilterImpl(base, acceptsSelf, acceptInner, additionalCondition);
return new TreeJavaClassChooserDialog(title, myProject, scope, classFilter, base, null, false);
java/java-impl/src/com/intellij/ide/util/TreeJavaClassChooserDialog.java
+11 -9
View File
@@ -63,15 +63,6 @@ public class TreeJavaClassChooserDialog extends AbstractTreeClassChooserDialog<P
super(title, project, scope, PsiClass.class, createFilter(classFilter), baseClass, initialClass, isShowMembers, true);
}
@Override
@Nullable
protected PsiClass getSelectedFromTreeUserObject(DefaultMutableTreeNode node) {
Object userObject = node.getUserObject();
if (!(userObject instanceof ClassTreeNode)) return null;
ClassTreeNode descriptor = (ClassTreeNode)userObject;
return descriptor.getPsiClass();
}
public static TreeJavaClassChooserDialog withInnerClasses(String title,
@NotNull Project project,
GlobalSearchScope scope,
@@ -100,6 +91,15 @@ public class TreeJavaClassChooserDialog extends AbstractTreeClassChooserDialog<P
}
}
@Override
@Nullable
protected PsiClass getSelectedFromTreeUserObject(DefaultMutableTreeNode node) {
Object userObject = node.getUserObject();
if (!(userObject instanceof ClassTreeNode)) return null;
ClassTreeNode descriptor = (ClassTreeNode)userObject;
return descriptor.getPsiClass();
}
@NotNull
protected List<PsiClass> getClassesByName(final String name,
final boolean checkBoxState,
@@ -146,11 +146,13 @@ public class TreeJavaClassChooserDialog extends AbstractTreeClassChooserDialog<P
private final PsiClass myBase;
private final boolean myAcceptsSelf;
private final boolean myAcceptsInner;
@NotNull
private final Condition<? super PsiClass> myAdditionalCondition;
public InheritanceJavaClassFilterImpl(PsiClass base,
boolean acceptsSelf,
boolean acceptInner,
@Nullable
Condition<? super PsiClass> additionalCondition) {
myAcceptsSelf = acceptsSelf;
myAcceptsInner = acceptInner;
java/openapi/src/com/intellij/ide/util/TreeClassChooserFactory.java
+1
View File
@@ -68,6 +68,7 @@ public abstract class TreeClassChooserFactory {
PsiClass base,
boolean acceptsSelf,
boolean acceptInner,
@Nullable
Condition<? super PsiClass> additionalCondition);
@NotNull