From 488d42af6f3f61ea75656c994ad9722a6e8e6af9 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Mon, 11 Dec 2000 03:47:48 +0000 Subject: Makefile.am: Add HashSet.java and java/lang/ref classes. * Makefile.am: Add HashSet.java and java/lang/ref classes. Remove BasicMapEntry.java and Bucket.java. * Makefile.in: Rebuilt. * java/util/HashMap.java: Rewritten. * java/util/HashSet.java: Imported from classpath. * java/util/WeakHashMap.java: Imported from classpath. * java/util/Hashtable.java: Rewritten based on new HashMap code. * java/util/Bucket.java: Deleted. * java/util/BasicMapEntry.java: Deleted. * java/util/Collections.java (search): Use a for-loop, not iterator hasNext(). (copy): Use a for-loop. Throw an IndexOutOfBoundsException if run out of elements in source. (max): Use a for-loop. (min): Ditto. (reverse): Keep track of positions instead of using Iterator's nextIndex() and previousIndex(). (shuffle(List)): Initialize defaultRandom if required using double-check thread safety idiom. Call two-argument shuffle method using defaultRandom. (defaultRandom): New field. (shuffle(List, Random)): Use a for-loop. Keep track of pos instead of using previousIndex() and nextIndex(). (singletonMap(iterator)): Use a HashMap.Entry, not BasicMapEntry. * java/util/AbstractCollection.java (toString): Use a StringBuffer. * java/util/AbstractMap.java (toString): Use StringBuffer. * java/lang/ref/PhantomReference.java: Imported from classpath. * java/lang/ref/SoftReference.java: Ditto. * java/lang/ref/Reference.java: Ditto. * java/lang/ref/WeakReference.java: Ditto. * java/lang/ref/ReferenceQueue.java: Ditto. From-SVN: r38183 --- libjava/java/util/AbstractCollection.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libjava/java/util/AbstractCollection.java') diff --git a/libjava/java/util/AbstractCollection.java b/libjava/java/util/AbstractCollection.java index d75aff9..1bb73d7 100644 --- a/libjava/java/util/AbstractCollection.java +++ b/libjava/java/util/AbstractCollection.java @@ -332,14 +332,14 @@ public abstract class AbstractCollection implements Collection { Iterator itr = iterator(); int size = size(); - String r = "["; + StringBuffer r = new StringBuffer("["); for (int pos = 0; pos < size; pos++) { - r += itr.next(); + r.append(itr.next()); if (pos < size - 1) - r += ", "; + r.append(", "); } - r += "]"; - return r; + r.append("]"); + return r.toString(); } } -- cgit v1.1