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

take care to not access myTree in detached mode to fix EA-97339 - NPE: UsageViewImpl.rulesChanged

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-02-22 16:42:24 +03:00
parent b326b6bd2b
commit 1304f31e35
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+11 -5
View File
@@ -847,7 +847,9 @@ public class UsageViewImpl implements UsageView {
}
final List<UsageState> states = new ArrayList<>();
captureUsagesExpandState(new TreePath(myTree.getModel().getRoot()), states);
if (myTree != null) {
captureUsagesExpandState(new TreePath(myTree.getModel().getRoot()), states);
}
final List<Usage> allUsages = new ArrayList<>(myUsageNodes.keySet());
Collections.sort(allUsages, USAGE_COMPARATOR);
final Set<Usage> excludedUsages = getExcludedUsages();
@@ -865,18 +867,22 @@ public class UsageViewImpl implements UsageView {
appendUsage(usage);
}
});
excludeUsages(excludedUsages.toArray(new Usage[excludedUsages.size()]));
if (myTree != null) {
excludeUsages(excludedUsages.toArray(new Usage[excludedUsages.size()]));
}
if (myCentralPanel != null) {
setupCentralPanel();
}
SwingUtilities.invokeLater(() -> {
if (isDisposed) return;
restoreUsageExpandState(states);
updateImmediately();
if (myTree != null) {
restoreUsageExpandState(states);
updateImmediately();
}
});
}
private void captureUsagesExpandState(TreePath pathFrom, final Collection<UsageState> states) {
private void captureUsagesExpandState(@NotNull TreePath pathFrom, @NotNull Collection<UsageState> states) {
ApplicationManager.getApplication().assertIsDispatchThread();
if (!myTree.isExpanded(pathFrom)) {
return;