From: Artur Signell <artur@vaadin.com>
Date: Thu, 22 Dec 2011 20:25:20 +0000 (+0200)
Subject: FieldBinder -> FieldGroup
X-Git-Tag: 7.0.0.alpha1^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d66a8f71c9633f22c1cdf0b56f3e3fc783df0b9b;p=vaadin-framework.git

FieldBinder -> FieldGroup
---

diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldBinderTest.java b/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldBinderTest.java
deleted file mode 100644
index d91ebba150..0000000000
--- a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldBinderTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.vaadin.tests.fieldgroup;
-
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.tests.util.Log;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Root;
-
-public abstract class AbstractBeanFieldBinderTest extends TestBase {
-
-    private Button commitButton;
-    protected Log log = new Log(5);
-
-    private Button discardButton;
-    private Button showBeanButton;
-    private BeanFieldGroup fieldBinder;
-
-    @Override
-    protected void setup() {
-        addComponent(log);
-    }
-
-    protected Button getDiscardButton() {
-        if (discardButton == null) {
-            discardButton = new Button("Discard", new Button.ClickListener() {
-
-                public void buttonClick(ClickEvent event) {
-                    getFieldBinder().discard();
-                    log.log("Discarded changes");
-
-                }
-            });
-        }
-        return discardButton;
-    }
-
-    protected Button getShowBeanButton() {
-        if (showBeanButton == null) {
-            showBeanButton = new Button("Show bean values",
-                    new Button.ClickListener() {
-
-                        public void buttonClick(ClickEvent event) {
-                            log.log(getFieldBinder().getItemDataSource()
-                                    .getBean().toString());
-
-                        }
-                    });
-        }
-        return showBeanButton;
-    }
-
-    protected Button getCommitButton() {
-        if (commitButton == null) {
-            commitButton = new Button("Commit");
-            commitButton.addListener(new ClickListener() {
-
-                public void buttonClick(ClickEvent event) {
-                    String msg = "Commit succesful";
-                    try {
-                        getFieldBinder().commit();
-                    } catch (CommitException e) {
-                        msg = "Commit failed: " + e.getMessage();
-                    }
-                    Root.getCurrentRoot().showNotification(msg);
-                    log.log(msg);
-
-                }
-            });
-        }
-        return commitButton;
-    }
-
-    protected BeanFieldGroup getFieldBinder() {
-        return fieldBinder;
-    }
-
-    protected void setFieldBinder(BeanFieldGroup beanFieldBinder) {
-        fieldBinder = beanFieldBinder;
-    }
-
-    @Override
-    protected String getDescription() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java b/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
new file mode 100644
index 0000000000..c1a8a4053b
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
@@ -0,0 +1,96 @@
+package com.vaadin.tests.fieldgroup;
+
+import com.vaadin.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.Log;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Root;
+
+public abstract class AbstractBeanFieldGroupTest extends TestBase {
+
+    private Button commitButton;
+    protected Log log = new Log(5);
+
+    private Button discardButton;
+    private Button showBeanButton;
+    private BeanFieldGroup fieldBinder;
+
+    @Override
+    protected void setup() {
+        addComponent(log);
+    }
+
+    protected Button getDiscardButton() {
+        if (discardButton == null) {
+            discardButton = new Button("Discard", new Button.ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    getFieldBinder().discard();
+                    log.log("Discarded changes");
+
+                }
+            });
+        }
+        return discardButton;
+    }
+
+    protected Button getShowBeanButton() {
+        if (showBeanButton == null) {
+            showBeanButton = new Button("Show bean values",
+                    new Button.ClickListener() {
+
+                        public void buttonClick(ClickEvent event) {
+                            log.log(getFieldBinder().getItemDataSource()
+                                    .getBean().toString());
+
+                        }
+                    });
+        }
+        return showBeanButton;
+    }
+
+    protected Button getCommitButton() {
+        if (commitButton == null) {
+            commitButton = new Button("Commit");
+            commitButton.addListener(new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    String msg = "Commit succesful";
+                    try {
+                        getFieldBinder().commit();
+                    } catch (CommitException e) {
+                        msg = "Commit failed: " + e.getMessage();
+                    }
+                    Root.getCurrentRoot().showNotification(msg);
+                    log.log(msg);
+
+                }
+            });
+        }
+        return commitButton;
+    }
+
+    protected BeanFieldGroup getFieldBinder() {
+        return fieldBinder;
+    }
+
+    protected void setFieldBinder(BeanFieldGroup beanFieldBinder) {
+        fieldBinder = beanFieldBinder;
+    }
+
+    @Override
+    protected String getDescription() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
index 205d70eba3..c035ae67ea 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
@@ -11,7 +11,7 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.TextField;
 
-public class FormWithNestedProperties extends AbstractBeanFieldBinderTest {
+public class FormWithNestedProperties extends AbstractBeanFieldGroupTest {
 
     private Log log = new Log(5);