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

FinderRecursivePanel.mergeListItems: restore setMergeListItemsRunning after exceptions

Browse Source
This commit is contained in:
Yann Cébron
2015-06-23 10:45:11 +02:00
parent 052a35542e
commit 779318044e
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java
+22 -19
View File
@@ -538,32 +538,35 @@ public abstract class FinderRecursivePanel<T> extends JBSplitter implements Data
});
}
protected <T> void mergeListItems(@NotNull CollectionListModel<T> listModel, @NotNull JList list, @NotNull List<T> newItems) {
protected void mergeListItems(@NotNull CollectionListModel<T> listModel, @NotNull JList list, @NotNull List<T> newItems) {
setMergeListItemsRunning(true);
if (listModel.getSize() == 0) {
listModel.add(newItems);
}
else if (newItems.size() == 0) {
listModel.removeAll();
} else {
int newSelectedIndex = -1;
T selection = (T)list.getSelectedValue();
if (selection != null) {
newSelectedIndex = newItems.indexOf(selection);
try {
if (listModel.getSize() == 0) {
listModel.add(newItems);
}
else if (newItems.size() == 0) {
listModel.removeAll();
}
else {
int newSelectedIndex = -1;
T selection = (T)list.getSelectedValue();
if (selection != null) {
newSelectedIndex = newItems.indexOf(selection);
}
listModel.removeAll();
listModel.add(newItems);
listModel.removeAll();
listModel.add(newItems);
list.setSelectedIndex(newSelectedIndex);
list.setSelectedIndex(newSelectedIndex);
}
}
finally {
setMergeListItemsRunning(false);
}
setMergeListItemsRunning(false);
}
public boolean isMergeListItemsRunning() {