diff options
| author | Tom Tromey <tromey@redhat.com> | 2004-08-05 21:09:36 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2004-08-05 21:09:36 +0000 |
| commit | 531d849e2b120b59e4fa9ab812e3675437d05131 (patch) | |
| tree | 4c1476dc75514cd7b6d570312020cd04a4b239d0 /java/util/Arrays.java | |
| parent | 27addc292c95fa0e8316b81c189cdccc7a032940 (diff) | |
| download | classpath-531d849e2b120b59e4fa9ab812e3675437d05131.tar.gz | |
* java/lang/Iterable.java: New file.
* java/lang/Comparable.java, java/util/AbstractCollection.java,
java/util/AbstractList.java, java/util/AbstractMap.java,
java/util/AbstractSequentialList.java, java/util/AbstractSet.java,
java/util/Arrays.java, java/util/Collection.java,
java/util/Collections.java, java/util/Comparator.java,
java/util/Dictionary.java, java/util/Enumeration.java,
java/util/HashMap.java, java/util/HashSet.java,
java/util/Iterator.java, java/util/LinkedHashSet.java,
java/util/LinkedList.java, java/util/List.java,
java/util/ListIterator.java, java/util/Map.java,
java/util/Set.java, java/util/SortedMap.java,
java/util/SortedSet.java, java/util/Stack.java,
java/util/TreeSet.java, java/util/Vector.java: Updated to use
generics.
Diffstat (limited to 'java/util/Arrays.java')
| -rw-r--r-- | java/util/Arrays.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/java/util/Arrays.java b/java/util/Arrays.java index cc32d1539..e32c85675 100644 --- a/java/util/Arrays.java +++ b/java/util/Arrays.java @@ -1,5 +1,5 @@ /* Arrays.java -- Utility class with methods to operate on arrays - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -361,7 +361,8 @@ public class Arrays * @throws NullPointerException if a null element is compared with natural * ordering (only possible when c is null) */ - public static int binarySearch(Object[] a, Object key, Comparator c) + // FIXME why "super"? + <T> public static int binarySearch(T[] a, T key, Comparator<? super T> c) { int low = 0; int hi = a.length - 1; @@ -2148,7 +2149,7 @@ public class Arrays * @throws NullPointerException if a null element is compared with natural * ordering (only possible when c is null) */ - public static void sort(Object[] a, Comparator c) + public static void sort(T[] a, Comparator<? super T> c) { sort(a, 0, a.length, c); } @@ -2198,7 +2199,8 @@ public class Arrays * @throws NullPointerException if a null element is compared with natural * ordering (only possible when c is null) */ - public static void sort(Object[] a, int fromIndex, int toIndex, Comparator c) + public static void sort(T[] a, int fromIndex, int toIndex, + Comparator<? super T> c) { if (fromIndex > toIndex) throw new IllegalArgumentException("fromIndex " + fromIndex @@ -2330,7 +2332,7 @@ public class Arrays * @see RandomAccess * @see Arrays.ArrayList */ - public static List asList(final Object[] a) + <T> public static List<T> asList(final Object[] a) // fixme `T...' { return new Arrays.ArrayList(a); } |