From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 9 Mar 2010 17:01:52 +0000 (+0000)
Subject: Fix for #3554 - Form.addItemProperty() resets caption created by FieldFactory
X-Git-Tag: 6.7.0.beta1~1961
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5076f55235c41c3dd99560401f96798222d71a6a;p=vaadin-framework.git

Fix for #3554 - Form.addItemProperty() resets caption created by FieldFactory

svn changeset:11732/svn branch:6.3
---

diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index 678c323dc3..4f417c4b94 100644
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -464,20 +464,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
         }
 
         // Configures the field
-        try {
-            field.setPropertyDataSource(property);
-            String caption = id.toString();
-            if (caption.length() > 50) {
-                caption = caption.substring(0, 47) + "...";
-            }
-            if (caption.length() > 0) {
-                caption = "" + Character.toUpperCase(caption.charAt(0))
-                        + caption.substring(1, caption.length());
-            }
-            field.setCaption(caption);
-        } catch (final Throwable ignored) {
-            return false;
-        }
+        field.setPropertyDataSource(property);
 
         // Register and attach the created field
         addField(id, field);