From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Sat, 26 Apr 2008 18:26:51 +0000 (+0000)
Subject: Fixes #1607
X-Git-Tag: 6.7.0.beta1~4865
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2698d041a8c4a1db6f23497d68909949f8f16576;p=vaadin-framework.git

Fixes #1607

svn changeset:4253/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
index 14f7ab0442..c27d48acbf 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
@@ -5,6 +5,7 @@
 package com.itmill.toolkit.demo.featurebrowser;
 
 import java.util.HashMap;
+import java.util.Iterator;
 
 import com.itmill.toolkit.data.Item;
 import com.itmill.toolkit.data.Property;
@@ -157,7 +158,11 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
         tree.addListener(this);
         tree.setImmediate(true);
         tree.expandItemsRecursively(rootId);
-
+        for (Iterator i=container.getItemIds().iterator(); i.hasNext();) {
+        	Object id = i.next();
+        	if (container.getChildren(id)==null) tree.setChildrenAllowed(id, false);
+        }
+        
         split.addComponent(tree);
 
         final SplitPanel split2 = new SplitPanel();
@@ -297,6 +302,7 @@ public class FeatureBrowser extends com.itmill.toolkit.Application implements
     public void valueChange(ValueChangeEvent event) {
         if (event.getProperty() == tree) {
             final Object id = tree.getValue();
+            if (id == null) return; 
             final Item item = tree.getItem(id);
             //
             String newSection;