#7964 CheckBox now extends AbstractField directly.

ClickListener is no longer available for a CheckBox.
Fixed tests accordingly

36 files changed, 368 insertions, 313 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
index 2318a1ab69..3f5973d804 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
@@ -26,6 +26,8 @@ import com.vaadin.terminal.gwt.client.VTooltip;
 public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
         Paintable, Field, FocusHandler, BlurHandler {
 
+    public static final String VARIABLE_STATE = "state";
+
     public static final String CLASSNAME = "v-checkbox";
 
     String id;
@@ -55,7 +57,7 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
                         event.getNativeEvent(), getElement());
                 client.updateVariable(id, "mousedetails", details.serialize(),
                         false);
-                client.updateVariable(id, "state", getValue(), immediate);
+                client.updateVariable(id, VARIABLE_STATE, getValue(), immediate);
             }
 
         });
@@ -119,7 +121,7 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
 
         // Set text
         setText(uidl.getStringAttribute("caption"));
-        setValue(uidl.getBooleanVariable("state"));
+        setValue(uidl.getBooleanVariable(VARIABLE_STATE));
         immediate = uidl.getBooleanAttribute("immediate");
     }
 
diff --git a/src/com/vaadin/ui/CheckBox.java b/src/com/vaadin/ui/CheckBox.java
index b9ae236cb0..9435caf587 100644
--- a/src/com/vaadin/ui/CheckBox.java
+++ b/src/com/vaadin/ui/CheckBox.java
@@ -4,110 +4,113 @@
 
 package com.vaadin.ui;
 
-import java.lang.reflect.Method;
+import java.util.Map;
 
 import com.vaadin.data.Property;
+import com.vaadin.event.FieldEvents.BlurEvent;
+import com.vaadin.event.FieldEvents.BlurListener;
+import com.vaadin.event.FieldEvents.FocusEvent;
+import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.VCheckBox;
 
 @ClientWidget(com.vaadin.terminal.gwt.client.ui.VCheckBox.class)
-public class CheckBox extends Button {
+public class CheckBox extends AbstractField {
     /**
-     * Creates a new switch button.
+     * Creates a new checkbox.
      */
     public CheckBox() {
-        setSwitchMode(true);
     }
 
     /**
-     * Creates a new switch button with a caption and a set initial state.
+     * Creates a new checkbox with a set caption.
      * 
      * @param caption
-     *            the caption of the switch button
-     * @param initialState
-     *            the initial state of the switch button
+     *            the Checkbox caption.
      */
-    @SuppressWarnings("deprecation")
-    public CheckBox(String caption, boolean initialState) {
-        super(caption, initialState);
-    }
-
-    /**
-     * Creates a new switch button with a caption and a click listener.
-     * 
-     * @param caption
-     *            the caption of the switch button
-     * @param listener
-     *            the click listener
-     */
-    public CheckBox(String caption, ClickListener listener) {
-        super(caption, listener);
-        setSwitchMode(true);
+    public CheckBox(String caption) {
+        this();
+        setCaption(caption);
     }
 
     /**
-     * Convenience method for creating a new switch button with a method
-     * listening button clicks. Using this method is discouraged because it
-     * cannot be checked during compilation. Use
-     * {@link #addListener(Class, Object, Method)} or
-     * {@link #addListener(com.vaadin.ui.Component.Listener)} instead. The
-     * method must have either no parameters, or only one parameter of
-     * Button.ClickEvent type.
+     * Creates a new checkbox with a caption and a set initial state.
      * 
      * @param caption
-     *            the Button caption.
-     * @param target
-     *            the Object having the method for listening button clicks.
-     * @param methodName
-     *            the name of the method in target object, that receives button
-     *            click events.
+     *            the caption of the checkbox
+     * @param initialState
+     *            the initial state of the checkbox
      */
-    public CheckBox(String caption, Object target, String methodName) {
-        super(caption, target, methodName);
-        setSwitchMode(true);
+    public CheckBox(String caption, boolean initialState) {
+        this(caption);
+        setValue(initialState);
     }
 
     /**
-     * Creates a new switch button that is connected to a boolean property.
+     * Creates a new checkbox that is connected to a boolean property.
      * 
      * @param state
      *            the Initial state of the switch-button.
      * @param dataSource
      */
-    @SuppressWarnings("deprecation")
     public CheckBox(String caption, Property dataSource) {
-        super(caption, dataSource);
-        setSwitchMode(true);
+        this(caption);
+        setPropertyDataSource(dataSource);
     }
 
-    /**
-     * Creates a new push button with a set caption.
-     * 
-     * The value of the push button is always false and they are immediate by
-     * default.
-     * 
-     * @param caption
-     *            the Button caption.
-     */
+    @Override
+    public Class<?> getType() {
+        return Boolean.class;
+    }
 
-    @SuppressWarnings("deprecation")
-    public CheckBox(String caption) {
-        super(caption, false);
+    @Override
+    public void paintContent(PaintTarget target) throws PaintException {
+        super.paintContent(target);
+
+        target.addVariable(this, VCheckBox.VARIABLE_STATE, (Boolean) getValue());
     }
 
-    @Deprecated
     @Override
-    public void setSwitchMode(boolean switchMode)
-            throws UnsupportedOperationException {
-        if (this.switchMode && !switchMode) {
-            throw new UnsupportedOperationException(
-                    "CheckBox is always in switch mode (consider using a Button)");
+    public void changeVariables(Object source, Map<String, Object> variables) {
+        super.changeVariables(source, variables);
+
+        if (!isReadOnly() && variables.containsKey(VCheckBox.VARIABLE_STATE)) {
+            // Gets the new and old states
+            final Boolean newValue = (Boolean) variables
+                    .get(VCheckBox.VARIABLE_STATE);
+            final Boolean oldValue = (Boolean) getValue();
+
+            // The event is only sent if the switch state is changed
+            if (newValue != null && !newValue.equals(oldValue)) {
+                setValue(newValue);
+            }
+        }
+
+        if (variables.containsKey(FocusEvent.EVENT_ID)) {
+            fireEvent(new FocusEvent(this));
+        }
+        if (variables.containsKey(BlurEvent.EVENT_ID)) {
+            fireEvent(new BlurEvent(this));
         }
-        super.setSwitchMode(true);
     }
 
-    @Override
-    public void setDisableOnClick(boolean disableOnClick) {
-        throw new UnsupportedOperationException(
-                "CheckBox does not support disable on click");
+    public void addListener(BlurListener listener) {
+        addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
+                BlurListener.blurMethod);
+    }
+
+    public void removeListener(BlurListener listener) {
+        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
+    public void addListener(FocusListener listener) {
+        addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
+                FocusListener.focusMethod);
+    }
+
+    public void removeListener(FocusListener listener) {
+        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
+
+    }
 }
diff --git a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
index 50b7be91ef..891bf7dcbf 100644
--- a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
+++ b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
@@ -4,10 +4,10 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
@@ -50,8 +50,10 @@ public class TestForRichTextEditor extends CustomComponent implements
 
         CheckBox b = new CheckBox("enabled");
         b.setImmediate(true);
-        b.addListener(new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
+        b.addListener(new Property.ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
                 rte.setEnabled(!rte.isEnabled());
             }
         });
diff --git a/tests/testbench/com/vaadin/tests/TestForUpload.java b/tests/testbench/com/vaadin/tests/TestForUpload.java
index 3fed6b233e..ad916e0cc4 100644
--- a/tests/testbench/com/vaadin/tests/TestForUpload.java
+++ b/tests/testbench/com/vaadin/tests/TestForUpload.java
@@ -413,7 +413,7 @@ public class TestForUpload extends CustomComponent implements
     }
 
     private void beSluggish() {
-        if (beSluggish.booleanValue()) {
+        if ((Boolean) beSluggish.getValue()) {
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
@@ -424,7 +424,7 @@ public class TestForUpload extends CustomComponent implements
     }
 
     private void throwExecption() {
-        if (throwExecption.booleanValue()) {
+        if ((Boolean) throwExecption.getValue()) {
             throwExecption.setValue(false);
             throw new RuntimeException("Test execption in receiver.");
         }
diff --git a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
index 1e15f7a47b..9007e3cb8b 100644
--- a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
+++ b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
@@ -7,6 +7,7 @@ import java.util.List;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
@@ -111,9 +112,11 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends
             boolean initialState, final Command<T, Boolean> command) {
 
         CheckBox checkBox = new CheckBox(caption);
-        checkBox.addListener(new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                boolean enabled = (Boolean) event.getButton().getValue();
+        checkBox.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                boolean enabled = (Boolean) event.getProperty().getValue();
                 doCommand(command, enabled);
             }
         });
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
index 5d4f0f2acf..3919443a6e 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
@@ -1,8 +1,9 @@
 package com.vaadin.tests.components.abstractcomponent;

 

+import com.vaadin.data.Property;

+import com.vaadin.data.Property.ValueChangeEvent;

 import com.vaadin.tests.components.AbstractTestCase;

 import com.vaadin.ui.Button;

-import com.vaadin.ui.Button.ClickEvent;

 import com.vaadin.ui.CheckBox;

 import com.vaadin.ui.Panel;

 import com.vaadin.ui.Window;

@@ -17,9 +18,11 @@ public class EnableState extends AbstractTestCase {
         panel.addComponent(button);

 

         CheckBox enable = new CheckBox("Toggle button enabled", true);

-        enable.addListener(new Button.ClickListener() {

-            public void buttonClick(ClickEvent event) {

-                boolean enabled = (Boolean) event.getButton().getValue();

+        enable.addListener(new Property.ValueChangeListener() {

+

+            @Override

+            public void valueChange(ValueChangeEvent event) {

+                boolean enabled = (Boolean) event.getProperty().getValue();

                 button.setEnabled(enabled);

                 // button.requestRepaint();

             }

@@ -27,17 +30,21 @@ public class EnableState extends AbstractTestCase {
         enable.setImmediate(true);

 

         CheckBox caption = new CheckBox("Toggle button caption", true);

-        caption.addListener(new Button.ClickListener() {

-            public void buttonClick(ClickEvent event) {

+        caption.addListener(new Property.ValueChangeListener() {

+

+            @Override

+            public void valueChange(ValueChangeEvent event) {

                 button.setCaption(button.getCaption() + "+");

             }

         });

         caption.setImmediate(true);

 

         CheckBox visible = new CheckBox("Toggle panel visibility", true);

-        visible.addListener(new Button.ClickListener() {

-            public void buttonClick(ClickEvent event) {

-                boolean visible = (Boolean) event.getButton().getValue();

+        visible.addListener(new Property.ValueChangeListener() {

+

+            @Override

+            public void valueChange(ValueChangeEvent event) {

+                boolean visible = (Boolean) event.getProperty().getValue();

 

                 panel.setVisible(visible);

             }

@@ -45,9 +52,11 @@ public class EnableState extends AbstractTestCase {
         visible.setImmediate(true);

 

         CheckBox panelEnable = new CheckBox("Toggle panel enabled", true);

-        panelEnable.addListener(new Button.ClickListener() {

-            public void buttonClick(ClickEvent event) {

-                boolean enabled = (Boolean) event.getButton().getValue();

+        panelEnable.addListener(new Property.ValueChangeListener() {

+

+            @Override

+            public void valueChange(ValueChangeEvent event) {

+                boolean enabled = (Boolean) event.getProperty().getValue();

                 panel.setEnabled(enabled);

             }

         });

diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java
index 40caf620a8..4dc3fcd0fb 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java
+++ b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java
@@ -3,7 +3,6 @@ package com.vaadin.tests.components.button;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 
 public class ButtonMouseDetails extends TestBase {
@@ -46,10 +45,6 @@ public class ButtonMouseDetails extends TestBase {
         button.setImmediate(true);
         addComponent(button);
 
-        CheckBox cb = new CheckBox("CHECK ME!", clickListener);
-        cb.setImmediate(true);
-        addComponent(cb);
-
         addComponent(out);
     }
 
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index 20f1ece65e..4a98f09808 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
@@ -8,46 +8,15 @@ import com.vaadin.ui.CheckBox;
 public class CheckBoxes2 extends AbstractFieldTest<CheckBox> implements

         ClickListener {

 

-    // cannot extend Buttons2 because of Switch mode problems

-

     @Override

     protected Class<CheckBox> getTestClass() {

         return CheckBox.class;

     }

 

-    private Command<CheckBox, Boolean> switchModeCommand = new Command<CheckBox, Boolean>() {

-

-        @SuppressWarnings("deprecation")

-        public void execute(CheckBox c, Boolean value, Object data) {

-            c.setSwitchMode(value);

-        }

-    };

-

-    private Command<CheckBox, Boolean> clickListenerCommand = new Command<CheckBox, Boolean>() {

-

-        public void execute(CheckBox c, Boolean value, Object data) {

-            if (value) {

-                c.addListener((ClickListener) CheckBoxes2.this);

-            } else {

-                c.removeListener((ClickListener) CheckBoxes2.this);

-            }

-

-        }

-    };

-

     @Override

     protected void createActions() {

         super.createActions();

 

-        createBooleanAction("Switch mode", CATEGORY_FEATURES, true,

-                switchModeCommand);

-        addClickListener(CATEGORY_LISTENERS);

-    }

-

-    private void addClickListener(String category) {

-        createBooleanAction("Click listener", category, false,

-                clickListenerCommand);

-

     }

 

     public void buttonClick(ClickEvent event) {

diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java
index e42d64201e..f404e77513 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java
+++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutReplaceComponent.java
@@ -1,7 +1,8 @@
 package com.vaadin.tests.components.formlayout;

+

+import com.vaadin.data.Property.ValueChangeEvent;

+import com.vaadin.data.Property.ValueChangeListener;

 import com.vaadin.tests.components.TestBase;

-import com.vaadin.ui.Button;

-import com.vaadin.ui.Button.ClickListener;

 import com.vaadin.ui.CheckBox;

 import com.vaadin.ui.FormLayout;

 import com.vaadin.ui.TextField;

@@ -14,7 +15,7 @@ public class FormLayoutReplaceComponent extends TestBase {
 

     }

 

-    public class FL extends FormLayout implements ClickListener {

+    public class FL extends FormLayout implements ValueChangeListener {

 

         private TextField messages;

         private CheckBox control;

@@ -37,10 +38,12 @@ public class FormLayoutReplaceComponent extends TestBase {
             addComponent(messages);

         }

 

-        public final void buttonClick(Button.ClickEvent e) {

-            if (e.getButton() == control) {

-                messages.setVisible(control.booleanValue());

+        @Override

+        public void valueChange(ValueChangeEvent event) {

+            if (event.getProperty() == control) {

+                messages.setVisible((Boolean) control.getValue());

             }

+

         }

     }

 

diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index 9157c30174..470e4d5836 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
@@ -57,7 +57,7 @@ public class NotificationsHtmlAllowed extends TestBase implements ClickListener
     public void buttonClick(ClickEvent event) {

         Notification n = makeNotification();

         Window window;

-        if (showInSubwindow.booleanValue()) {

+        if ((Boolean) showInSubwindow.getValue()) {

             window = subwindow;

         } else {

             window = event.getButton().getWindow();

@@ -70,7 +70,7 @@ public class NotificationsHtmlAllowed extends TestBase implements ClickListener
         Notification n = new Notification((String) captionField.getValue(),

                 (String) messageField.getValue(),

                 Notification.TYPE_HUMANIZED_MESSAGE,

-                htmlAllowedBox.booleanValue());

+                (Boolean) htmlAllowedBox.getValue());

         return n;

     }

 }

diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
index 0c625f1c5d..e89d6e56f4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
@@ -4,8 +4,6 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Select;
@@ -37,14 +35,15 @@ public class ColumnHeaderAlignments extends TestBase {
             }
         });
         addComponent(theme);
-        CheckBox footers = new CheckBox("Show footers", new ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                fooTable.setFooterVisible((Boolean) event.getButton()
-                        .getValue());
-                barTable.setFooterVisible((Boolean) event.getButton()
-                        .getValue());
-                bazTable.setFooterVisible((Boolean) event.getButton()
-                        .getValue());
+        CheckBox footers = new CheckBox("Show footers");
+        footers.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                boolean visible = (Boolean) event.getProperty().getValue();
+                fooTable.setFooterVisible(visible);
+                barTable.setFooterVisible(visible);
+                bazTable.setFooterVisible(visible);
             }
         });
         footers.setImmediate(true);
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java
index 6561ff0076..2a713681fe 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java
@@ -7,6 +7,8 @@ import java.io.Serializable;
 import java.util.HashMap;
 
 import com.vaadin.data.Container;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.Button;
@@ -83,9 +85,10 @@ public class EditableTableLeak extends TestBase {
     protected void setup() {
         addComponent(useFieldFactory);
         useFieldFactory.setImmediate(true);
-        useFieldFactory.addListener(new Button.ClickListener() {
+        useFieldFactory.addListener(new ValueChangeListener() {
 
-            public void buttonClick(ClickEvent event) {
+            @Override
+            public void valueChange(ValueChangeEvent event) {
                 if ((Boolean) useFieldFactory.getValue()) {
                     table.setTableFieldFactory(new CachingFieldFactory());
                 } else {
diff --git a/tests/testbench/com/vaadin/tests/components/table/Footer.java b/tests/testbench/com/vaadin/tests/components/table/Footer.java
index d6a9853fff..c962ce8468 100644
--- a/tests/testbench/com/vaadin/tests/components/table/Footer.java
+++ b/tests/testbench/com/vaadin/tests/components/table/Footer.java
@@ -51,7 +51,7 @@ public class Footer extends TestBase {
         visible.setImmediate(true);
         visible.addListener(new Property.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
-                table.setFooterVisible(visible.booleanValue());
+                table.setFooterVisible((Boolean) visible.getValue());
 
             }
         });
diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
index b92d6ef362..0105ec1021 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
+++ b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.FooterClickEvent;
@@ -51,10 +51,11 @@ public class FooterClick extends TestBase {
         CheckBox immediateCheckbox = new CheckBox("Immediate");
         immediateCheckbox.setImmediate(true);
         immediateCheckbox.setValue(table.isImmediate());
-        immediateCheckbox.addListener(new ClickListener() {
+        immediateCheckbox.addListener(new Property.ValueChangeListener() {
 
-            public void buttonClick(ClickEvent event) {
-                table.setImmediate(event.getButton().booleanValue());
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                table.setImmediate((Boolean) event.getProperty().getValue());
             }
         });
 
@@ -62,13 +63,15 @@ public class FooterClick extends TestBase {
                 "Column reordering allowed");
         columnReorderingCheckbox.setImmediate(true);
         columnReorderingCheckbox.setValue(table.isColumnReorderingAllowed());
-        columnReorderingCheckbox.addListener(new ClickListener() {
-
-            public void buttonClick(ClickEvent event) {
-                table.setColumnReorderingAllowed(event.getButton()
-                        .booleanValue());
-            }
-        });
+        columnReorderingCheckbox
+                .addListener(new Property.ValueChangeListener() {
+
+                    @Override
+                    public void valueChange(ValueChangeEvent event) {
+                        table.setColumnReorderingAllowed((Boolean) event
+                                .getProperty().getValue());
+                    }
+                });
 
         addComponent(immediateCheckbox);
         addComponent(columnReorderingCheckbox);
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java
index 3cb11781b1..2f12a90fdf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.HeaderClickEvent;
@@ -36,20 +36,22 @@ public class HeaderClick extends TestBase {
         CheckBox immediateCheckbox = new CheckBox("Immediate");
         immediateCheckbox.setImmediate(true);
         immediateCheckbox.setValue(table.isImmediate());
-        immediateCheckbox.addListener(new ClickListener() {
+        immediateCheckbox.addListener(new Property.ValueChangeListener() {
 
-            public void buttonClick(ClickEvent event) {
-                table.setImmediate(event.getButton().booleanValue());
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                table.setImmediate((Boolean) event.getProperty().getValue());
             }
         });
 
         CheckBox sortEnabledCheckbox = new CheckBox("Sortable");
         sortEnabledCheckbox.setImmediate(true);
         sortEnabledCheckbox.setValue(!table.isSortDisabled());
-        sortEnabledCheckbox.addListener(new ClickListener() {
+        sortEnabledCheckbox.addListener(new Property.ValueChangeListener() {
 
-            public void buttonClick(ClickEvent event) {
-                table.setSortDisabled(!event.getButton().booleanValue());
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                table.setSortDisabled(!(Boolean) event.getProperty().getValue());
             }
         });
 
@@ -57,13 +59,15 @@ public class HeaderClick extends TestBase {
                 "Column reordering allowed");
         columnReorderingCheckbox.setImmediate(true);
         columnReorderingCheckbox.setValue(table.isColumnReorderingAllowed());
-        columnReorderingCheckbox.addListener(new ClickListener() {
-
-            public void buttonClick(ClickEvent event) {
-                table.setColumnReorderingAllowed(event.getButton()
-                        .booleanValue());
-            }
-        });
+        columnReorderingCheckbox
+                .addListener(new Property.ValueChangeListener() {
+
+                    @Override
+                    public void valueChange(ValueChangeEvent event) {
+                        table.setColumnReorderingAllowed((Boolean) event
+                                .getProperty().getValue());
+                    }
+                });
 
         addComponent(immediateCheckbox);
         addComponent(sortEnabledCheckbox);
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
index bf1f9ca883..9c79b65fa5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
+++ b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
@@ -1,7 +1,8 @@
 package com.vaadin.tests.components.table;
 
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Table;
 
@@ -16,16 +17,17 @@ public class HeaderUpdateWhenNoRows extends TestBase {
         table.setHeight("100px");
         table.setImmediate(true);
 
-        CheckBox showHeaders = new CheckBox("Show headers",
-                new CheckBox.ClickListener() {
-                    public void buttonClick(ClickEvent event) {
-                        if (event.getButton().booleanValue()) {
-                            table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID);
-                        } else {
-                            table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);
-                        }
-                    }
-                });
+        CheckBox showHeaders = new CheckBox("Show headers");
+        showHeaders.addListener(new ValueChangeListener() {
+            public void valueChange(ValueChangeEvent event) {
+                if ((Boolean) event.getProperty().getValue()) {
+                    table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID);
+                } else {
+                    table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);
+                }
+            }
+
+        });
 
         showHeaders.setImmediate(true);
         showHeaders.setValue(true);
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index d0b7631f10..07060e5af4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
@@ -1,7 +1,8 @@
 package com.vaadin.tests.components.table;
 
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.tests.components.AbstractTestCase;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Window;
@@ -30,24 +31,26 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase {
         table.addItem("1").getItemProperty("Name").setValue("Item 1");
         table.addItem("2").getItemProperty("Name").setValue("Item 2");
 
-        CheckBox showHeaders = new CheckBox("Show headers",
-                new CheckBox.ClickListener() {
-                    public void buttonClick(ClickEvent event) {
-                        if (event.getButton().booleanValue()) {
-                            // table body height is now 77px, which together
-                            // with header makes 100px
-                            table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID);
-                        } else {
-                            table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);
-                            // header disappears, but table body height stays at
-                            // 77px
-                            // and below the body is an empty area (same height
-                            // as header would
-                            // have)
+        CheckBox showHeaders = new CheckBox("Show headers");
+        showHeaders.addListener(new ValueChangeListener() {
 
-                        }
-                    }
-                });
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                if ((Boolean) event.getProperty().getValue()) {
+                    // table body height is now 77px, which together
+                    // with header makes 100px
+                    table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID);
+                } else {
+                    table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);
+                    // header disappears, but table body height stays at
+                    // 77px
+                    // and below the body is an empty area (same height
+                    // as header would
+                    // have)
+
+                }
+            }
+        });
         showHeaders.setValue(true);
         showHeaders.setImmediate(true);
 
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
index 05e101a5f9..e6e121cba0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
@@ -15,7 +15,7 @@ public class TableScrollOnFocus extends TestBase {
         chkSelectable.setImmediate(true);

         chkSelectable.addListener(new ValueChangeListener() {

             public void valueChange(ValueChangeEvent event) {

-                table.setSelectable(chkSelectable.booleanValue());

+                table.setSelectable((Boolean) chkSelectable.getValue());

             }

         });

 

diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java
index 2b3204953b..c563be2bec 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 import com.vaadin.data.Container;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.tests.components.TestBase;
@@ -82,27 +83,33 @@ public class TableUndefinedSize extends TestBase {
         });
         controls.addComponent(pageLength);
 
-        CheckBox cb = new CheckBox("Column 1", new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                tbl.setColumnCollapsed("Column 1", !event.getButton()
-                                .booleanValue());
-                if (event.getButton().booleanValue()) {
+        CheckBox cb = new CheckBox("Column 1");
+        cb.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                Boolean value = (Boolean) event.getProperty().getValue();
+                tbl.setColumnCollapsed("Column 1", !value);
+                if (value) {
                     print("Column 1 visible");
                 } else {
                     print("Column 1 hidden");
                 }
-                    }
+            }
         });
         cb.setImmediate(true);
         cb.setValue(true);
         visibilities.addComponent(cb);
 
-        cb = new CheckBox("Column 2", new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                tbl.setColumnCollapsed("Column 2", !event.getButton()
-                        .booleanValue());
+        cb = new CheckBox("Column 2");
+        cb.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                Boolean value = (Boolean) event.getProperty().getValue();
+                tbl.setColumnCollapsed("Column 2", !value);
 
-                if (event.getButton().booleanValue()) {
+                if (value) {
                     print("Column 2 visible");
                 } else {
                     print("Column 2 hidden");
@@ -113,12 +120,17 @@ public class TableUndefinedSize extends TestBase {
         cb.setValue(true);
         visibilities.addComponent(cb);
 
-        cb = new CheckBox("Column 3", new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                tbl.setColumnCollapsed("Column 3", !event.getButton()
-                        .booleanValue());
+        cb = new CheckBox("Column 3");
+
+        cb.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                Boolean value = (Boolean) event.getProperty().getValue();
+
+                tbl.setColumnCollapsed("Column 3", !value);
 
-                if (event.getButton().booleanValue()) {
+                if (value) {
                     print("Column 3 visible");
                 } else {
                     print("Column 3 hidden");
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
index ff1ac96e26..f81df5f06b 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
@@ -48,8 +48,8 @@ public class TreeFiltering extends TestBase {
         filterType.addListener(new ValueChangeListener() {

 

             public void valueChange(ValueChangeEvent event) {

-                cont.setIncludeParentsWhenFiltering(((CheckBox) event

-                        .getProperty()).booleanValue());

+                cont.setIncludeParentsWhenFiltering((Boolean) ((CheckBox) event

+                        .getProperty()).getValue());

                 ccTree.requestRepaint();

             }

         });

diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
index 6c051f4b1e..93d9d90ffc 100644
--- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
@@ -1,11 +1,10 @@
 package com.vaadin.tests.components.window;
 
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.util.LoremIpsum;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
@@ -16,7 +15,7 @@ public class LazyWindowResize extends AbstractTestCase {
 
     private Window mainWindow;
     private Window subWindow;
-    private Button lazyMode;
+    private CheckBox lazyMode;
     private Log log = new Log(5);
     private CheckBox resizeListenerCheckBox;
 
@@ -56,19 +55,21 @@ public class LazyWindowResize extends AbstractTestCase {
 
         lazyMode = new CheckBox("Lazy resize");
         lazyMode.setImmediate(true);
-        lazyMode.addListener(new ClickListener() {
+        lazyMode.addListener(new ValueChangeListener() {
 
-            public void buttonClick(ClickEvent event) {
-                setLazy(lazyMode.booleanValue());
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                setLazy((Boolean) lazyMode.getValue());
             }
         });
 
         resizeListenerCheckBox = new CheckBox("Resize listener");
         resizeListenerCheckBox.setImmediate(true);
-        resizeListenerCheckBox.addListener(new ClickListener() {
+        resizeListenerCheckBox.addListener(new ValueChangeListener() {
 
-            public void buttonClick(ClickEvent event) {
-                if (resizeListenerCheckBox.booleanValue()) {
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                if ((Boolean) resizeListenerCheckBox.getValue()) {
                     subWindow.addListener(resizeListener);
                     mainWindow.addListener(resizeListener);
                 } else {
@@ -81,11 +82,12 @@ public class LazyWindowResize extends AbstractTestCase {
         });
         immediateCheckBox = new CheckBox("Windows immediate");
         immediateCheckBox.setImmediate(true);
-        immediateCheckBox.addListener(new ClickListener() {
+        immediateCheckBox.addListener(new ValueChangeListener() {
 
-            public void buttonClick(ClickEvent event) {
-                mainWindow.setImmediate(immediateCheckBox.booleanValue());
-                subWindow.setImmediate(immediateCheckBox.booleanValue());
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                mainWindow.setImmediate((Boolean) immediateCheckBox.getValue());
+                subWindow.setImmediate((Boolean) immediateCheckBox.getValue());
 
             }
 
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
index 62f998e20e..247672b590 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
+++ b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
@@ -1,9 +1,10 @@
 package com.vaadin.tests.components.window;
 
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
@@ -43,9 +44,11 @@ public class WindowResizeListener extends TestBase {
 
         CheckBox subwindow = new CheckBox("show subwindow");
         subwindow.setImmediate(true);
-        subwindow.addListener(new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                if (event.getButton().booleanValue()) {
+        subwindow.addListener(new Property.ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                if ((Boolean) event.getProperty().getValue()) {
                     getMainWindow().addWindow(subwin);
                 } else {
                     getMainWindow().removeWindow(subwin);
@@ -55,9 +58,11 @@ public class WindowResizeListener extends TestBase {
         getLayout().addComponent(subwindow);
 
         CheckBox immediate = new CheckBox("immediate");
-        immediate.addListener(new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                boolean booleanValue = event.getButton().booleanValue();
+        immediate.addListener(new Property.ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                boolean booleanValue = (Boolean) event.getProperty().getValue();
                 getMainWindow().setImmediate(booleanValue);
                 subwin.setImmediate(booleanValue);
             }
diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index 0d47cc426d..c3c69207e7 100644
--- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
@@ -1,6 +1,8 @@
 package com.vaadin.tests.containers;

 

 import com.vaadin.data.Item;

+import com.vaadin.data.Property.ValueChangeEvent;

+import com.vaadin.data.Property.ValueChangeListener;

 import com.vaadin.data.util.BeanItemContainer;

 import com.vaadin.terminal.Sizeable;

 import com.vaadin.tests.components.TestBase;

@@ -84,17 +86,18 @@ public class BeanItemContainerFilteringTest extends TestBase {
             filterString = new TextField("Filter string:", "1");

             vl.addComponent(filterString);

 

-            final CheckBox cb = new CheckBox("Filter on value",

-                    new Button.ClickListener() {

-                        public void buttonClick(ClickEvent event) {

-                            container.removeAllContainerFilters();

-                            if (((CheckBox) event.getSource()).booleanValue()) {

-                                container.addContainerFilter("value",

-                                        filterString.getValue().toString(),

-                                        false, false);

-                            }

-                        }

-                    });

+            final CheckBox cb = new CheckBox("Filter on value");

+            cb.addListener(new ValueChangeListener() {

+

+                @Override

+                public void valueChange(ValueChangeEvent event) {

+                    container.removeAllContainerFilters();

+                    if ((Boolean) ((CheckBox) event.getProperty()).getValue()) {

+                        container.addContainerFilter("value", filterString

+                                .getValue().toString(), false, false);

+                    }

+                }

+            });

             cb.setImmediate(true);

             vl.addComponent(cb);

 

diff --git a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index 154118a393..e57bdbb7e3 100644
--- a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
@@ -1,6 +1,8 @@
 package com.vaadin.tests.containers;

 

 import com.vaadin.data.Item;

+import com.vaadin.data.Property.ValueChangeEvent;

+import com.vaadin.data.Property.ValueChangeListener;

 import com.vaadin.data.util.IndexedContainer;

 import com.vaadin.terminal.Sizeable;

 import com.vaadin.tests.components.TestBase;

@@ -51,10 +53,13 @@ public class IndexedContainerFilteringTest extends TestBase {
         filterString = new TextField("Filter string:", "1");

         vl.addComponent(filterString);

 

-        final CheckBox cb = new CheckBox("Filter", new Button.ClickListener() {

-            public void buttonClick(ClickEvent event) {

+        final CheckBox cb = new CheckBox("Filter");

+        cb.addListener(new ValueChangeListener() {

+

+            @Override

+            public void valueChange(ValueChangeEvent event) {

                 container.removeAllContainerFilters();

-                if (((CheckBox) event.getSource()).booleanValue()) {

+                if ((Boolean) ((CheckBox) event.getProperty()).getValue()) {

                     container.addContainerFilter("column1", filterString

                             .getValue().toString(), false, false);

                 }

diff --git a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java
index bf7ce6175a..0a1c592876 100644
--- a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java
+++ b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java
@@ -29,8 +29,8 @@ public class TestItemSorter extends TestBase {
 
             public int compare(Object o1, Object o2) {
                 if (o1 instanceof CheckBox && o2 instanceof CheckBox) {
-                    Boolean b1 = ((CheckBox) o1).booleanValue();
-                    return b1.compareTo(((CheckBox) o2).booleanValue());
+                    Boolean b1 = (Boolean) ((CheckBox) o1).getValue();
+                    return b1.compareTo((Boolean) ((CheckBox) o2).getValue());
                 } else if (o1 instanceof Button && o2 instanceof Button) {
                     String caption1 = ((Button) o1).getCaption().toLowerCase();
                     String caption2 = ((Button) o2).getCaption().toLowerCase();
diff --git a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java
index 4a719bfa7f..4ef7023aa6 100644
--- a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java
+++ b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java
@@ -48,7 +48,7 @@ public class TreeDragStart extends TestBase {
         checkBox.setValue(true);
         checkBox.addListener(new ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
-                if (((CheckBox) event.getProperty()).booleanValue()) {
+                if ((Boolean) ((CheckBox) event.getProperty()).getValue()) {
                     tree.setDragMode(TreeDragMode.NODE);
                 } else {
                     tree.setDragMode(TreeDragMode.NONE);
diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
index 4267a7ea91..9855033b55 100644
--- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
@@ -5,15 +5,17 @@ import java.util.Iterator;
 import java.util.Locale;
 
 import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.event.Action;
 import com.vaadin.terminal.ExternalResource;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
@@ -139,7 +141,7 @@ public class LiferayThemeDemo extends Application {
         l.setMargin(true);
         l.setSpacing(true);
 
-        Button b = new Button("Normal Button");
+        AbstractComponent b = new Button("Normal Button");
         b.setDescription("This is a tooltip!");
         l.addComponent(b);
 
@@ -310,12 +312,15 @@ public class LiferayThemeDemo extends Application {
             }
         }
 
-        closable.addListener(new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
+        closable.addListener(new Property.ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
                 Iterator<Component> it = ts.getComponentIterator();
                 for (; it.hasNext();) {
                     Component c = it.next();
-                    ts.getTab(c).setClosable(event.getButton().booleanValue());
+                    ts.getTab(c).setClosable(
+                            (Boolean) event.getProperty().getValue());
                 }
             }
         });
@@ -462,12 +467,14 @@ public class LiferayThemeDemo extends Application {
         sp3.setSecondComponent(sp4);
         l.addComponent(sp3);
 
-        lockCheckBox.addListener(new ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                sp.setLocked(event.getButton().booleanValue());
-                sp2.setLocked(event.getButton().booleanValue());
-                sp3.setLocked(event.getButton().booleanValue());
-                sp4.setLocked(event.getButton().booleanValue());
+        lockCheckBox.addListener(new Property.ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                sp.setLocked((Boolean) event.getProperty().getValue());
+                sp2.setLocked((Boolean) event.getProperty().getValue());
+                sp3.setLocked((Boolean) event.getProperty().getValue());
+                sp4.setLocked((Boolean) event.getProperty().getValue());
             }
         });
 
diff --git a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
index e29c7559b3..cdbcb086dc 100644
--- a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
+++ b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.layouts;
 
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.TextField;
@@ -24,15 +24,17 @@ public class FormLayoutWithInvisibleComponent extends TestBase {
     @Override
     protected void setup() {
         FormLayout formLayout = new FormLayout();
-        CheckBox control = new CheckBox("Messages On/Off",
-                new Button.ClickListener() {
-                    public void buttonClick(ClickEvent event) {
-                        messages.setVisible(event.getButton().booleanValue());
-                        messages.setRequired(true);
-                        messages.setCaption("Messages visible");
-                    }
-
-                });
+        CheckBox control = new CheckBox("Messages On/Off");
+        control.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                messages.setVisible((Boolean) event.getProperty().getValue());
+                messages.setRequired(true);
+                messages.setCaption("Messages visible");
+            }
+
+        });
         control.setImmediate(true);
         formLayout.addComponent(control);
 
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
index 31ee15983e..992c037611 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
@@ -69,7 +69,7 @@ public class TestLayoutPerformance extends TestBase {
                 Layout layout = getCurrentLayout();

                 for (int i = 0; i < components; i++) {

                     Component component = newTestComponent();

-                    if (cb.booleanValue()) {

+                    if ((Boolean) cb.getValue()) {

                         component.setCaption("caption " + i);

                     }

                     layout.addComponent(component);

diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java
index 9425cd9bd2..36b29811ca 100644
--- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java
+++ b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.themes;
 
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.terminal.ThemeResource;
 import com.vaadin.terminal.UserError;
 import com.vaadin.ui.Button;
@@ -29,8 +31,11 @@ public class ButtonsTest extends com.vaadin.Application {
         setMainWindow(main);
         setTheme("reindeer");
 
-        themeToggle = new CheckBox("Runo theme", new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
+        themeToggle = new CheckBox("Runo theme");
+        themeToggle.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
                 if (getTheme() == "reindeer") {
                     setTheme("runo");
                 } else {
@@ -41,8 +46,11 @@ public class ButtonsTest extends com.vaadin.Application {
         themeToggle.setStyleName("small");
         themeToggle.setImmediate(true);
 
-        styleToggle = new CheckBox("Black style", new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
+        styleToggle = new CheckBox("Black style");
+        styleToggle.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
                 if (!main.getContent().getStyleName().contains("black")) {
                     main.getContent().setStyleName("black");
                 } else {
@@ -53,8 +61,11 @@ public class ButtonsTest extends com.vaadin.Application {
         styleToggle.setImmediate(true);
         styleToggle.setStyleName("small");
 
-        iconToggle = new CheckBox("64x icons", new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
+        iconToggle = new CheckBox("64x icons");
+        iconToggle.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
                 largeIcons = !largeIcons;
                 recreateAll();
             }
@@ -62,13 +73,15 @@ public class ButtonsTest extends com.vaadin.Application {
         iconToggle.setImmediate(true);
         iconToggle.setStyleName("small");
 
-        nativeToggle = new CheckBox("Native buttons",
-                new Button.ClickListener() {
-                    public void buttonClick(ClickEvent event) {
-                        nativeButtons = !nativeButtons;
-                        recreateAll();
-                    }
-                });
+        nativeToggle = new CheckBox("Native buttons");
+        nativeToggle.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                nativeButtons = !nativeButtons;
+                recreateAll();
+            }
+        });
         nativeToggle.setImmediate(true);
         nativeToggle.setStyleName("small");
 
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java
index fbab5c5244..c24d767b76 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java
@@ -1,10 +1,11 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.terminal.Sizeable;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Layout;
@@ -114,11 +115,12 @@ public class Ticket1983 extends Application {
             ol.addComponent(button);
             leftSide.setFirstComponent(ol);
 
-            button = new CheckBox("Two col");
-            button.addListener(new Button.ClickListener() {
-                public void buttonClick(ClickEvent event) {
-                    Button b = event.getButton();
-                    if (((Boolean) b.getValue()).booleanValue()) {
+            CheckBox checkBox = new CheckBox("Two col");
+            checkBox.addListener(new ValueChangeListener() {
+
+                @Override
+                public void valueChange(ValueChangeEvent event) {
+                    if ((Boolean) event.getProperty().getValue()) {
                         table.setVisibleColumns(new Object[] { propId, propId2 });
                     } else {
                         table.setVisibleColumns(new Object[] { propId });
@@ -127,7 +129,7 @@ public class Ticket1983 extends Application {
                 }
 
             });
-            ol.addComponent(button);
+            ol.addComponent(checkBox);
 
             return leftSide;
         }
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java
index 4796451dc0..8890490860 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java
@@ -23,7 +23,7 @@ public class Ticket2001 extends Application {
         final CheckBox b = new CheckBox("fixed width: 30px", false);
         b.addListener(new Property.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
-                if (b.booleanValue()) {
+                if ((Boolean) b.getValue()) {
                     l.setWidth("30px");
                 } else {
                     l.setWidth(null);
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java
index 85a5a4b701..fa75e03945 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java
@@ -36,7 +36,7 @@ public class Ticket2038 extends Application {
         b.setImmediate(true);
         b.addListener(new Property.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
-                tf.setRequiredError(b.booleanValue() ? "Field must not be empty"
+                tf.setRequiredError((Boolean) b.getValue() ? "Field must not be empty"
                         : null);
             }
         });
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java
index 8b95fa35a2..4f974c9321 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.terminal.ExternalResource;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
@@ -48,8 +48,11 @@ public class Ticket2104 extends Application {
                 "multiSelect"));
         cb.setImmediate(true);
         ol.addComponent(cb);
-        cb = new CheckBox("icon", new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
+        cb = new CheckBox("icon");
+        cb.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
                 if (tree.getItemIconPropertyId() == null) {
                     tree.setItemIconPropertyId("icon");
                 } else {
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
index 199b278343..1de418a9a7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
@@ -51,7 +51,7 @@ public class Ticket2107 extends Application {
         b.setImmediate(true);
         b.addListener(new Property.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
-                tf.setRequiredError(b.booleanValue() ? "Field must not be empty"
+                tf.setRequiredError((Boolean) b.getValue() ? "Field must not be empty"
                         : null);
             }
         });
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
index 5a48156367..ba3e259dc4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
@@ -2,6 +2,7 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
@@ -45,9 +46,9 @@ public class Ticket2151 extends Application {
 
     }
 
-    private void check(Class<? extends Button> class1) {
+    private void check(Class<? extends AbstractField> class1) {
         boolean ok = false;
-        Button b;
+        AbstractField b;
         try {
             b = class1.newInstance();
             b.setCaption("Button of type " + class1.getSimpleName());
@@ -74,9 +75,9 @@ public class Ticket2151 extends Application {
 
     }
 
-    private void checkDataBinding(Class<? extends Button> class1) {
+    private void checkDataBinding(Class<? extends AbstractField> class1) {
         boolean ok = false;
-        Button b;
+        AbstractField b;
         try {
             b = class1.newInstance();
             b.setCaption("Button of type " + class1.getSimpleName());