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

remove empty containers

Browse Source
This commit is contained in:
Konstantin Bulenkov
2011-09-02 19:09:26 +02:00
parent ad866b892c
commit bdcdbe9308
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+27 -8
View File
@@ -478,9 +478,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
element.updateTargetFromSource(source);
fireTableRowsUpdated(row, row);
} else {
element.getParentNode().remove(node);
myElements.remove(row);
fireTableRowsDeleted(row, row);
removeElement(element);
}
}
} finally {
@@ -505,9 +503,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
element.updateSourceFromTarget(target);
fireTableRowsUpdated(row, row);
} else {
element.getParentNode().remove(node);
myElements.remove(row);
fireTableRowsDeleted(row, row);
removeElement(element);
}
}
} finally {
@@ -516,13 +512,36 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
}
}
private void removeElement(DirDiffElement element) {
int row = myElements.indexOf(element);
if (row != -1) {
final DTree node = element.getNode();
final DTree parentNode = element.getParentNode();
parentNode.remove(node);
myElements.remove(row);
int start = row;
if (row == myElements.size() && myElements.get(row - 1).isSeparator()) {
final DirDiffElement el = myElements.get(row - 1);
el.getParentNode().remove(el.getNode());
myElements.remove(row - 1);
start = row - 1;
} else if (myElements.get(row).isSeparator() && row > 0 && myElements.get(row - 1).isSeparator()) {
final DirDiffElement el = myElements.get(row - 1);
el.getParentNode().remove(el.getNode());
myElements.remove(row - 1);
start = row - 1;
}
fireTableRowsDeleted(start, row);
}
}
public void performDelete(DirDiffElement element) {
final DiffElement source = element.getSource();
final DiffElement target = element.getTarget();
final int index = myElements.indexOf(element);
if (index != -1) {
myElements.remove(index);
fireTableRowsDeleted(index, index);
removeElement(element);
}
final AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(getClass());
try {