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

vcs: optimize local changes refresh - optimize path chain collapsing

Browse Source 
* the main problem was `collapseDirectories(model, parent)` call,
  that forced same nodes to be processed multiple times
This commit is contained in:
Aleksey Pivovarov
2017-09-26 19:48:31 +03:00
parent 507dc11b8b
commit 81ba98f6e3
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java
+19 -16
View File
@@ -356,23 +356,26 @@ public class TreeModelBuilder {
}
private static void collapseDirectories(@NotNull DefaultTreeModel model, @NotNull ChangesBrowserNode node) {
if (node.getUserObject() instanceof FilePath && node.getChildCount() == 1) {
final ChangesBrowserNode child = (ChangesBrowserNode)node.getChildAt(0);
if (child.getUserObject() instanceof FilePath && !child.isLeaf()) {
ChangesBrowserNode parent = (ChangesBrowserNode)node.getParent();
final int idx = parent.getIndex(node);
model.removeNodeFromParent(node);
model.removeNodeFromParent(child);
model.insertNodeInto(child, parent, idx);
collapseDirectories(model, parent);
}
ChangesBrowserNode collapsedNode = node;
while (collapsedNode.getUserObject() instanceof FilePath && collapsedNode.getChildCount() == 1) {
ChangesBrowserNode child = (ChangesBrowserNode)collapsedNode.getChildAt(0);
if (!(child.getUserObject() instanceof FilePath) || child.isLeaf()) break;
collapsedNode = child;
}
else {
final Enumeration children = node.children();
while (children.hasMoreElements()) {
ChangesBrowserNode child = (ChangesBrowserNode)children.nextElement();
collapseDirectories(model, child);
}
if (collapsedNode != node) {
ChangesBrowserNode parent = (ChangesBrowserNode)node.getParent();
final int idx = parent.getIndex(node);
model.removeNodeFromParent(node);
model.insertNodeInto(collapsedNode, parent, idx);
node = collapsedNode;
}
final Enumeration children = node.children();
while (children.hasMoreElements()) {
ChangesBrowserNode child = (ChangesBrowserNode)children.nextElement();
collapseDirectories(model, child);
}
}