From c1c982c6d3f10dad0115371c14660587cf2c3688 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Mon, 4 Oct 2010 11:50:08 +0000
Subject: [PATCH] #5692 Generics: ContainerHierarchicalWrapper,
 HierarchicalContainer

svn changeset:15349/svn branch:6.5
---
 .../data/util/ContainerHierarchicalWrapper.java      | 12 ++++++------
 src/com/vaadin/data/util/HierarchicalContainer.java  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 4dca5cf52b..3633154c4a 100644
--- a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -253,14 +253,14 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * comment here, we use the default documentation from implemented
      * interface.
      */
-    public Collection getChildren(Object itemId) {
+    public Collection<?> getChildren(Object itemId) {
 
         // If the wrapped container implements the method directly, use it
         if (hierarchical) {
             return ((Container.Hierarchical) container).getChildren(itemId);
         }
 
-        final Collection c = children.get(itemId);
+        final Collection<?> c = children.get(itemId);
         if (c == null) {
             return null;
         }
@@ -321,7 +321,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * comment here, we use the default documentation from implemented
      * interface.
      */
-    public Collection rootItemIds() {
+    public Collection<?> rootItemIds() {
 
         // If the wrapped container implements the method directly, use it
         if (hierarchical) {
@@ -632,7 +632,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * comment here, we use the default documentation from implemented
      * interface.
      */
-    public Collection getItemIds() {
+    public Collection<?> getItemIds() {
         return container.getItemIds();
     }
 
@@ -650,7 +650,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * JavaDoc comment here, we use the default documentation from implemented
      * interface.
      */
-    public Collection getContainerPropertyIds() {
+    public Collection<?> getContainerPropertyIds() {
         return container.getContainerPropertyIds();
     }
 
@@ -659,7 +659,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * Don't add a JavaDoc comment here, we use the default documentation from
      * implemented interface.
      */
-    public Class getType(Object propertyId) {
+    public Class<?> getType(Object propertyId) {
         return container.getType(propertyId);
     }
 
diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java
index 108c544198..2b434224ac 100644
--- a/src/com/vaadin/data/util/HierarchicalContainer.java
+++ b/src/com/vaadin/data/util/HierarchicalContainer.java
@@ -89,7 +89,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * comment here, we use the default documentation from implemented
      * interface.
      */
-    public Collection getChildren(Object itemId) {
+    public Collection<?> getChildren(Object itemId) {
         LinkedList<Object> c;
 
         if (filteredChildren != null) {
@@ -156,7 +156,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * comment here, we use the default documentation from implemented
      * interface.
      */
-    public Collection rootItemIds() {
+    public Collection<?> rootItemIds() {
         if (filteredRoots != null) {
             return Collections.unmodifiableCollection(filteredRoots);
         } else {
-- 
2.39.5