Use CheckBox instead of Button.setSwitchMode

Ignore deprecated API in component tests

svn changeset:16272/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/components/button/Buttons2.java b/tests/src/com/vaadin/tests/components/button/Buttons2.java
index b4cdbff73ca6f945f6ea865b860a89c34967874f..3c2d1da30c14a21774eae48b25c39aaa179491ed 100644 (file)
--- a/tests/src/com/vaadin/tests/components/button/Buttons2.java
+++ b/tests/src/com/vaadin/tests/components/button/Buttons2.java
@@ -10,6 +10,7 @@ public class Buttons2 extends AbstractFieldTest<Button> implements
 \r
     private Command<Button, Boolean> switchModeCommand = new Command<Button, Boolean>() {\r
 \r
+        @SuppressWarnings("deprecation")\r
         public void execute(Button c, Boolean value, Object data) {\r
             c.setSwitchMode(value);\r
         }\r

diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index cad8263634cafa482cdc979c0a48a5a7e3be09eb..20f1ece65ea2371e012e6a73af8cfbf9982bdd7c 100644 (file)
--- a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
@@ -17,6 +17,7 @@ public class CheckBoxes2 extends AbstractFieldTest<CheckBox> implements
 \r
     private Command<CheckBox, Boolean> switchModeCommand = new Command<CheckBox, Boolean>() {\r
 \r
+        @SuppressWarnings("deprecation")\r
         public void execute(CheckBox c, Boolean value, Object data) {\r
             c.setSwitchMode(value);\r
         }\r

diff --git a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
index 47f420407bdb5ce6431c961249eff22735bf88af..77b628957277acdd5ec0eb29973b444f3c2ec965 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -9,6 +9,7 @@ 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.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table;
@@ -121,16 +122,20 @@ public class ItemClickEvents extends TestBase {
 
     private static HorizontalLayout createHorizontalLayout(Component c) {
         HorizontalLayout layout = new HorizontalLayout();
-        Button b = new Button("immediate", new MethodProperty<Boolean>(c,
+        CheckBox b = new CheckBox("immediate", new MethodProperty<Boolean>(c,
                 "immediate"));
+        b.setImmediate(true);
         layout.addComponent(b);
-        b = new Button("selectable", new MethodProperty<Boolean>(c,
+        b = new CheckBox("selectable", new MethodProperty<Boolean>(c,
                 "selectable"));
+        b.setImmediate(true);
         layout.addComponent(b);
-        b = new Button("nullsel", new MethodProperty<Boolean>(c,
+        b = new CheckBox("nullsel", new MethodProperty<Boolean>(c,
                 "nullSelectionAllowed"));
+        b.setImmediate(true);
         layout.addComponent(b);
-        b = new Button("multi", new MethodProperty<Boolean>(c, "multiSelect"));
+        b = new CheckBox("multi", new MethodProperty<Boolean>(c, "multiSelect"));
+        b.setImmediate(true);
         layout.addComponent(b);
         return layout;
     }

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1710.java b/tests/src/com/vaadin/tests/tickets/Ticket1710.java
index abf981f25188fa3385dc8f745eacddd4efba4724..404301dfa571d453995a07c5728b094e21732b2b 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -46,8 +46,10 @@ public class Ticket1710 extends com.vaadin.Application {
         final VerticalLayout orderedLayout = new VerticalLayout();\r
         LayoutTestingPanel oltp = new LayoutTestingPanel("OrderedLayout",\r
                 orderedLayout);\r
-        hidingControls.addComponent(new CheckBox("OrderedLayout",\r
-                new MethodProperty<Boolean>(oltp, "visible")));\r
+        CheckBox cb = new CheckBox("OrderedLayout",\r
+                new MethodProperty<Boolean>(oltp, "visible"));\r
+        cb.setImmediate(true);\r
+        hidingControls.addComponent(cb);\r
         lo.addComponent(oltp);\r
         orderedLayout.setSpacing(false);\r
         addFields(orderedLayout);\r
@@ -55,16 +57,20 @@ public class Ticket1710 extends com.vaadin.Application {
         // GridLayout\r
         GridLayout grid = new GridLayout(1, 1);\r
         Panel g1tp = new LayoutTestingPanel("Gridlayout with 1 column", grid);\r
-        hidingControls.addComponent(new CheckBox("GridLayout (1col)",\r
-                new MethodProperty<Boolean>(g1tp, "visible")));\r
+        cb = new CheckBox("GridLayout (1col)", new MethodProperty<Boolean>(\r
+                g1tp, "visible"));\r
+        cb.setImmediate(true);\r
+        hidingControls.addComponent(cb);\r
         g1tp.setVisible(false);\r
         lo.addComponent(g1tp);\r
         grid.setSpacing(true);\r
         addFields(grid);\r
         GridLayout grid2 = new GridLayout(2, 1);\r
         Panel g2tp = new LayoutTestingPanel("Gridlayout with 2 columns", grid2);\r
-        hidingControls.addComponent(new Button("GridLayout (2cols)",\r
-                new MethodProperty<Boolean>(g2tp, "visible")));\r
+        cb = new CheckBox("GridLayout (2cols)", new MethodProperty<Boolean>(\r
+                g2tp, "visible"));\r
+        cb.setImmediate(true);\r
+        hidingControls.addComponent(cb);\r
         g2tp.setVisible(false);\r
         lo.addComponent(g2tp);\r
         grid2.setSpacing(true);\r
@@ -74,8 +80,10 @@ public class Ticket1710 extends com.vaadin.Application {
         VerticalLayout el = new VerticalLayout();\r
         Panel elp = new LayoutTestingPanel(\r
                 "ExpandLayout width first component expanded", el);\r
-        hidingControls.addComponent(new Button("ExpandLayout (vertical)",\r
-                new MethodProperty<Boolean>(elp, "visible")));\r
+        cb = new CheckBox("ExpandLayout (vertical)",\r
+                new MethodProperty<Boolean>(elp, "visible"));\r
+        cb.setImmediate(true);\r
+        hidingControls.addComponent(cb);\r
         elp.setVisible(false);\r
         el.setHeight("700px");\r
         addFields(el);\r
@@ -86,8 +94,10 @@ public class Ticket1710 extends com.vaadin.Application {
         HorizontalLayout elh = new HorizontalLayout();\r
         Panel elhp = new LayoutTestingPanel(\r
                 "ExpandLayout width first component expanded; horizontal", elh);\r
-        hidingControls.addComponent(new Button("ExpandLayout (horizontal)",\r
-                new MethodProperty<Boolean>(elhp, "visible")));\r
+        cb = new CheckBox("ExpandLayout (horizontal)",\r
+                new MethodProperty<Boolean>(elhp, "visible"));\r
+        cb.setImmediate(true);\r
+        hidingControls.addComponent(cb);\r
         elhp.setVisible(false);\r
         elhp.setScrollable(true);\r
         elh.setWidth("2000px");\r
@@ -101,16 +111,20 @@ public class Ticket1710 extends com.vaadin.Application {
         // CustomLayout\r
         VerticalLayout cl = new VerticalLayout();\r
         Panel clp = new LayoutTestingPanel("CustomLayout", cl);\r
-        hidingControls.addComponent(new Button("CustomLayout",\r
-                new MethodProperty<Boolean>(clp, "visible")));\r
+        cb = new CheckBox("CustomLayout", new MethodProperty<Boolean>(clp,\r
+                "visible"));\r
+        cb.setImmediate(true);\r
+        hidingControls.addComponent(cb);\r
         clp.setVisible(false);\r
         lo.addComponent(clp);\r
         cl.addComponent(new Label("<<< Add customlayout testcase here >>>"));\r
 \r
         // Form\r
         Panel formPanel = new Panel("Form");\r
-        hidingControls.addComponent(new Button("Form",\r
-                new MethodProperty<Boolean>(formPanel, "visible")));\r
+        cb = new CheckBox("Form", new MethodProperty<Boolean>(formPanel,\r
+                "visible"));\r
+        cb.setImmediate(true);\r
+        hidingControls.addComponent(cb);\r
         formPanel.setVisible(false);\r
         formPanel.addComponent(getFormPanelExample());\r
         lo.addComponent(formPanel);\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2104.java b/tests/src/com/vaadin/tests/tickets/Ticket2104.java
index 5df17804133c443d3391b139f740abda07d44c21..8b95fa35a21f4d1777954d309a2aebc2398def0e 100644 (file)
--- a/tests/src/com/vaadin/tests/tickets/Ticket2104.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2104.java
@@ -7,6 +7,7 @@ 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;
 import com.vaadin.ui.Table;
@@ -31,23 +32,23 @@ public class Ticket2104 extends Application {
 
         HorizontalLayout ol = new HorizontalLayout();
         main.addComponent(ol);
-        Button b = new Button("immediate", new MethodProperty<Boolean>(tree,
-                "immediate"));
-        b.setImmediate(true);
-        ol.addComponent(b);
-        b = new Button("selectable", new MethodProperty<Boolean>(tree,
+        CheckBox cb = new CheckBox("immediate", new MethodProperty<Boolean>(
+                tree, "immediate"));
+        cb.setImmediate(true);
+        ol.addComponent(cb);
+        cb = new CheckBox("selectable", new MethodProperty<Boolean>(tree,
                 "selectable"));
-        b.setImmediate(true);
-        ol.addComponent(b);
-        b = new Button("nullsel", new MethodProperty<Boolean>(tree,
+        cb.setImmediate(true);
+        ol.addComponent(cb);
+        cb = new CheckBox("nullsel", new MethodProperty<Boolean>(tree,
                 "nullSelectionAllowed"));
-        b.setImmediate(true);
-        ol.addComponent(b);
-        b = new Button("multi",
-                new MethodProperty<Boolean>(tree, "multiSelect"));
-        b.setImmediate(true);
-        ol.addComponent(b);
-        b = new Button("icon", new Button.ClickListener() {
+        cb.setImmediate(true);
+        ol.addComponent(cb);
+        cb = new CheckBox("multi", new MethodProperty<Boolean>(tree,
+                "multiSelect"));
+        cb.setImmediate(true);
+        ol.addComponent(cb);
+        cb = new CheckBox("icon", new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
                 if (tree.getItemIconPropertyId() == null) {
                     tree.setItemIconPropertyId("icon");
@@ -57,7 +58,8 @@ public class Ticket2104 extends Application {
 
             }
         });
-        ol.addComponent(b);
+        cb.setImmediate(true);
+        ol.addComponent(cb);
 
         main.addComponent(tree);
         tree.setImmediate(true);
@@ -87,22 +89,22 @@ public class Ticket2104 extends Application {
 
         ol = new HorizontalLayout();
         main.addComponent(ol);
-        b = new Button("immediate", new MethodProperty<Boolean>(table,
+        cb = new CheckBox("immediate", new MethodProperty<Boolean>(table,
                 "immediate"));
-        b.setImmediate(true);
-        ol.addComponent(b);
-        b = new Button("selectable", new MethodProperty<Boolean>(table,
+        cb.setImmediate(true);
+        ol.addComponent(cb);
+        cb = new CheckBox("selectable", new MethodProperty<Boolean>(table,
                 "selectable"));
-        b.setImmediate(true);
-        ol.addComponent(b);
-        b = new Button("nullsel", new MethodProperty<Boolean>(table,
+        cb.setImmediate(true);
+        ol.addComponent(cb);
+        cb = new CheckBox("nullsel", new MethodProperty<Boolean>(table,
                 "nullSelectionAllowed"));
-        b.setImmediate(true);
-        ol.addComponent(b);
-        b = new Button("multi", new MethodProperty<Boolean>(table,
+        cb.setImmediate(true);
+        ol.addComponent(cb);
+        cb = new CheckBox("multi", new MethodProperty<Boolean>(table,
                 "multiSelect"));
-        b.setImmediate(true);
-        ol.addComponent(b);
+        cb.setImmediate(true);
+        ol.addComponent(cb);
         main.addComponent(table);
         table.setWidth("150px");
         table.setImmediate(true);