From 659c0a5d0d540100d1366adb79bdde1205bc5205 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 19 Oct 2012 12:47:01 +0400
Subject: [PATCH] Access is allowed from event dispatch thread only

---
 .../ide/util/treeView/AbstractTreeUi.java       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
index ff8b4b37f30a..29a65da83d73 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
@@ -736,11 +736,11 @@ public class AbstractTreeUi {
           expand(getRootNode(), true);
         }
         ActionCallback callback;
-        if (!willUpdate) {
-          callback = updateNodeChildren(getRootNode(), pass, null, false, false, false, true, true);
+        if (willUpdate) {
+          callback = new ActionCallback.Done();
         }
         else {
-          callback = new ActionCallback.Done();
+          callback = updateNodeChildren(getRootNode(), pass, null, false, false, false, true, true);
         }
         callback.doWhenDone(new Runnable() {
           @Override
@@ -912,7 +912,7 @@ public class AbstractTreeUi {
       @Override
       public void run(final Boolean changes) {
         if (changes) {
-          invokeLaterIfNeeded(false, new Runnable() {
+          invokeLaterIfNeeded(true, new Runnable() {
             @Override
             public void run() {
               Object element = nodeDescriptor.getElement();
@@ -2177,11 +2177,6 @@ public class AbstractTreeUi {
     }
   }
 
-  private void scheduleMaybeReady() {
-    myMaybeReady.cancelAllRequests();
-    myMaybeReady.addRequest(myMaybeReadyRunnable, Registry.intValue("ide.tree.waitForReadySchedule"));
-  }
-
   private void flushPendingNodeActions() {
     final DefaultMutableTreeNode[] nodes = myPendingNodeActions.toArray(new DefaultMutableTreeNode[myPendingNodeActions.size()]);
     myPendingNodeActions.clear();
@@ -4020,10 +4015,6 @@ public class AbstractTreeUi {
 
     myRevalidatedObjects.add(element);
     AsyncResult<Object> revalidated = getBuilder().revalidateElement(element);
-    if (revalidated == null) {
-      runDone(onDone);
-      return;
-    }
 
     revalidated.doWhenDone(new AsyncResult.Handler<Object>() {
       @Override