From 1eb00f900894bc0265056af7c85e48d56f2eb531 Mon Sep 17 00:00:00 2001 From: Kirill Kalishev Date: Fri, 15 Apr 2011 16:52:26 +0400 Subject: [PATCH] IDEA-65547 Project view expanded/collapsed state is not preserved --- .../src/com/intellij/ide/util/treeView/TreeState.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java index 077bf8052a30..63e268e90d7c 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeState.java @@ -57,6 +57,11 @@ public class TreeState implements JDOMExternalizable { myUserObject = null; } + @Override + public String toString() { + return myItemId + ":" + myItemType; + } + public boolean matchedWith(NodeDescriptor nodeDescriptor) { return Comparing.equal(myItemId, getDescriptorKey(nodeDescriptor)) && Comparing.equal(myItemType, getDescriptorType(nodeDescriptor)); @@ -318,7 +323,9 @@ public class TreeState implements JDOMExternalizable { } - private static boolean applyTo(final int positionInPath, final List path, final Object root, final TreeFacade tree, final ProgressIndicator indicator) { + private TreeNode requestedExpand; + + private boolean applyTo(final int positionInPath, final List path, final Object root, final TreeFacade tree, final ProgressIndicator indicator) { if (!(root instanceof DefaultMutableTreeNode)) return false; final DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)root; @@ -439,7 +446,7 @@ public class TreeState implements JDOMExternalizable { myBuilder.expand(element, new Runnable() { public void run() { - myBuilder.getUi().getReady(this).notify(result); + result.setDone(); } });