From af46c6e32f44e9f59c98ece2b903c7a8cce6da15 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Wed, 20 Aug 2008 09:39:18 +0000 Subject: [PATCH] setContainerDataSource() now accepts null. Fixes #1971. svn changeset:5224/svn branch:trunk --- src/com/itmill/toolkit/ui/Tree.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/itmill/toolkit/ui/Tree.java b/src/com/itmill/toolkit/ui/Tree.java index b833930be7..35c5f1daca 100644 --- a/src/com/itmill/toolkit/ui/Tree.java +++ b/src/com/itmill/toolkit/ui/Tree.java @@ -19,6 +19,7 @@ import java.util.StringTokenizer; import com.itmill.toolkit.data.Container; import com.itmill.toolkit.data.util.ContainerHierarchicalWrapper; +import com.itmill.toolkit.data.util.IndexedContainer; import com.itmill.toolkit.event.Action; import com.itmill.toolkit.terminal.KeyMapper; import com.itmill.toolkit.terminal.PaintException; @@ -659,6 +660,12 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @see com.itmill.toolkit.data.Container.Viewer#setContainerDataSource(Container) */ public void setContainerDataSource(Container newDataSource) { + if (newDataSource == null) { + // Note: using wrapped IndexedContainer to match constructor (super + // creates an IndexedContainer, which is then wrapped). + newDataSource = new ContainerHierarchicalWrapper( + new IndexedContainer()); + } // Assure that the data source is ordered by making unordered // containers ordered by wrapping them -- 2.39.5