diff options
author | Artur Signell <artur@vaadin.com> | 2012-06-19 16:14:06 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2012-06-21 17:11:26 +0300 |
commit | d627ad58d2d11a09947a8eac4cd12b72c3d02669 (patch) | |
tree | efbc546a39efdbed49aea70a44d69e32cf07ff2b /src/com/vaadin/ui/AbstractField.java | |
parent | 71abc602b00089b17b247c64729588a0d187eafd (diff) | |
download | vaadin-framework-d627ad58d2d11a09947a8eac4cd12b72c3d02669.tar.gz vaadin-framework-d627ad58d2d11a09947a8eac4cd12b72c3d02669.zip |
Converter support and updated data source logic (#8990, #8991)
Diffstat (limited to 'src/com/vaadin/ui/AbstractField.java')
-rw-r--r-- | src/com/vaadin/ui/AbstractField.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java index 3c78c21b53..b74dba6d65 100644 --- a/src/com/vaadin/ui/AbstractField.java +++ b/src/com/vaadin/ui/AbstractField.java @@ -701,8 +701,8 @@ public abstract class AbstractField<T> extends AbstractComponent implements // Check if the current converter is compatible. if (newDataSource != null - && (getConverter() == null || !newDataSource.getType() - .isAssignableFrom(getConverter().getModelType()))) { + && !ConverterUtil.canConverterHandle(getConverter(), getType(), + newDataSource.getType())) { // Changing from e.g. Number -> Double should set a new converter, // changing from Double -> Number can keep the old one (Property // accepts Number) |