From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 9 Dec 2008 10:09:49 +0000 (+0000)
Subject: Fixes replaceWithSelect method. Broken since [5390]. Fixes FeaturesApplication (DateF... 
X-Git-Tag: 6.7.0.beta1~3631
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37e414bd15616cbfe65e66b112e3b71ab13d752e;p=vaadin-framework.git

Fixes replaceWithSelect method. Broken since [5390]. Fixes FeaturesApplication (DateField example)

svn changeset:6127/svn branch:trunk
---

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