diff --git a/src/java/com/samskivert/util/CollectionUtil.java b/src/java/com/samskivert/util/CollectionUtil.java index 5026bb16..3589eaa5 100644 --- a/src/java/com/samskivert/util/CollectionUtil.java +++ b/src/java/com/samskivert/util/CollectionUtil.java @@ -37,8 +37,7 @@ public class CollectionUtil * Adds all items returned by the enumeration to the supplied collection * and returns the supplied collection. */ - public static > T addAll ( - T col, Enumeration enm) + public static Collection addAll (Collection col, Enumeration enm) { while (enm.hasMoreElements()) { col.add(enm.nextElement()); @@ -50,8 +49,7 @@ public class CollectionUtil * Adds all items returned by the iterator to the supplied collection and * returns the supplied collection. */ - public static > T addAll ( - T col, Iterator iter) + public static Collection addAll (Collection col, Iterator iter) { while (iter.hasNext()) { col.add(iter.next()); @@ -64,10 +62,10 @@ public class CollectionUtil * returns the supplied collection. If the supplied array is null, nothing * is added to the collection. */ - public static > T addAll (T col, E[] values) + public static Collection addAll (Collection col, T[] values) { if (values != null) { - for (E value : values) { + for (T value : values) { col.add(value); } }