scope: test no compacting

This commit is contained in:
anna
2011-08-15 12:41:34 +04:00
parent 8f0e156a36
commit 66e7f4803f
2 changed files with 4 additions and 4 deletions
@@ -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() {
@@ -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;
}