From dc035cea913b88dcf927218be1ac2f5fb1d003fe Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Tue, 5 Oct 2010 05:48:37 +0000
Subject: [PATCH] #5692 Generics and warnings cleanup: Layout tests

svn changeset:15383/svn branch:6.5
---
 .../com/vaadin/tests/layouts/CaptionsInLayouts.java | 11 ++++++-----
 .../vaadin/tests/layouts/OrderedLayoutBasics.java   |  2 +-
 .../vaadin/tests/layouts/TestAbsoluteLayout.java    | 13 ++++++++-----
 .../vaadin/tests/layouts/TestLayoutPerformance.java |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java b/tests/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 131c724f27..ec825a3404 100644
--- 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 {
 
     }
 
-    private Layout getLayout(String caption, Class layoutClass, String width) {
+    private Layout getLayout(String caption,
+            Class<? extends Layout> layoutClass, String width) {
         Layout l;
         if (layoutClass == VerticalLayout.class) {
             if (verticalLayout == null) {
@@ -249,14 +250,14 @@ public class CaptionsInLayouts extends TestBase {
         layoutSelect.setImmediate(true);
         layoutSelect.addListener(new ValueChangeListener() {
 
+            @SuppressWarnings("unchecked")
             public void valueChange(ValueChangeEvent event) {
                 Item i = layoutSelect.getItem(event.getProperty().getValue());
 
                 setLayout(getLayout((String) i.getItemProperty(CAPTION)
-                        .getValue(), (Class) i.getItemProperty(CLASS)
-                        .getValue(), (String) i.getItemProperty(WIDTH)
-                        .getValue()));
-
+                        .getValue(), (Class<? extends Layout>) i
+                        .getItemProperty(CLASS).getValue(), (String) i
+                        .getItemProperty(WIDTH).getValue()));
             }
         });
 
diff --git a/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index c70ac5dfa8..0e61705049 100644
--- 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 {
 
     protected void addBefore(AbstractOrderedLayout ol, Component c, String width) {
         int index = 0;
-        Iterator iter = ol.getComponentIterator();
+        Iterator<Component> iter = ol.getComponentIterator();
         while (iter.hasNext()) {
             if (iter.next() == c) {
                 break;
diff --git a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 1225874a44..f2d653e438 100644
--- 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;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbsoluteLayout;
+import com.vaadin.ui.AbsoluteLayout.ComponentPosition;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.BaseFieldFactory;
 import com.vaadin.ui.Button;
@@ -212,7 +213,7 @@ public class TestAbsoluteLayout extends TestBase {
                                                 files[j].length() - 6);
                                 p = p.replaceAll(".*classes/", "");
                                 p = p.replaceAll("/", ".");
-                                Class c;
+                                Class<?> c;
                                 try {
                                     c = Class.forName(p);
                                     if (AbstractComponent.class
@@ -235,7 +236,8 @@ public class TestAbsoluteLayout extends TestBase {
 
                     select.addListener(new ValueChangeListener() {
                         public void valueChange(ValueChangeEvent event) {
-                            Class c = (Class) event.getProperty().getValue();
+                            Class<?> c = (Class<?>) event.getProperty()
+                                    .getValue();
 
                             try {
                                 Component newInstance = (Component) c
@@ -288,7 +290,7 @@ public class TestAbsoluteLayout extends TestBase {
 
         private void editcomponent(Component value) {
 
-            BeanItem beanItem = new BeanItem(value);
+            BeanItem<Component> beanItem = new BeanItem<Component>(value);
             String c = "Component properties for "
                     + value.getClass().getSimpleName();
             ArrayList<String> fields = new ArrayList<String>(
@@ -301,10 +303,11 @@ public class TestAbsoluteLayout extends TestBase {
 
             componentEditor.setItemDataSource(beanItem, fields);
 
-            beanItem = new BeanItem(l.getPosition(value));
+            BeanItem<ComponentPosition> positionItem = new BeanItem<ComponentPosition>(
+                    l.getPosition(value));
             componentEditor.setCaption(c);
 
-            positionEditor.setItemDataSource(beanItem);
+            positionEditor.setItemDataSource(positionItem);
 
         }
     }
diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java b/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
index 6cae2a7679..31ee15983e 100644
--- 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 {
     }
 
     private Layout getCurrentLayout() {
-        Class value = (Class) ns.getValue();
+        Class<?> value = (Class<?>) ns.getValue();
         if (value == GridLayout.class) {
             return new GridLayout(10, 1);
         }
@@ -110,7 +110,7 @@ public class TestLayoutPerformance extends TestBase {
     }
 
     private Component newTestComponent() {
-        Class componentClass = (Class) ns2.getValue();
+        Class<?> componentClass = (Class<?>) ns2.getValue();
         AbstractComponent newInstance = null;
         try {
             newInstance = (AbstractComponent) componentClass.newInstance();
-- 
2.39.5