diff options
author | Marc Englund <marc.englund@itmill.com> | 2007-11-02 14:13:07 +0000 |
---|---|---|
committer | Marc Englund <marc.englund@itmill.com> | 2007-11-02 14:13:07 +0000 |
commit | cbcf59df3b8faddf9e2e967b43ece2f0f0987ab2 (patch) | |
tree | 00ada4dba709321340a51c02b56561a8511a0528 /src/com/itmill/toolkit/ui/Tree.java | |
parent | 7bd32e78af369312078f63681ad6d7cbc1ec1dac (diff) | |
download | vaadin-framework-cbcf59df3b8faddf9e2e967b43ece2f0f0987ab2.tar.gz vaadin-framework-cbcf59df3b8faddf9e2e967b43ece2f0f0987ab2.zip |
Null selection changes (#574)
svn changeset:2694/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/ui/Tree.java')
-rw-r--r-- | src/com/itmill/toolkit/ui/Tree.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/ui/Tree.java b/src/com/itmill/toolkit/ui/Tree.java index 0aaa22a3c7..3c5552c256 100644 --- a/src/com/itmill/toolkit/ui/Tree.java +++ b/src/com/itmill/toolkit/ui/Tree.java @@ -31,6 +31,7 @@ package com.itmill.toolkit.ui; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; @@ -336,6 +337,13 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, */ public void changeVariables(Object source, Map variables) { + if (!isSelectable() && variables.containsKey("selected")) { + // Not-selectable is a special case, AbstractSelect does not support + // TODO could be optimized. + variables = new HashMap(variables); + variables.remove("selected"); + } + // Collapses the nodes if (variables.containsKey("collapse")) { String[] keys = (String[]) variables.get("collapse"); |