From: Artur Signell <artur@vaadin.com>
Date: Mon, 19 Dec 2011 13:40:12 +0000 (+0200)
Subject: Use BeanItem.addNestedProperty
X-Git-Tag: 7.0.0.alpha1~101
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b5c7411064469407f3a264058c1c1e2e63aa7d4;p=vaadin-framework.git

Use BeanItem.addNestedProperty
---

diff --git a/src/com/vaadin/data/fieldbinder/BeanFieldBinder.java b/src/com/vaadin/data/fieldbinder/BeanFieldBinder.java
index 8ec78bb7e8..6777f1b9af 100644
--- a/src/com/vaadin/data/fieldbinder/BeanFieldBinder.java
+++ b/src/com/vaadin/data/fieldbinder/BeanFieldBinder.java
@@ -4,9 +4,7 @@
 package com.vaadin.data.fieldbinder;
 
 import com.vaadin.data.Item;
-import com.vaadin.data.Property;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.data.util.NestedMethodProperty;
 import com.vaadin.data.validator.BeanValidationValidator;
 import com.vaadin.ui.Field;
 
@@ -70,6 +68,18 @@ public class BeanFieldBinder<T> extends FieldBinder {
         }
     }
 
+    /**
+     * Helper method for setting the data source directly using a bean. This
+     * method wraps the bean in a {@link BeanItem} and calls
+     * {@link #setItemDataSource(Item)}.
+     * 
+     * @param bean
+     *            The bean to use as data source.
+     */
+    public void setItemDataSource(T bean) {
+        setItemDataSource(new BeanItem(bean));
+    }
+
     @Override
     public void setItemDataSource(Item item) {
         if (!(item instanceof BeanItem)) {
@@ -86,24 +96,19 @@ public class BeanFieldBinder<T> extends FieldBinder {
 
     @Override
     public void bind(Field field, Object propertyId) {
-        try {
-            super.bind(field, propertyId);
-        } catch (BindException e) {
-            // System.out.println("Trying to add nested property " +
-            // propertyId);
-            if (getItemDataSource() != null
-                    && field.getPropertyDataSource() == null) {
-                // Workaround for nested properties in BeanItem.
-
-                // FIXME: BeanItem.setAddNestedPropertiesAutomatically would be
-                // a nice, real fix..
-                Property p = new NestedMethodProperty(getItemDataSource()
-                        .getBean(), (String) propertyId);
-                getItemDataSource().addItemProperty(propertyId, p);
-                super.bind(field, propertyId);
+        if (getItemDataSource() != null) {
+            // The data source is set so the property must be found in the item.
+            // If it is not we try to add it.
+            try {
+                getItemProperty(propertyId);
+            } catch (BindException e) {
+                // Not found, try to add a nested property;
+                // BeanItem property ids are always strings so this is safe
+                getItemDataSource().addNestedProperty((String) propertyId);
             }
         }
 
+        super.bind(field, propertyId);
     }
 
     @Override