From 615bb28d1b8be5bb0bbfd0fd520325c84058e1bc Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Mon, 4 Oct 2010 13:59:21 +0000
Subject: [PATCH] #5692 Generics and warnings cleanup: component tests

svn changeset:15379/svn branch:6.5
---
 .../src/com/vaadin/tests/components/accordion/RemoveTabs.java | 4 ++--
 .../vaadin/tests/components/combobox/ComboBoxInPopupView.java | 3 ++-
 tests/src/com/vaadin/tests/components/table/KeyControl.java   | 2 ++
 .../table/KeyboardNavigationWithChangingContent.java          | 1 +
 .../src/com/vaadin/tests/components/tabsheet/RemoveTabs.java  | 4 ++--
 .../vaadin/tests/components/tree/CtrlShiftMultiselect.java    | 2 ++
 .../com/vaadin/tests/components/tree/ExpandCollapseTree.java  | 2 ++
 .../components/upload/TestImmediateUploadInFormLayout.java    | 2 +-
 8 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java b/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java
index 6e2a28857b..b346d0f666 100644
--- a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java
+++ b/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java
@@ -97,10 +97,10 @@ public class RemoveTabs extends TestBase {
 
     @SuppressWarnings("unchecked")
     private void closeLastTab() {
-        Iterator i = accordion.getComponentIterator();
+        Iterator<Component> i = accordion.getComponentIterator();
         Component last = null;
         while (i.hasNext()) {
-            last = (Component) i.next();
+            last = i.next();
 
         }
         accordion.removeComponent(last);
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index a43d1fd8d6..5a488e5dc5 100644
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
@@ -30,7 +30,8 @@ public class ComboBoxInPopupView extends TestBase {
         cb2.setWidth("260px");
         PopupView pv2 = new PopupView("<u>2. focused (click)</u>", cb2) {
             @Override
-            public void changeVariables(Object source, Map variables) {
+            public void changeVariables(Object source,
+                    Map<String, Object> variables) {
                 super.changeVariables(source, variables);
                 cb2.focus();
             }
diff --git a/tests/src/com/vaadin/tests/components/table/KeyControl.java b/tests/src/com/vaadin/tests/components/table/KeyControl.java
index 94c6375c30..e662db338c 100644
--- a/tests/src/com/vaadin/tests/components/table/KeyControl.java
+++ b/tests/src/com/vaadin/tests/components/table/KeyControl.java
@@ -42,6 +42,7 @@ public class KeyControl extends TestBase {
 
         table1.addListener(new Table.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
+                @SuppressWarnings("unchecked")
                 Set<String> value = (Set<String>) table1.getValue();
                 selected1.setValue(value.toString() + " TOTAL: " + value.size());
             }
@@ -86,6 +87,7 @@ public class KeyControl extends TestBase {
 
         table3.addListener(new Table.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
+                @SuppressWarnings("unchecked")
                 Set<String> value = (Set<String>) table3.getValue();
                 selected3.setValue(value.size() == 0 ? "No selected items"
                         : value + ": Total " + value.size() + " items");
diff --git a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
index da68a832c3..44a2dcd9a9 100644
--- a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
+++ b/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
@@ -18,6 +18,7 @@ public class KeyboardNavigationWithChangingContent extends TestBase {
         ValueHolder<String> v1 = new ValueHolder<String>("test1");
         ValueHolder<String> v2 = new ValueHolder<String>("test2");
         ValueHolder<String> v3 = new ValueHolder<String>("test3");
+        @SuppressWarnings("unchecked")
         final BeanItemContainer<ValueHolder<String>> bic = new BeanItemContainer<ValueHolder<String>>(
                 Arrays.asList(v1, v2, v3));
         final Table t = new Table(null, bic);
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
index b0d462f4d8..f0ae33c2a1 100644
--- a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
+++ b/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
@@ -116,10 +116,10 @@ public class RemoveTabs extends TestBase {
 
     @SuppressWarnings("unchecked")
     private void closeLastTab() {
-        Iterator i = tabsheet.getComponentIterator();
+        Iterator<Component> i = tabsheet.getComponentIterator();
         Component last = null;
         while (i.hasNext()) {
-            last = (Component) i.next();
+            last = i.next();
 
         }
         tabsheet.removeComponent(last);
diff --git a/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
index 7febfa14d5..69956e4d2c 100644
--- a/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
+++ b/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
@@ -32,6 +32,8 @@ public class CtrlShiftMultiselect extends TestBase {
         tree.addListener(new Property.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
                 if (tree.getValue() instanceof Set) {
+                    @SuppressWarnings("unchecked")
+                    // safe cast after instanceof check
                     Set<Object> itemIds = (Set<Object>) tree.getValue();
                     if (itemIds.size() == 0) {
                         valueLbl.setValue("No selection");
diff --git a/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
index b812e4f629..e23213fafc 100644
--- a/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
+++ b/tests/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
@@ -32,6 +32,8 @@ public class ExpandCollapseTree extends TestBase {
         tree.addListener(new Property.ValueChangeListener() {
             public void valueChange(ValueChangeEvent event) {
                 if (tree.getValue() instanceof Set) {
+                    @SuppressWarnings("unchecked")
+                    // safe cast after instanceof check
                     Set<Object> itemIds = (Set<Object>) tree.getValue();
                     if (itemIds.size() == 0) {
                         valueLbl.setValue("No selection");
diff --git a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index befc8ae955..d1a77d0e49 100644
--- a/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/tests/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
@@ -43,7 +43,7 @@ public class TestImmediateUploadInFormLayout extends
 
     @Override
     protected List<Component> createActions() {
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
     }
 
     public OutputStream receiveUpload(String filename, String MIMEType) {
-- 
2.39.5