#5692 Generics and warnings cleanup: Layout tests

svn changeset:15383/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java b/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 131c724f2705709e6a3483a48586ee77cb73fa1c..ec825a3404a6fac586c123f0602d7a989d8e1646 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -177,7 +177,8 @@ public class CaptionsInLayouts extends TestBase {
 \r
     }\r
 \r
-    private Layout getLayout(String caption, Class layoutClass, String width) {\r
+    private Layout getLayout(String caption,\r
+            Class<? extends Layout> layoutClass, String width) {\r
         Layout l;\r
         if (layoutClass == VerticalLayout.class) {\r
             if (verticalLayout == null) {\r
@@ -249,14 +250,14 @@ public class CaptionsInLayouts extends TestBase {
         layoutSelect.setImmediate(true);\r
         layoutSelect.addListener(new ValueChangeListener() {\r
 \r
+            @SuppressWarnings("unchecked")\r
             public void valueChange(ValueChangeEvent event) {\r
                 Item i = layoutSelect.getItem(event.getProperty().getValue());\r
 \r
                 setLayout(getLayout((String) i.getItemProperty(CAPTION)\r
-                        .getValue(), (Class) i.getItemProperty(CLASS)\r
-                        .getValue(), (String) i.getItemProperty(WIDTH)\r
-                        .getValue()));\r
-\r
+                        .getValue(), (Class<? extends Layout>) i\r
+                        .getItemProperty(CLASS).getValue(), (String) i\r
+                        .getItemProperty(WIDTH).getValue()));\r
             }\r
         });\r
 \r

diff --git a/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index c70ac5dfa81f506926b07a750ce3c28942d19080..0e61705049cb0dc7257bf2ede7887e7638993ca8 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
@@ -1041,7 +1041,7 @@ public class OrderedLayoutBasics extends TestBase {
 \r
     protected void addBefore(AbstractOrderedLayout ol, Component c, String width) {\r
         int index = 0;\r
-        Iterator iter = ol.getComponentIterator();\r
+        Iterator<Component> iter = ol.getComponentIterator();\r
         while (iter.hasNext()) {\r
             if (iter.next() == c) {\r
                 break;\r

diff --git a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 1225874a4442d153dbf2b6fa6de21703e11bdb1c..f2d653e43813d4e0da3541749828c898aad881cd 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
@@ -14,6 +14,7 @@ import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.IndexedContainer;\r
 import com.vaadin.tests.components.TestBase;\r
 import com.vaadin.ui.AbsoluteLayout;\r
+import com.vaadin.ui.AbsoluteLayout.ComponentPosition;\r
 import com.vaadin.ui.AbstractComponent;\r
 import com.vaadin.ui.BaseFieldFactory;\r
 import com.vaadin.ui.Button;\r
@@ -212,7 +213,7 @@ public class TestAbsoluteLayout extends TestBase {
                                                 files[j].length() - 6);\r
                                 p = p.replaceAll(".*classes/", "");\r
                                 p = p.replaceAll("/", ".");\r
-                                Class c;\r
+                                Class<?> c;\r
                                 try {\r
                                     c = Class.forName(p);\r
                                     if (AbstractComponent.class\r
@@ -235,7 +236,8 @@ public class TestAbsoluteLayout extends TestBase {
 \r
                     select.addListener(new ValueChangeListener() {\r
                         public void valueChange(ValueChangeEvent event) {\r
-                            Class c = (Class) event.getProperty().getValue();\r
+                            Class<?> c = (Class<?>) event.getProperty()\r
+                                    .getValue();\r
 \r
                             try {\r
                                 Component newInstance = (Component) c\r
@@ -288,7 +290,7 @@ public class TestAbsoluteLayout extends TestBase {
 \r
         private void editcomponent(Component value) {\r
 \r
-            BeanItem beanItem = new BeanItem(value);\r
+            BeanItem<Component> beanItem = new BeanItem<Component>(value);\r
             String c = "Component properties for "\r
                     + value.getClass().getSimpleName();\r
             ArrayList<String> fields = new ArrayList<String>(\r
@@ -301,10 +303,11 @@ public class TestAbsoluteLayout extends TestBase {
 \r
             componentEditor.setItemDataSource(beanItem, fields);\r
 \r
-            beanItem = new BeanItem(l.getPosition(value));\r
+            BeanItem<ComponentPosition> positionItem = new BeanItem<ComponentPosition>(\r
+                    l.getPosition(value));\r
             componentEditor.setCaption(c);\r
 \r
-            positionEditor.setItemDataSource(beanItem);\r
+            positionEditor.setItemDataSource(positionItem);\r
 \r
         }\r
     }\r

diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java b/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
index 6cae2a76792e8f6909378214f7bd481a509775d6..31ee15983e6b69c644b3002bd52e864eb0a01b09 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
@@ -91,7 +91,7 @@ public class TestLayoutPerformance extends TestBase {
     }\r
 \r
     private Layout getCurrentLayout() {\r
-        Class value = (Class) ns.getValue();\r
+        Class<?> value = (Class<?>) ns.getValue();\r
         if (value == GridLayout.class) {\r
             return new GridLayout(10, 1);\r
         }\r
@@ -110,7 +110,7 @@ public class TestLayoutPerformance extends TestBase {
     }\r
 \r
     private Component newTestComponent() {\r
-        Class componentClass = (Class) ns2.getValue();\r
+        Class<?> componentClass = (Class<?>) ns2.getValue();\r
         AbstractComponent newInstance = null;\r
         try {\r
             newInstance = (AbstractComponent) componentClass.newInstance();\r