* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38183 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 8 insertions, 5 deletions

diff --git a/libjava/java/util/AbstractMap.java b/libjava/java/util/AbstractMap.java
index c4f9df0fc9f..7ce73053a08 100644
--- a/libjava/java/util/AbstractMap.java
+++ b/libjava/java/util/AbstractMap.java
@@ -227,15 +227,18 @@ public abstract class AbstractMap implements Map
   {
     Iterator entries = entrySet().iterator();
     int size = size();
-    String r = "{";
+    StringBuffer r = new StringBuffer("{");
     for (int pos = 0; pos < size; pos++)
       {
-	r += entries.next();
+        // Append the toString value of the entries rather than calling 
+	// getKey/getValue. This is more efficient and it matches the JDK
+	// behaviour.
+	r.append(entries.next());	
 	if (pos < size - 1)
-	  r += ", ";
+	  r.append(", ");
       }
-    r += "}";
-    return r;
+    r.append("}");
+    return r.toString();
   }
 
   public Collection values()