Fixed demos. Pumped version up.

svn changeset:2962/svn branch:trunk

1 files changed, 6 insertions, 4 deletions

diff --git a/src/com/itmill/toolkit/demo/testbench/TestBench.java b/src/com/itmill/toolkit/demo/testbench/TestBench.java
index 8880525e55..c455dc72ae 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestBench.java
+++ b/src/com/itmill/toolkit/demo/testbench/TestBench.java
@@ -88,11 +88,13 @@ public class TestBench extends com.itmill.toolkit.Application implements
         for (Iterator i = itemCaptions.keySet().iterator(); i.hasNext();) {
             Class testable = (Class) i.next();
             // simplify captions
-            String name = testable.getName().replaceAll("com.itmill.toolkit.",
-                    "");
+            String name = testable.getName().substring(
+                    testable.getName().lastIndexOf('.') + 1);
             menu.setItemCaption(testable, name);
-            // TODO fix #1191
-            menu.collapseItem(testable);
+        }
+        // expand all root items
+        for (Iterator i = menu.rootItemIds().iterator(); i.hasNext();) {
+            menu.expandItemsRecursively(i.next());
         }
 
         menu.addListener(this);