Now tree expansion works

svn changeset:1701/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTree.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTree.java
index 3585bc88ee1649292ca4e0593c671dda2d31eab0..55476b94b6fc693c95b3c9c28a4c8a066bace3a2 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTree.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTree.java
@@ -42,8 +42,8 @@ public class TkTree extends Composite implements Paintable {
                                tree.addItem(childUidl.getStringAttribute("caption"));
                        if(childUidl.getTag().equals("node")) {
                                TreeNode childTree = new TreeNode();
-                               childTree.updateFromUIDL(childUidl, client);
                                tree.addItem(childTree);
+                               childTree.updateFromUIDL(childUidl, client);
                        }
                }
                String selectMode = uidl.getStringAttribute("selectmode");
@@ -82,10 +82,11 @@ public class TkTree extends Composite implements Paintable {
                        for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
                                UIDL childUidl = (UIDL)i.next();
                                TreeNode childTree = new TreeNode();
-                               childTree.updateFromUIDL(childUidl, client);
                                this.addItem(childTree);
+                               childTree.updateFromUIDL(childUidl, client);
                        }
-                       // TODO if(uidl.getBooleanAttribute("expanded")) setState(true);
+                       setState(uidl.getBooleanAttribute("expanded"));
+                       setSelected(uidl.getBooleanAttribute("selected"));
                }