From a7f1b90ed6de4b70c19355bba16abb2b918869ab Mon Sep 17 00:00:00 2001
From: greg <Gregory.Shrago@jetbrains.com>
Date: Wed, 12 Aug 2009 19:43:58 +0400
Subject: [PATCH] Lazy/Simple/TreeBuilder killed, sorry

---
 .../util/xml/tree/actions/DomElementsToggleAction.java      |  2 +-
 .../src/com/intellij/util/xml/tree/DomModelTreeView.java    | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dom/impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java b/dom/impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java
index 284203293c..ba1a97a1ec 100644
--- a/dom/impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java
+++ b/dom/impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java
@@ -62,7 +62,7 @@ public class DomElementsToggleAction extends ToggleAction {
 
   public void setSelected(AnActionEvent e, boolean state) {
     getHiders().put(myClass, state);
-    myTreeView.getBuilder().updateFromRoot(true);
+    myTreeView.getBuilder().updateFromRoot();
   }
 }
 
diff --git a/dom/openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java b/dom/openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java
index 1f25d2c971..5f6a81ccf6 100644
--- a/dom/openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java
+++ b/dom/openapi/src/com/intellij/util/xml/tree/DomModelTreeView.java
@@ -32,6 +32,7 @@ import com.intellij.ui.treeStructure.actions.ExpandAllAction;
 import com.intellij.util.ui.tree.TreeUtil;
 import com.intellij.util.xml.*;
 import com.intellij.util.xml.highlighting.DomElementAnnotationsManager;
+import com.intellij.ide.util.treeView.AbstractTreeBuilder;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -50,7 +51,7 @@ public class DomModelTreeView extends Wrapper implements DataProvider, Disposabl
   @NonNls public static String DOM_MODEL_TREE_VIEW_POPUP = "DOM_MODEL_TREE_VIEW_POPUP";
 
   private final SimpleTree myTree;
-  private final LazySimpleTreeBuilder myBuilder;
+  private final AbstractTreeBuilder myBuilder;
   private DomManager myDomManager;
   @Nullable private DomElement myRootElement;
 
@@ -69,12 +70,12 @@ public class DomModelTreeView extends Wrapper implements DataProvider, Disposabl
     ToolTipManager.sharedInstance().registerComponent(myTree);
     TreeUtil.installActions(myTree);
 
-    myBuilder = new LazySimpleTreeBuilder(myTree, (DefaultTreeModel)myTree.getModel(), treeStructure, WeightBasedComparator.INSTANCE);
+    myBuilder = new AbstractTreeBuilder(myTree, (DefaultTreeModel)myTree.getModel(), treeStructure, WeightBasedComparator.INSTANCE);
     Disposer.register(this, myBuilder);
 
     myBuilder.setNodeDescriptorComparator(null);
 
-    myBuilder.initRoot();
+    myBuilder.initRootNode();
 
     add(myTree, BorderLayout.CENTER);
 
@@ -132,7 +133,7 @@ public class DomModelTreeView extends Wrapper implements DataProvider, Disposabl
       public void run() {
         if (getProject().isDisposed()) return;
         if (!file.isValid() || isRightFile(file)) {
-          myBuilder.queueUpdate();
+          myBuilder.updateFromRoot();
         }
       }
     });
@@ -154,7 +155,7 @@ public class DomModelTreeView extends Wrapper implements DataProvider, Disposabl
     return myDomManager.getProject();
   }
 
-  public LazySimpleTreeBuilder getBuilder() {
+  public AbstractTreeBuilder getBuilder() {
     return myBuilder;
   }
 
@@ -209,8 +210,6 @@ public class DomModelTreeView extends Wrapper implements DataProvider, Disposabl
 
   @Nullable
   private SimpleNode getNodeFor(final DomElement domElement) {
-    myBuilder.setWaiting(false);
-
     return visit((SimpleNode)myBuilder.getTreeStructure().getRootElement(), domElement);
   }
 
-- 
2.11.4.GIT