#5692 Generics: ContainerHierarchicalWrapper, HierarchicalContainer

svn changeset:15349/svn branch:6.5

diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 4dca5cf52bb61216ca2ccd6a724773c68395843e..3633154c4a29c2c065f2dd541d532f7552b2bf47 100644 (file)
--- 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 108c544198018bc5a7e9411fc702652cb2f7ac38..2b434224acfb9b7ea8542e0df578ce4e483c89d4 100644 (file)
--- 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 {