mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
scope: test no compacting
This commit is contained in:
@@ -400,9 +400,9 @@ public class ScopeTreeViewPanel extends JPanel implements Disposable {
|
||||
|
||||
private void reload(@Nullable final DefaultMutableTreeNode rootToReload) {
|
||||
final DefaultTreeModel treeModel = (DefaultTreeModel)myTree.getModel();
|
||||
if (rootToReload != null) {
|
||||
if (rootToReload != null && rootToReload != treeModel.getRoot()) {
|
||||
final List<TreePath> treePaths = TreeUtil.collectExpandedPaths(myTree, new TreePath(rootToReload.getPath()));
|
||||
((DefaultTreeModel)myTree.getModel()).reload(rootToReload);
|
||||
treeModel.reload(rootToReload);
|
||||
final TreePath path = new TreePath(rootToReload.getPath());
|
||||
final boolean wasCollapsed = myTree.isCollapsed(path);
|
||||
final Runnable runnable = new Runnable() {
|
||||
|
||||
+2
-2
@@ -325,7 +325,7 @@ public class FileTreeModelBuilder {
|
||||
((DirectoryNode)node).setCompactedDirNode((DirectoryNode)treeNode);
|
||||
}
|
||||
}
|
||||
return parentNode;
|
||||
return parentNode != null ? parentNode : myRoot;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@@ -389,7 +389,7 @@ public class FileTreeModelBuilder {
|
||||
if (!isMarked[0]) return null;
|
||||
|
||||
getModuleDirNode(vFile, myFileIndex.getModuleForFile(vFile), null);
|
||||
return rootToReload;
|
||||
return rootToReload != null ? rootToReload : myRoot;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user