From 696c7687162c70ba9de930af0327639b03680995 Mon Sep 17 00:00:00 2001
From: Thomas Neidhart <tn@apache.org>
Date: Sat, 27 Apr 2013 21:48:13 +0000
Subject: [PATCH] Added more issues which were marked with fix version
 4.0-beta1, applied one pending fix for using Arrays.toString.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1476681 13f79535-47bb-0310-9956-ffa450edef68
---
 src/changes/changes.xml                          | 16 +++++++++++++++-
 .../commons/collections4/keyvalue/MultiKey.java  |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2b70a8bc2..f9037565f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -311,7 +311,7 @@
     <action issue="COLLECTIONS-289" dev="bayard" type="add" due-to="Fredrik Kjellberg">
       Added method "CollatingIterator#getIteratorIndex()".
     </action>
-    <action issue="COLLECTIONS-288" dev="bayard" type="fix" due-to="Paul Benedict">
+    <action issue="COLLECTIONS-256,COLLECTIONS-288" dev="bayard" type="fix" due-to="Paul Benedict">
       Fixed javadoc for "ListUtils#transformedList(List)" to clarify that existing objects
       in the list are not transformed.
     </action>
@@ -345,6 +345,10 @@
     <action issue="COLLECTIONS-262" dev="bayard" type="fix" due-to="Lisen Mu">
       Fixed javadoc for methods "firstKey()" and "lastKey()" in class "AbstractLinkedMap".
     </action>
+    <action issue="COLLECTIONS-261" dev="bayard" type="fix" due-to="ori">
+      "Flat3Map#remove(Object)" will now return the correct value mapped to the removed key
+      if the size of the map is less or equal 3.
+    </action>
     <action issue="COLLECTIONS-260" dev="mbenson" type="add" due-to="Stephen Kestle">
       Added constructor "TransformingComparator(Transformer)".
     </action>
@@ -380,6 +384,9 @@
     <action issue="COLLECTIONS-235" dev="bayard" type="add" due-to="Nathan Egge">
       Added method "ListUtils#indexOf(List, Predicate)".
     </action>
+    <action issue="COLLECTIONS-232" dev="bayard" type="fix" due-to="Mark Hindess">
+      Fixed several unit tests which were using parameters to "assertEquals(...)" in wrong order.
+    </action>
     <action issue="COLLECTIONS-231" dev="tn" type="update" due-to="Torsten Curdt">
       Return concrete class in static factory methods instead of base class interface
       (except for Unmodifiable decorators).
@@ -411,6 +418,13 @@
       The "CollectionUtils#select(Collection, Predicate, Collection)" method will now
       return the output collection.
     </action>
+    <action issue="COLLECTIONS-217" dev="scolebourne" type="fix" due-to="Matt Bishop">
+      Calling "setValue(Object)" on any Entry returned by a "Flat3Map" will now
+      correctly set the value for the current entry.
+    </action>
+    <action issue="COLLECTIONS-216" dev="scolebourne" type="fix" due-to="Hendrik Maryns">
+      "MultiKey#toString()" will now use "Arrays#toString(List)".
+    </action>
     <action issue="COLLECTIONS-213" dev="brentworden" type="add" due-to="Dusan Chromy">
       Added support for resettable iterators in "IteratorIterable".
     </action>
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
index 37bd86c5a..de2ccb620 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
@@ -250,7 +250,7 @@ public class MultiKey<K> implements Serializable {
      */
     @Override
     public String toString() {
-        return "MultiKey" + Arrays.asList(keys).toString();
+        return "MultiKey" + Arrays.toString(keys);
     }
 
     /**