From 1b58ab4b0f5f80fe54dcda28bb0d34e8ce8ea5c0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 8 Apr 2002 00:23:28 +0000 Subject: [PATCH] * java/util/AbstractMap.java (putAll): Use entrySet size. (toString): Explicitly use getKey() and getValue(). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@52008 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/java/util/AbstractMap.java | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a06b98a..6e7ea5d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2002-04-07 Mark Wielaard + * java/util/AbstractMap.java (putAll): Use entrySet size. + (toString): Explicitly use getKey() and getValue(). + +2002-04-07 Mark Wielaard + * java/util/Hashtable.java (contains): Remove NullPointer check. (containsValue): Add NullPointer check. (remove): Always throw NullPointerException when key diff --git a/libjava/java/util/AbstractMap.java b/libjava/java/util/AbstractMap.java index 393d3c7..555d055 100644 --- a/libjava/java/util/AbstractMap.java +++ b/libjava/java/util/AbstractMap.java @@ -353,7 +353,7 @@ public abstract class AbstractMap implements Map public void putAll(Map m) { Iterator entries = m.entrySet().iterator(); - int pos = size(); + int pos = m.size(); while (--pos >= 0) { Map.Entry entry = (Map.Entry) entries.next(); @@ -425,10 +425,10 @@ public abstract class AbstractMap implements Map StringBuffer r = new StringBuffer("{"); for (int pos = size(); pos > 0; pos--) { - // 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()); + Map.Entry entry = (Map.Entry) entries.next(); + r.append(entry.getKey()); + r.append('='); + r.append(entry.getValue()); if (pos > 1) r.append(", "); } -- 2.7.4