#5692 Generics and warnings cleanup: DD tests

svn changeset:15377/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index 21ae600934917abfcf234432863184540df2900f..7e8cfa3e37f52b720e1df76aa472f5a4b0459e7d 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -126,7 +126,7 @@ public class DDTest1 extends TestBase {
 
             private void populateSubTree(HierarchicalContainer idx,
                     HierarchicalContainer subtree, Object itemId) {
-                Collection children = subtree.getChildren(itemId);
+                Collection<?> children = subtree.getChildren(itemId);
                 if (children != null) {
 
                     for (Object childId : children) {
@@ -153,7 +153,8 @@ public class DDTest1 extends TestBase {
             private HierarchicalContainer getSubTree(HierarchicalContainer idx,
                     Object itemId) {
                 HierarchicalContainer hierarchicalContainer = new HierarchicalContainer();
-                Collection containerPropertyIds = idx.getContainerPropertyIds();
+                Collection<?> containerPropertyIds = idx
+                        .getContainerPropertyIds();
                 for (Object object : containerPropertyIds) {
                     hierarchicalContainer.addContainerProperty(object,
                             idx.getType(object), null);
@@ -165,7 +166,7 @@ public class DDTest1 extends TestBase {
 
             private void copyChildren(HierarchicalContainer source,
                     HierarchicalContainer target, Object itemId) {
-                Collection children = source.getChildren(itemId);
+                Collection<?> children = source.getChildren(itemId);
                 if (children != null) {
                     for (Object childId : children) {
                         Item item = source.getItem(childId);

diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java
index f21eb23f16254c89a719f586154c1ab88b85245c..1ed1bf64bc310b32beb6dd5064c3bf24b7bdcd31 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest2.java
@@ -82,7 +82,7 @@ public class DDTest2 extends TestBase {
             @Override
             protected Set<Object> getAllowedItemIds(DragAndDropEvent dragEvent,
                     Tree tree) {
-                return new HashSet(tree.getItemIds());
+                return new HashSet<Object>(tree.getItemIds());
             }
         };
 
@@ -217,7 +217,7 @@ public class DDTest2 extends TestBase {
             }
 
             private void copySubTree(Object itemId, Object itemIdTo) {
-                Collection children = tree1.getChildren(itemId);
+                Collection<?> children = tree1.getChildren(itemId);
                 if (children != null) {
                     for (Object childId : children) {
                         Object newItemId = tree2.addItem();

diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/src/com/vaadin/tests/dd/DDTest4.java
index f0f5f9bf34e986b2dc0586a3077fa9d40c3c0d85..b382d4c03e06adce06c557022362419e86a19995 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest4.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest4.java
@@ -92,7 +92,7 @@ public class DDTest4 extends TestBase {
                     newIndex = 0;
                 }
                 Object idAfter = containerDataSource.getIdByIndex(newIndex);
-                Collection selections = (Collection) table.getValue();
+                Collection<?> selections = (Collection<?>) table.getValue();
                 if (selections != null && selections.contains(itemId)) {
                     // dragged a selected item, if multiple rows selected, drag
                     // them too (functionality similar to apple mail)

diff --git a/tests/src/com/vaadin/tests/dd/DDTest7.java b/tests/src/com/vaadin/tests/dd/DDTest7.java
index f6eced11219579cbde7ca8baf530c67a50ee0688..890db08eb3ddf04cb74b0ea083b6bf54ee53f5fb 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest7.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest7.java
@@ -122,7 +122,7 @@ public class DDTest7 extends TestBase {
                     newIndex = 0;
                 }
                 Object idAfter = containerDataSource.getIdByIndex(newIndex);
-                Collection selections = (Collection) table.getValue();
+                Collection<?> selections = (Collection<?>) table.getValue();
                 if (selections != null && selections.contains(itemId)) {
                     // dragged a selected item, if multiple rows selected, drag
                     // them too (functionality similar to apple mail)

diff --git a/tests/src/com/vaadin/tests/dd/DDTest8.java b/tests/src/com/vaadin/tests/dd/DDTest8.java
index 7582d92be474208e3726cbbff91ceb3428cc4476..be51c8cd2817f72d85e911cc6fe4421cd4293dd8 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest8.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest8.java
@@ -51,7 +51,7 @@ public class DDTest8 extends TestBase {
 
             private void populateSubTree(HierarchicalContainer idx,
                     HierarchicalContainer subtree, Object itemId) {
-                Collection children = subtree.getChildren(itemId);
+                Collection<?> children = subtree.getChildren(itemId);
                 if (children != null) {
 
                     for (Object childId : children) {
@@ -78,7 +78,8 @@ public class DDTest8 extends TestBase {
             private HierarchicalContainer getSubTree(HierarchicalContainer idx,
                     Object itemId) {
                 HierarchicalContainer hierarchicalContainer = new HierarchicalContainer();
-                Collection containerPropertyIds = idx.getContainerPropertyIds();
+                Collection<?> containerPropertyIds = idx
+                        .getContainerPropertyIds();
                 for (Object object : containerPropertyIds) {
                     hierarchicalContainer.addContainerProperty(object,
                             idx.getType(object), null);
@@ -90,7 +91,7 @@ public class DDTest8 extends TestBase {
 
             private void copyChildren(HierarchicalContainer source,
                     HierarchicalContainer target, Object itemId) {
-                Collection children = source.getChildren(itemId);
+                Collection<?> children = source.getChildren(itemId);
                 if (children != null) {
                     for (Object childId : children) {
                         Item item = source.getItem(childId);