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

NPE fix: invokeLater without isDisposed check

Browse Source
This commit is contained in:
Gregory.Shrago
2013-10-23 23:42:38 +04:00
parent 92d4163b10
commit b99519ef5f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+3 -3
View File
@@ -58,7 +58,6 @@ import com.intellij.ui.*;
import com.intellij.ui.popup.AbstractPopup;
import com.intellij.ui.popup.PopupUpdateProcessor;
import com.intellij.ui.speedSearch.ElementFilter;
import com.intellij.ui.speedSearch.SpeedSearchUtil;
import com.intellij.ui.treeStructure.AlwaysExpandedTree;
import com.intellij.ui.treeStructure.Tree;
import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder;
@@ -70,7 +69,6 @@ import com.intellij.util.containers.Convertor;
import com.intellij.util.containers.HashSet;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.tree.TreeUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -103,7 +101,7 @@ public class FileStructurePopup implements Disposable {
@NonNls private static final String narrowDownPropertyKey = "FileStructurePopup.narrowDown";
private boolean myShouldNarrowDown = true;
private FileStructureTree myTree;
private FilteringTreeBuilder myAbstractTreeBuilder;
private final FilteringTreeBuilder myAbstractTreeBuilder;
private String myTitle;
private TreeSpeedSearch mySpeedSearch;
private SmartTreeStructure myTreeStructure;
@@ -332,6 +330,7 @@ public class FileStructurePopup implements Disposable {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
if (myAbstractTreeBuilder.isDisposed()) return;
if (selectPsiElement(myInitialPsiElement) == null) {
TreeUtil.ensureSelection(myAbstractTreeBuilder.getTree());
myAbstractTreeBuilder.revalidateTree();
@@ -372,6 +371,7 @@ public class FileStructurePopup implements Disposable {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
if (myAbstractTreeBuilder.isDisposed()) return;
myTree.repaint();
if (isBackspace && handleBackspace(filter)) {
return;