diff options
author | Tom Tromey <tromey@redhat.com> | 2002-01-23 00:06:10 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2002-01-23 00:06:10 +0000 |
commit | 73d7eb36867eb91a061ce3f14b379f5018cd7bae (patch) | |
tree | ac28d28e37c9ba4b68891d3a5ce0018a4d4d5d01 | |
parent | dc07f208f60e73a7e67d5d7da67da441d762bda1 (diff) | |
download | classpath-73d7eb36867eb91a061ce3f14b379f5018cd7bae.tar.gz |
Minor changes from libgcj:
* java/util/AbstractMap.java: Re-merged.
* java/util/AbstractSequentialList.java: Re-merged.
* java/util/AbstractSet.java: Re-merged.
* java/util/ArrayList.java: Re-merged.
* java/util/Arrays.java: Re-merged.
* java/util/LinkedHashSet.java: Re-merged.
* java/util/TreeMap.java: Re-merged.
* java/util/TreeSet.java: Re-merged.
* java/util/Vector.java: Re-merged.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | java/util/AbstractMap.java | 1 | ||||
-rw-r--r-- | java/util/AbstractSequentialList.java | 1 | ||||
-rw-r--r-- | java/util/AbstractSet.java | 2 | ||||
-rw-r--r-- | java/util/ArrayList.java | 5 | ||||
-rw-r--r-- | java/util/Arrays.java | 3 | ||||
-rw-r--r-- | java/util/LinkedHashSet.java | 2 | ||||
-rw-r--r-- | java/util/TreeMap.java | 2 | ||||
-rw-r--r-- | java/util/TreeSet.java | 1 | ||||
-rw-r--r-- | java/util/Vector.java | 1 |
10 files changed, 22 insertions, 7 deletions
@@ -1,5 +1,16 @@ 2002-01-22 Tom Tromey <tromey@redhat.com> + Minor changes from libgcj: + * java/util/AbstractMap.java: Re-merged. + * java/util/AbstractSequentialList.java: Re-merged. + * java/util/AbstractSet.java: Re-merged. + * java/util/ArrayList.java: Re-merged. + * java/util/Arrays.java: Re-merged. + * java/util/LinkedHashSet.java: Re-merged. + * java/util/TreeMap.java: Re-merged. + * java/util/TreeSet.java: Re-merged. + * java/util/Vector.java: Re-merged. + * java/awt/GridBagConstraints.java: Updated copyright. 2002-01-22 Mark Wielaard <mark@klomp.org> diff --git a/java/util/AbstractMap.java b/java/util/AbstractMap.java index 62614c12b..393d3c775 100644 --- a/java/util/AbstractMap.java +++ b/java/util/AbstractMap.java @@ -52,6 +52,7 @@ package java.util; * efficient implementation. * * @author Original author unknown + * @author Bryce McKinlay * @author Eric Blake <ebb9@email.byu.edu> * @see Map * @see Collection diff --git a/java/util/AbstractSequentialList.java b/java/util/AbstractSequentialList.java index 42dc92bbf..e74c75c4f 100644 --- a/java/util/AbstractSequentialList.java +++ b/java/util/AbstractSequentialList.java @@ -60,6 +60,7 @@ package java.util; * Unfortunately, there is no way to enforce this in Java. * * @author Original author unknown + * @author Bryce McKinlay * @author Eric Blake <ebb9@email.byu.edu> * @see Collection * @see List diff --git a/java/util/AbstractSet.java b/java/util/AbstractSet.java index 0ec533beb..ce266283e 100644 --- a/java/util/AbstractSet.java +++ b/java/util/AbstractSet.java @@ -126,7 +126,7 @@ public abstract class AbstractSet extends AbstractCollection implements Set Iterator i; if (oldsize < count) { - for (i = iterator(), count = oldsize; count > 0; count--) + for (i = iterator(), count = oldsize; count > 0; count--) if (c.contains(i.next())) i.remove(); } diff --git a/java/util/ArrayList.java b/java/util/ArrayList.java index 795e43fa4..34dc48ac1 100644 --- a/java/util/ArrayList.java +++ b/java/util/ArrayList.java @@ -71,6 +71,7 @@ import java.io.ObjectOutputStream; * non-deterministic behavior. * * @author Jon A. Zeppieri + * @author Bryce McKinlay * @author Eric Blake <ebb9@email.byu.edu> * @see Collection * @see List @@ -463,7 +464,7 @@ public class ArrayList extends AbstractList // use of a negative index will cause an ArrayIndexOutOfBoundsException, // a subclass of the required exception, with no effort on our part. if (index > size) - throw new IndexOutOfBoundsException("Index: " + index + ", Size:" + throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size); } @@ -479,7 +480,7 @@ public class ArrayList extends AbstractList // use of a negative index will cause an ArrayIndexOutOfBoundsException, // a subclass of the required exception, with no effort on our part. if (index >= size) - throw new IndexOutOfBoundsException("Index: " + index + ", Size:" + throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size); } diff --git a/java/util/Arrays.java b/java/util/Arrays.java index 81335ffa6..128550102 100644 --- a/java/util/Arrays.java +++ b/java/util/Arrays.java @@ -57,6 +57,7 @@ import java.lang.reflect.Array; * sets that cause other quicksorts to degrade to quadratic performance. * * @author Original author unknown + * @author Bryce McKinlay * @author Eric Blake <ebb9@email.byu.edu> * @see Comparable * @see Comparator @@ -2345,8 +2346,6 @@ public class Arrays } } - -// asList /** * Returns a list "view" of the specified array. This method is intended to * make it easy to use the Collections API with existing array-based APIs and diff --git a/java/util/LinkedHashSet.java b/java/util/LinkedHashSet.java index 824e0c6d7..4641e52b6 100644 --- a/java/util/LinkedHashSet.java +++ b/java/util/LinkedHashSet.java @@ -1,5 +1,5 @@ /* LinkedHashSet.java -- a set backed by a LinkedHashMap, for linked - list traversal + list traversal. Copyright (C) 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/java/util/TreeMap.java b/java/util/TreeMap.java index cb813ec84..879968233 100644 --- a/java/util/TreeMap.java +++ b/java/util/TreeMap.java @@ -1770,5 +1770,5 @@ public class TreeMap extends AbstractMap }; return this.keys; } - } // class SubMap + } // class SubMap } // class TreeMap diff --git a/java/util/TreeSet.java b/java/util/TreeSet.java index 35c8fd967..bd625d158 100644 --- a/java/util/TreeSet.java +++ b/java/util/TreeSet.java @@ -66,6 +66,7 @@ import java.io.ObjectOutputStream; * non-deterministic behavior. * * @author Jon Zeppieri + * @author Bryce McKinlay * @author Eric Blake <ebb9@email.byu.edu> * @see Collection * @see Set diff --git a/java/util/Vector.java b/java/util/Vector.java index a063bbc1e..e8d1c96ad 100644 --- a/java/util/Vector.java +++ b/java/util/Vector.java @@ -69,6 +69,7 @@ import java.io.Serializable; * directly specify this subclass. * * @author Scott G. Miller + * @author Bryce McKinlay * @author Eric Blake <ebb9@email.byu.edu> * @see Collection * @see List |