#5692 Generics and warnings cleanup: component tests

svn changeset:15379/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java b/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java
index 6e2a28857b71bcc6cdc6aeac2d97ddd6f1674f58..b346d0f666d834c3c49b4264c224534271f5104d 100644 (file)
--- 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 {
 \r
     @SuppressWarnings("unchecked")\r
     private void closeLastTab() {\r
-        Iterator i = accordion.getComponentIterator();\r
+        Iterator<Component> i = accordion.getComponentIterator();\r
         Component last = null;\r
         while (i.hasNext()) {\r
-            last = (Component) i.next();\r
+            last = i.next();\r
 \r
         }\r
         accordion.removeComponent(last);\r

diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index a43d1fd8d6a8760e6200bc46e4e1f192d2f8a17a..5a488e5dc585341502e628d1b5014671364c32aa 100644 (file)
--- 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 94c6375c30139276d45c1ceaa39038a92c7a4477..e662db338c8dc3be8656244a86556336986693ac 100644 (file)
--- 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 da68a832c30e7c6fc9cad4553f8e174487385c28..44a2dcd9a9781def3697b1492ff1bab3f35e3908 100644 (file)
--- 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 b0d462f4d850b230f5d4ef761c6e74fd58494063..f0ae33c2a1e199d4584697651d91066276c7c00a 100644 (file)
--- 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 {
 \r
     @SuppressWarnings("unchecked")\r
     private void closeLastTab() {\r
-        Iterator i = tabsheet.getComponentIterator();\r
+        Iterator<Component> i = tabsheet.getComponentIterator();\r
         Component last = null;\r
         while (i.hasNext()) {\r
-            last = (Component) i.next();\r
+            last = i.next();\r
 \r
         }\r
         tabsheet.removeComponent(last);\r

diff --git a/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/tests/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
index 7febfa14d55714d312a4772830c3ae9774d060a7..69956e4d2c4c7c167a9d7140967b18a51f84fe18 100644 (file)
--- 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 b812e4f629606b27ff34608a137c87e1a96b9a03..e23213fafce60ae15b56c7c3b39294054b8e3fc2 100644 (file)
--- 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 befc8ae9553af9e180abe08ffe7d431d9f1106f0..d1a77d0e490b8529abbb43e379a85314a9d04433 100644 (file)
--- 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
 \r
     @Override\r
     protected List<Component> createActions() {\r
-        return Collections.EMPTY_LIST;\r
+        return Collections.emptyList();\r
     }\r
 \r
     public OutputStream receiveUpload(String filename, String MIMEType) {\r