AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better genericized typing for addAll() methods.

Browse Source 
git-svn-id: https://samskivert.googlecode.com/svn/trunk@1829 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
ray
2006-04-19 18:41:44 +00:00
parent f160f099f4
commit ca9adfe063
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/util/CollectionUtil.java
+5 -4
View File
@@ -35,8 +35,8 @@ public class CollectionUtil
* Adds all items returned by the enumeration to the supplied * Adds all items returned by the enumeration to the supplied
* collection and returns the supplied collection. * collection and returns the supplied collection.
*/ */
public static <T> Collection<T> addAll ( public static <E, T extends Collection<E>> T addAll (
Collection<T> col, Enumeration<T> enm) T col, Enumeration<E> enm)
{ {
while (enm.hasMoreElements()) { while (enm.hasMoreElements()) {
col.add(enm.nextElement()); col.add(enm.nextElement());
@@ -48,7 +48,8 @@ public class CollectionUtil
* Adds all items returned by the iterator to the supplied collection * Adds all items returned by the iterator to the supplied collection
* and returns the supplied collection. * and returns the supplied collection.
*/ */
public static <T> Collection<T> addAll (Collection<T> col, Iterator<T> iter) public static <E, T extends Collection<E>> T addAll (
T col, Iterator<E> iter)
{ {
while (iter.hasNext()) { while (iter.hasNext()) {
col.add(iter.next()); col.add(iter.next());
@@ -60,7 +61,7 @@ public class CollectionUtil
* Adds all items in the given object array to the supplied * Adds all items in the given object array to the supplied
* collection and returns the supplied collection. * collection and returns the supplied collection.
*/ */
public static <T> Collection<T> addAll (Collection<T> col, T[] values) public static <E, T extends Collection<E>> T addAll (T col, E[] values)
{ {
for (int ii = 0; ii < values.length; ii++) { for (int ii = 0; ii < values.length; ii++) {
col.add(values[ii]); col.add(values[ii]);