#5692 Generics and warnings cleanup in MethodProperty

svn changeset:15292/svn branch:6.5

12 files changed, 61 insertions, 51 deletions

diff --git a/tests/src/com/vaadin/tests/TestMethodProperty.java b/tests/src/com/vaadin/tests/TestMethodProperty.java
index d92006da6c..49a3c110fa 100644
--- a/tests/src/com/vaadin/tests/TestMethodProperty.java
+++ b/tests/src/com/vaadin/tests/TestMethodProperty.java
@@ -11,8 +11,8 @@ public class TestMethodProperty {
 
         MyTest myTest = new MyTest();
 
-        MethodProperty methodProperty2 = new MethodProperty(Integer.TYPE,
-                myTest, "getInt", "setInt", new Object[0],
+        MethodProperty<Integer> methodProperty2 = new MethodProperty<Integer>(
+                Integer.TYPE, myTest, "getInt", "setInt", new Object[0],
                 new Object[] { null }, 0);
 
         methodProperty2.setValue("3");
diff --git a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
index f8da70c55b..47f420407b 100644
--- a/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/tests/src/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -121,13 +121,16 @@ public class ItemClickEvents extends TestBase {
 
     private static HorizontalLayout createHorizontalLayout(Component c) {
         HorizontalLayout layout = new HorizontalLayout();
-        Button b = new Button("immediate", new MethodProperty(c, "immediate"));
+        Button b = new Button("immediate", new MethodProperty<Boolean>(c,
+                "immediate"));
         layout.addComponent(b);
-        b = new Button("selectable", new MethodProperty(c, "selectable"));
+        b = new Button("selectable", new MethodProperty<Boolean>(c,
+                "selectable"));
         layout.addComponent(b);
-        b = new Button("nullsel", new MethodProperty(c, "nullSelectionAllowed"));
+        b = new Button("nullsel", new MethodProperty<Boolean>(c,
+                "nullSelectionAllowed"));
         layout.addComponent(b);
-        b = new Button("multi", new MethodProperty(c, "multiSelect"));
+        b = new Button("multi", new MethodProperty<Boolean>(c, "multiSelect"));
         layout.addComponent(b);
         return layout;
     }
diff --git a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
index fec830fd66..71dc987e56 100644
--- a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
+++ b/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
@@ -55,7 +55,7 @@ public class TablePageLengthUpdate extends TestBase {
         addComponent(updateButton);
 
         TextField tableHeight = new TextField("Table height",
-                new MethodProperty(this, "tableHeight"));
+                new MethodProperty<String>(this, "tableHeight"));
         tableHeight.setImmediate(true);
         addComponent(tableHeight);
     }
diff --git a/tests/src/com/vaadin/tests/server/TestSerialization.java b/tests/src/com/vaadin/tests/server/TestSerialization.java
index a938ab3a32..03a9d3e262 100644
--- a/tests/src/com/vaadin/tests/server/TestSerialization.java
+++ b/tests/src/com/vaadin/tests/server/TestSerialization.java
@@ -27,7 +27,7 @@ public class TestSerialization extends TestCase {
     public void testForm() throws Exception {
         Form f = new Form();
         String propertyId = "My property";
-        f.addItemProperty(propertyId, new MethodProperty(new Data(),
+        f.addItemProperty(propertyId, new MethodProperty<Object>(new Data(),
                 "dummyGetterAndSetter"));
         f.replaceWithSelect(propertyId, new Object[] { "a", "b", null },
                 new String[] { "Item a", "ITem b", "Null item" });
@@ -49,18 +49,20 @@ public class TestSerialization extends TestCase {
     }
 
     public void testMethodPropertyGetter() throws Exception {
-        MethodProperty mp = new MethodProperty(new Data(), "dummyGetter");
+        MethodProperty<?> mp = new MethodProperty<Object>(new Data(),
+                "dummyGetter");
         serializeAndDeserialize(mp);
     }
 
     public void testMethodPropertyGetterAndSetter() throws Exception {
-        MethodProperty mp = new MethodProperty(new Data(),
+        MethodProperty<?> mp = new MethodProperty<Object>(new Data(),
                 "dummyGetterAndSetter");
         serializeAndDeserialize(mp);
     }
 
     public void testMethodPropertyInt() throws Exception {
-        MethodProperty mp = new MethodProperty(new Data(), "dummyInt");
+        MethodProperty<?> mp = new MethodProperty<Object>(new Data(),
+                "dummyInt");
         serializeAndDeserialize(mp);
     }
 
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1710.java b/tests/src/com/vaadin/tests/tickets/Ticket1710.java
index a19dde5b34..76e065a395 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -50,7 +50,7 @@ public class Ticket1710 extends com.vaadin.Application {
         LayoutTestingPanel oltp = new LayoutTestingPanel("OrderedLayout",

                 orderedLayout);

         hidingControls.addComponent(new Button("OrderedLayout",

-                new MethodProperty(oltp, "visible")));

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

         lo.addComponent(oltp);

         orderedLayout.setSpacing(false);

         addFields(orderedLayout);

@@ -69,7 +69,7 @@ public class Ticket1710 extends com.vaadin.Application {
         GridLayout grid = new GridLayout(1, 1);

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

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

-                new MethodProperty(g1tp, "visible")));

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

         g1tp.setVisible(false);

         lo.addComponent(g1tp);

         grid.setSpacing(true);

@@ -77,7 +77,7 @@ public class Ticket1710 extends com.vaadin.Application {
         GridLayout grid2 = new GridLayout(2, 1);

         Panel g2tp = new LayoutTestingPanel("Gridlayout with 2 columns", grid2);

         hidingControls.addComponent(new Button("GridLayout (2cols)",

-                new MethodProperty(g2tp, "visible")));

+                new MethodProperty<Boolean>(g2tp, "visible")));

         g2tp.setVisible(false);

         lo.addComponent(g2tp);

         grid2.setSpacing(true);

@@ -88,7 +88,7 @@ public class Ticket1710 extends com.vaadin.Application {
         Panel elp = new LayoutTestingPanel(

                 "ExpandLayout width first component expanded", el);

         hidingControls.addComponent(new Button("ExpandLayout (vertical)",

-                new MethodProperty(elp, "visible")));

+                new MethodProperty<Boolean>(elp, "visible")));

         elp.setVisible(false);

         el.setHeight(700);

         addFields(el);

@@ -100,7 +100,7 @@ public class Ticket1710 extends com.vaadin.Application {
         Panel elhp = new LayoutTestingPanel(

                 "ExpandLayout width first component expanded; horizontal", elh);

         hidingControls.addComponent(new Button("ExpandLayout (horizontal)",

-                new MethodProperty(elhp, "visible")));

+                new MethodProperty<Boolean>(elhp, "visible")));

         elhp.setVisible(false);

         elhp.setScrollable(true);

         elh.setWidth(2000);

@@ -116,15 +116,15 @@ public class Ticket1710 extends com.vaadin.Application {
         OrderedLayout cl = new OrderedLayout();

         Panel clp = new LayoutTestingPanel("CustomLayout", cl);

         hidingControls.addComponent(new Button("CustomLayout",

-                new MethodProperty(clp, "visible")));

+                new MethodProperty<Boolean>(clp, "visible")));

         clp.setVisible(false);

         lo.addComponent(clp);

         cl.addComponent(new Label("<<< Add customlayout testcase here >>>"));

 

         // Form

         Panel formPanel = new Panel("Form");

-        hidingControls.addComponent(new Button("Form", new MethodProperty(

-                formPanel, "visible")));

+        hidingControls.addComponent(new Button("Form",

+                new MethodProperty<Boolean>(formPanel, "visible")));

         formPanel.setVisible(false);

         formPanel.addComponent(getFormPanelExample());

         lo.addComponent(formPanel);

@@ -269,15 +269,15 @@ public class Ticket1710 extends com.vaadin.Application {
             controls.setSpacing(true);

             controls.setMargin(false);

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

-            controls.addComponent(new TextField(new MethodProperty(

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

                     testedLayout, "width")));

-            controls.addComponent(new Button("%", new MethodProperty(this,

-                    "widthPercents")));

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

+                    this, "widthPercents")));

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

-            controls.addComponent(new TextField(new MethodProperty(

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

                     testedLayout, "height")));

-            controls.addComponent(new Button("%", new MethodProperty(this,

-                    "heightPercents")));

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

+                    this, "heightPercents")));

             controls.addComponent(marginLeft);

             controls.addComponent(marginRight);

             controls.addComponent(marginTop);

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1804.java b/tests/src/com/vaadin/tests/tickets/Ticket1804.java
index 42a9e49c98..92aa8587f4 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1804.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1804.java
@@ -38,7 +38,7 @@ public class Ticket1804 extends com.vaadin.Application {
 

         s = new Select("Testcase from the ticket #1804");

         s.setNullSelectionAllowed(false);

-        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));

+        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));

         s.addValidator(new EmptyStringValidator(

                 "Selection required for test-field"));

         s.setRequired(true);

@@ -46,14 +46,14 @@ public class Ticket1804 extends com.vaadin.Application {
 

         s = new Select("Testcase from the ticket #1804, but without validator");

         s.setNullSelectionAllowed(false);

-        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));

+        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));

         s.setRequired(true);

         listOfAllFields.add(s);

 

         s = new Select(

                 "Testcase from the ticket #1804, but with required=false");

         s.setNullSelectionAllowed(false);

-        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));

+        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));

         s.addValidator(new EmptyStringValidator(

                 "Selection required for test-field"));

         listOfAllFields.add(s);

@@ -61,14 +61,14 @@ public class Ticket1804 extends com.vaadin.Application {
         s = new Select(

                 "Testcase from the ticket #1804, but without validator and with required=false");

         s.setNullSelectionAllowed(false);

-        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));

+        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));

         listOfAllFields.add(s);

 

         s = new Select(

                 "Required=true, custom error message, null selection not allowed");

         s.setRequired(true);

         s.setNullSelectionAllowed(false);

-        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));

+        s.setPropertyDataSource(new MethodProperty<String>(new TestPojo(), "id"));

         s.setValue(null);

         s.setComponentError(new SystemError("Test error message"));

         listOfAllFields.add(s);

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket20.java b/tests/src/com/vaadin/tests/tickets/Ticket20.java
index 7adb2e932e..51f1a938b9 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket20.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket20.java
@@ -79,8 +79,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(tx,
-                    visibleProps[i]));
+            Button b = new Button(visibleProps[i], new MethodProperty<Boolean>(
+                    tx, visibleProps[i]));
             b.setImmediate(true);
             mainWin.addComponent(b);
         }
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2002.java b/tests/src/com/vaadin/tests/tickets/Ticket2002.java
index 35f2c84872..76f9bca5ba 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2002.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2002.java
@@ -35,11 +35,11 @@ public class Ticket2002 extends Application {
         layout.setSpacing(true);

 

         TextField f1 = new TextField("Non-immediate/Long text field",

-                new MethodProperty(this, "long1"));

+                new MethodProperty<Long>(this, "long1"));

         f1.setImmediate(false);

         f1.setNullSettingAllowed(true);

         TextField f2 = new TextField("Immediate/Long text field",

-                new MethodProperty(this, "long2"));

+                new MethodProperty<Long>(this, "long2"));

         f2.setImmediate(true);

         f2.setNullSettingAllowed(true);

 

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2104.java b/tests/src/com/vaadin/tests/tickets/Ticket2104.java
index 63dd280d56..b7af4ed401 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2104.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2104.java
@@ -32,18 +32,20 @@ public class Ticket2104 extends Application {
         OrderedLayout ol = new OrderedLayout(
                 OrderedLayout.ORIENTATION_HORIZONTAL);
         main.addComponent(ol);
-        Button b = new Button("immediate",
-                new MethodProperty(tree, "immediate"));
+        Button b = new Button("immediate", new MethodProperty<Boolean>(tree,
+                "immediate"));
         b.setImmediate(true);
         ol.addComponent(b);
-        b = new Button("selectable", new MethodProperty(tree, "selectable"));
+        b = new Button("selectable", new MethodProperty<Boolean>(tree,
+                "selectable"));
         b.setImmediate(true);
         ol.addComponent(b);
-        b = new Button("nullsel", new MethodProperty(tree,
+        b = new Button("nullsel", new MethodProperty<Boolean>(tree,
                 "nullSelectionAllowed"));
         b.setImmediate(true);
         ol.addComponent(b);
-        b = new Button("multi", new MethodProperty(tree, "multiSelect"));
+        b = new Button("multi",
+                new MethodProperty<Boolean>(tree, "multiSelect"));
         b.setImmediate(true);
         ol.addComponent(b);
         b = new Button("icon", new Button.ClickListener() {
@@ -86,17 +88,20 @@ public class Ticket2104 extends Application {
 
         ol = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
         main.addComponent(ol);
-        b = new Button("immediate", new MethodProperty(table, "immediate"));
+        b = new Button("immediate", new MethodProperty<Boolean>(table,
+                "immediate"));
         b.setImmediate(true);
         ol.addComponent(b);
-        b = new Button("selectable", new MethodProperty(table, "selectable"));
+        b = new Button("selectable", new MethodProperty<Boolean>(table,
+                "selectable"));
         b.setImmediate(true);
         ol.addComponent(b);
-        b = new Button("nullsel", new MethodProperty(table,
+        b = new Button("nullsel", new MethodProperty<Boolean>(table,
                 "nullSelectionAllowed"));
         b.setImmediate(true);
         ol.addComponent(b);
-        b = new Button("multi", new MethodProperty(table, "multiSelect"));
+        b = new Button("multi", new MethodProperty<Boolean>(table,
+                "multiSelect"));
         b.setImmediate(true);
         ol.addComponent(b);
         main.addComponent(table);
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2125.java b/tests/src/com/vaadin/tests/tickets/Ticket2125.java
index 914b951019..378952489f 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket2125.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket2125.java
@@ -52,8 +52,8 @@ public class Ticket2125 extends Application {
                 }
 
             });
-            Button b = new Button("editmode", new MethodProperty(table,
-                    "editable"));
+            Button b = new Button("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 e85ca3533a..0530f4eb66 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket736.java
@@ -66,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(f,
-                    visibleProps[i]));
+            Button b = new Button(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 888906105d..3f9e0ccf6f 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket846.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket846.java
@@ -40,8 +40,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(tx,
-                    visibleProps[i]));
+            Button b = new Button(visibleProps[i], new MethodProperty<Boolean>(
+                    tx, visibleProps[i]));
             b.setImmediate(true);
             mainWin.addComponent(b);
         }
@@ -56,8 +56,8 @@ public class Ticket846 extends Application {
                                 + (tx.isValid() ? "" : "not ") + "valid");
                     };
                 }));
-        TextField caption = new TextField("Caption", new MethodProperty(tx,
-                "caption"));
+        TextField caption = new TextField("Caption",
+                new MethodProperty<String>(tx, "caption"));
         caption.setImmediate(true);
         mainWin.addComponent(caption);
     }