aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-12-09 10:09:49 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-12-09 10:09:49 +0000
commit37e414bd15616cbfe65e66b112e3b71ab13d752e (patch)
tree6d12d5c083c07d83efdf6548b563be03fec33c57 /src
parentbd77e796573fecaf6551248fe3e64a4470edca8b (diff)
downloadvaadin-framework-37e414bd15616cbfe65e66b112e3b71ab13d752e.tar.gz
vaadin-framework-37e414bd15616cbfe65e66b112e3b71ab13d752e.zip
Fixes replaceWithSelect method. Broken since [5390]. Fixes FeaturesApplication (DateField example)
svn changeset:6127/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/ui/Form.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/ui/Form.java b/src/com/itmill/toolkit/ui/Form.java
index 55f0655d15..ecc8ec98cc 100644
--- a/src/com/itmill/toolkit/ui/Form.java
+++ b/src/com/itmill/toolkit/ui/Form.java
@@ -746,7 +746,9 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
throw new IllegalArgumentException("Field with given propertyid '"
+ propertyId.toString() + "' can not be found.");
}
- final Object value = oldField.getValue();
+ final Object value = oldField.getPropertyDataSource() == null ? oldField
+ .getValue()
+ : oldField.getPropertyDataSource().getValue();
// Checks that the value exists and check if the select should
// be forced in multiselect mode