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

EDT assertion fix

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-03-08 16:25:41 +01:00
parent 387d563991
commit aed6391169
1 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+39 -28
View File
@@ -206,7 +206,8 @@ public class FileStructurePopup implements Disposable {
}
};
myAbstractTreeBuilder.getUi().getUpdater().setPassThroughMode(true);
//myAbstractTreeBuilder.getUi().setPassthroughMode(true);
myAbstractTreeBuilder.getUi().getUpdater().setDelay(1);
myInitialPsiElement = getCurrentElement(getPsiFile(myProject));
//myAbstractTreeBuilder.setCanYieldUpdate(true);
Disposer.register(this, myAbstractTreeBuilder);
@@ -269,9 +270,11 @@ public class FileStructurePopup implements Disposable {
myPopup.setSize(new Dimension(myPreferredWidth + 10, myPopup.getSize().height));
}
//final long cur = System.currentTimeMillis();
myAbstractTreeBuilder.expandAll(new Runnable() {
@Override
public void run() {
//System.out.println(System.currentTimeMillis() - cur);
IdeFocusManager.getInstance(myProject).requestFocus(myTree, true);
myAbstractTreeBuilder.queueUpdate().doWhenDone(new Runnable() {
@Override
@@ -298,21 +301,25 @@ public class FileStructurePopup implements Disposable {
if (!filter.equals(prefix)) {
filter = prefix;
final AccessToken token = ApplicationManager.getApplication().acquireReadActionLock();
try {
myAbstractTreeBuilder.refilter(null, false, false).doWhenProcessed(new Runnable() {
@Override
public void run() {
myTree.repaint();
//if (mySpeedSearch.isPopupActive()) {
// mySpeedSearch.refreshSelection();
//}
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {
final AccessToken token = ApplicationManager.getApplication().acquireReadActionLock();
try {
myAbstractTreeBuilder.refilter(null, false, false).doWhenProcessed(new Runnable() {
@Override
public void run() {
myTree.repaint();
//if (mySpeedSearch.isPopupActive()) {
// mySpeedSearch.refreshSelection();
//}
}
});
}
});
}
finally {
token.finish();
}
finally {
token.finish();
}
}
});
}
if (!alarm.isDisposed()) {
alarm.addRequest(this, 300);
@@ -586,20 +593,24 @@ public class FileStructurePopup implements Disposable {
myFilteringStructure.rebuild();
final Object sel = selection;
final AccessToken token = ApplicationManager.getApplication().acquireReadActionLock();
try {
myAbstractTreeBuilder.refilter(sel, true, false).doWhenProcessed(new Runnable() {
@Override
public void run() {
if (mySpeedSearch.isPopupActive()) {
mySpeedSearch.refreshSelection();
}
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {
final AccessToken token = ApplicationManager.getApplication().acquireReadActionLock();
try {
myAbstractTreeBuilder.refilter(sel, true, false).doWhenProcessed(new Runnable() {
@Override
public void run() {
if (mySpeedSearch.isPopupActive()) {
mySpeedSearch.refreshSelection();
}
}
});
}
});
}
finally {
token.finish();
}
finally {
token.finish();
}
}
});
}
});
chkFilter.setFocusable(false);