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

IDEA-CR-36771 followup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-09-07 13:59:52 +03:00
parent 00b9dc286b
commit f5a67b1469
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
+2 -8
View File
@@ -41,7 +41,6 @@ import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.concurrency.Promise;
import org.jetbrains.concurrency.Promises;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -53,7 +52,6 @@ import java.io.File;
import java.text.MessageFormat;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implements OccurenceNavigator {
private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.HierarchyBrowserBaseEx");
@@ -385,17 +383,13 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
selectLater(tree, Collections.singletonList(descriptor));
}
private void selectLater(@NotNull JTree tree, @NotNull List<? extends HierarchyNodeDescriptor> descriptors) {
Promise<List<TreePath>> selections = Promises.collectResults(
descriptors.stream()
.map(descriptor -> TreeUtil.promiseVisit(tree, visitor(descriptor)))
.collect(Collectors.toList()), true);
Promise<List<TreePath>> selections = TreeUtil.promiseSelect(tree, descriptors.stream().map(descriptor -> visitor(descriptor)));
selections.onProcessed(paths -> TreeUtil.selectPaths(tree, paths));
}
private void expandLater(@NotNull JTree tree, @NotNull HierarchyNodeDescriptor descriptor) {
TreeVisitor visitor = visitor(descriptor);
TreeUtil.visit(tree, visitor, path -> {
TreeUtil.promiseExpand(tree, visitor).onProcessed(path -> {
if (path != null) {
tree.expandPath(path);
}