#5865. Deprecated usage of Button as CheckBox

svn changeset:15870/svn branch:6.5

13 files changed, 47 insertions, 36 deletions

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 0d193168e6..af85513692 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -49,7 +49,6 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      */
     public Button() {
         setValue(Boolean.FALSE);
-        setSwitchMode(false);
     }
 
     /**
@@ -105,7 +104,9 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      * @param state
      *            the Initial state of the switch-button.
      * @param initialState
+     * @deprecated use {@link CheckBox} instead of Button in "switchmode"
      */
+    @Deprecated
     public Button(String caption, boolean initialState) {
         setCaption(caption);
         setValue(Boolean.valueOf(initialState));
@@ -118,7 +119,9 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      * @param state
      *            the Initial state of the switch-button.
      * @param dataSource
+     * @deprecated use {@link CheckBox} instead of Button in "switchmode"
      */
+    @Deprecated
     public Button(String caption, Property dataSource) {
         setCaption(caption);
         setSwitchMode(true);
diff --git a/src/com/vaadin/ui/NativeButton.java b/src/com/vaadin/ui/NativeButton.java
index f84f270b26..6d128b4bb4 100644
--- a/src/com/vaadin/ui/NativeButton.java
+++ b/src/com/vaadin/ui/NativeButton.java
@@ -32,7 +32,9 @@ public class NativeButton extends Button {
      * @param state
      *            the Initial state of the switch-button.
      * @param initialState
+     * @deprecated use the {@link CheckBox} component instead
      */
+    @Deprecated
     public NativeButton(String caption, boolean initialState) {
         super(caption, initialState);
     }
@@ -43,7 +45,9 @@ public class NativeButton extends Button {
      * @param state
      *            the Initial state of the switch-button.
      * @param dataSource
+     * @deprecated use the {@link CheckBox} component instead
      */
+    @Deprecated
     public NativeButton(String caption, Property dataSource) {
         super(caption, dataSource);
     }
diff --git a/tests/src/com/vaadin/tests/TestForRichTextEditor.java b/tests/src/com/vaadin/tests/TestForRichTextEditor.java
index 11fb97fce0..50b7be91ef 100644
--- a/tests/src/com/vaadin/tests/TestForRichTextEditor.java
+++ b/tests/src/com/vaadin/tests/TestForRichTextEditor.java
@@ -8,6 +8,7 @@ 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;
 import com.vaadin.ui.RichTextArea;
@@ -47,8 +48,7 @@ public class TestForRichTextEditor extends CustomComponent implements
         l = new Label("", Label.CONTENT_XHTML);
         main.addComponent(l);
 
-        Button b = new Button("enabled");
-        b.setSwitchMode(true);
+        CheckBox b = new CheckBox("enabled");
         b.setImmediate(true);
         b.addListener(new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1710.java b/tests/src/com/vaadin/tests/tickets/Ticket1710.java
index 1d326acd18..abf981f251 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -9,6 +9,7 @@ import com.vaadin.terminal.SystemError;
 import com.vaadin.terminal.ThemeResource;

 import com.vaadin.ui.AbstractComponent;

 import com.vaadin.ui.Button;

+import com.vaadin.ui.CheckBox;

 import com.vaadin.ui.Component;

 import com.vaadin.ui.ComponentContainer;

 import com.vaadin.ui.DateField;

@@ -45,7 +46,7 @@ public class Ticket1710 extends com.vaadin.Application {
         final VerticalLayout orderedLayout = new VerticalLayout();

         LayoutTestingPanel oltp = new LayoutTestingPanel("OrderedLayout",

                 orderedLayout);

-        hidingControls.addComponent(new Button("OrderedLayout",

+        hidingControls.addComponent(new CheckBox("OrderedLayout",

                 new MethodProperty<Boolean>(oltp, "visible")));

         lo.addComponent(oltp);

         orderedLayout.setSpacing(false);

@@ -54,7 +55,7 @@ public class Ticket1710 extends com.vaadin.Application {
         // GridLayout

         GridLayout grid = new GridLayout(1, 1);

         Panel g1tp = new LayoutTestingPanel("Gridlayout with 1 column", grid);

-        hidingControls.addComponent(new Button("GridLayout (1col)",

+        hidingControls.addComponent(new CheckBox("GridLayout (1col)",

                 new MethodProperty<Boolean>(g1tp, "visible")));

         g1tp.setVisible(false);

         lo.addComponent(g1tp);

@@ -127,7 +128,7 @@ public class Ticket1710 extends com.vaadin.Application {
         Button fb1 = new Button("Test button");

         fb1.setComponentError(new SystemError("Test error"));

         f.addField("fb1", fb1);

-        Button fb2 = new Button("Test button", true);

+        CheckBox fb2 = new CheckBox("Test button", true);

         fb2.setComponentError(new SystemError("Test error"));

         f.addField("fb2", fb2);

         TextField ft1 = new TextField("With caption");

@@ -149,9 +150,8 @@ public class Ticket1710 extends com.vaadin.Application {
         button.setComponentError(new SystemError("Test error"));

         lo.addComponent(button);

 

-        Button b2 = new Button("Test button");

+        CheckBox b2 = new CheckBox("Test button");

         b2.setComponentError(new SystemError("Test error"));

-        b2.setSwitchMode(true);

         lo.addComponent(b2);

 

         TextField t1 = new TextField("With caption");

@@ -223,11 +223,11 @@ public class Ticket1710 extends com.vaadin.Application {
         Layout testedLayout;

 

         HorizontalLayout controls = new HorizontalLayout();

-        Button marginLeft = new Button("m-left", false);

-        Button marginRight = new Button("m-right", false);

-        Button marginTop = new Button("m-top", false);

-        Button marginBottom = new Button("m-bottom", false);

-        Button spacing = new Button("spacing", false);

+        CheckBox marginLeft = new CheckBox("m-left", false);

+        CheckBox marginRight = new CheckBox("m-right", false);

+        CheckBox marginTop = new CheckBox("m-top", false);

+        CheckBox marginBottom = new CheckBox("m-bottom", false);

+        CheckBox spacing = new CheckBox("spacing", false);

         VerticalLayout testPanelLayout = new VerticalLayout();

 

         LayoutTestingPanel(String caption, Layout layout) {

@@ -254,13 +254,13 @@ public class Ticket1710 extends com.vaadin.Application {
             controls.addComponent(new Label("width"));

             controls.addComponent(new TextField(new MethodProperty<Float>(

                     testedLayout, "width")));

-            controls.addComponent(new Button("%", new MethodProperty<Boolean>(

-                    this, "widthPercents")));

+            controls.addComponent(new CheckBox("%",

+                    new MethodProperty<Boolean>(this, "widthPercents")));

             controls.addComponent(new Label("height"));

             controls.addComponent(new TextField(new MethodProperty<Float>(

                     testedLayout, "height")));

-            controls.addComponent(new Button("%", new MethodProperty<Boolean>(

-                    this, "heightPercents")));

+            controls.addComponent(new CheckBox("%",

+                    new MethodProperty<Boolean>(this, "heightPercents")));

             controls.addComponent(marginLeft);

             controls.addComponent(marginRight);

             controls.addComponent(marginTop);

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1857.java b/tests/src/com/vaadin/tests/tickets/Ticket1857.java
index 1fda979198..f82467b519 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1857.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1857.java
@@ -5,7 +5,7 @@ import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
-import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
@@ -35,7 +35,8 @@ public class Ticket1857 extends Application implements Handler {
         el.addComponent(footer);
         footer.setSpacing(true);
 
-        final Button actionHandlerEnabler = new Button("Action handlers", false);
+        final CheckBox actionHandlerEnabler = new CheckBox("Action handlers",
+                false);
         footer.addComponent(actionHandlerEnabler);
         actionHandlerEnabler.setImmediate(true);
         actionHandlerEnabler.addListener(new Property.ValueChangeListener() {
@@ -48,7 +49,7 @@ public class Ticket1857 extends Application implements Handler {
             }
         });
 
-        final Button cellStylesEnabler = new Button("Cell styles", false);
+        final CheckBox cellStylesEnabler = new CheckBox("Cell styles", false);
         footer.addComponent(cellStylesEnabler);
         cellStylesEnabler.setImmediate(true);
         cellStylesEnabler.addListener(new Property.ValueChangeListener() {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1983.java b/tests/src/com/vaadin/tests/tickets/Ticket1983.java
index 26e61e9cf4..12198ab247 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1983.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1983.java
@@ -5,6 +5,7 @@ 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;
 import com.vaadin.ui.SplitPanel;
@@ -114,7 +115,7 @@ public class Ticket1983 extends Application {
             ol.addComponent(button);
             leftSide.setFirstComponent(ol);
 
-            button = new Button("Two col");
+            button = new CheckBox("Two col");
             button.addListener(new Button.ClickListener() {
                 public void buttonClick(ClickEvent event) {
                     Button b = event.getButton();
@@ -127,7 +128,6 @@ public class Ticket1983 extends Application {
                 }
 
             });
-            button.setSwitchMode(true);
             ol.addComponent(button);
 
             return leftSide;
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket20.java b/tests/src/com/vaadin/tests/tickets/Ticket20.java
index 51f1a938b9..55fee95de3 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket20.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket20.java
@@ -5,6 +5,7 @@ import com.vaadin.data.Validator;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.validator.CompositeValidator;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
 
@@ -79,8 +80,8 @@ public class Ticket20 extends Application {
                 "readOnly", "readThrough", "invalidCommitted",
                 "validationVisible" };
         for (int i = 0; i < visibleProps.length; i++) {
-            Button b = new Button(visibleProps[i], new MethodProperty<Boolean>(
-                    tx, visibleProps[i]));
+            CheckBox b = new CheckBox(visibleProps[i],
+                    new MethodProperty<Boolean>(tx, visibleProps[i]));
             b.setImmediate(true);
             mainWin.addComponent(b);
         }
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2001.java b/tests/src/com/vaadin/tests/tickets/Ticket2001.java
index 64dd47c2e2..4796451dc0 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2001.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2001.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
@@ -20,7 +20,7 @@ public class Ticket2001 extends Application {
         l.addComponent(new Label("row 2"));
         w.addComponent(l);
 
-        final Button b = new Button("fixed width: 30px", false);
+        final CheckBox b = new CheckBox("fixed width: 30px", false);
         b.addListener(new Property.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
                 if (b.booleanValue()) {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2038.java b/tests/src/com/vaadin/tests/tickets/Ticket2038.java
index ff5ceb22e7..85a5a4b701 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2038.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2038.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.Notification;
@@ -29,7 +29,7 @@ public class Ticket2038 extends Application {
         });
         w.addComponent(tf);
 
-        final Button b = new Button(
+        final CheckBox b = new CheckBox(
                 "Field should use error message. (!) should be shown when invalid.",
                 false);
         w.addComponent(b);
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2107.java b/tests/src/com/vaadin/tests/tickets/Ticket2107.java
index 4c185801c3..199b278343 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2107.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2107.java
@@ -4,7 +4,7 @@ import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Validator;
-import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.Notification;
@@ -44,7 +44,7 @@ public class Ticket2107 extends Application {
         });
         w.addComponent(tf);
 
-        final Button b = new Button(
+        final CheckBox b = new CheckBox(
                 "Field should use error message. (!) should be shown when empty.",
                 false);
         w.addComponent(b);
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2125.java b/tests/src/com/vaadin/tests/tickets/Ticket2125.java
index 378952489f..b296a4ff46 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2125.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2125.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
@@ -52,7 +52,7 @@ public class Ticket2125 extends Application {
                 }
 
             });
-            Button b = new Button("editmode", new MethodProperty<Boolean>(
+            CheckBox b = new CheckBox("editmode", new MethodProperty<Boolean>(
                     table, "editable"));
             b.setImmediate(true);
             addComponent(b);
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket736.java b/tests/src/com/vaadin/tests/tickets/Ticket736.java
index ba2e440673..ac7868cb48 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket736.java
@@ -9,6 +9,7 @@ import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Form;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Panel;
@@ -65,8 +66,8 @@ public class Ticket736 extends Application {
                 "readOnly", "readThrough", "writeThrough", "invalidCommitted",
                 "validationVisible", "immediate" };
         for (int i = 0; i < visibleProps.length; i++) {
-            Button b = new Button(visibleProps[i], new MethodProperty<Boolean>(
-                    f, visibleProps[i]));
+            CheckBox b = new CheckBox(visibleProps[i],
+                    new MethodProperty<Boolean>(f, visibleProps[i]));
             b.setImmediate(true);
             formProperties.addComponent(b);
         }
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket846.java b/tests/src/com/vaadin/tests/tickets/Ticket846.java
index 3f9e0ccf6f..23f3134308 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket846.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket846.java
@@ -4,6 +4,7 @@ import com.vaadin.Application;
 import com.vaadin.data.Validator;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
 
@@ -40,8 +41,8 @@ public class Ticket846 extends Application {
                 "readOnly", "readThrough", "invalidCommitted",
                 "validationVisible" };
         for (int i = 0; i < visibleProps.length; i++) {
-            Button b = new Button(visibleProps[i], new MethodProperty<Boolean>(
-                    tx, visibleProps[i]));
+            CheckBox b = new CheckBox(visibleProps[i],
+                    new MethodProperty<Boolean>(tx, visibleProps[i]));
             b.setImmediate(true);
             mainWin.addComponent(b);
         }