diff --git a/project.xml b/project.xml index 2379dc567..46b2fbd27 100644 --- a/project.xml +++ b/project.xml @@ -193,6 +193,9 @@ Christopher Berry + + Nathan Beyer + Janek Bogucki diff --git a/src/java/org/apache/commons/collections/DefaultMapBag.java b/src/java/org/apache/commons/collections/DefaultMapBag.java index 390dc223c..809735855 100644 --- a/src/java/org/apache/commons/collections/DefaultMapBag.java +++ b/src/java/org/apache/commons/collections/DefaultMapBag.java @@ -181,7 +181,7 @@ public abstract class DefaultMapBag implements Bag { return false; } for (Iterator it = _map.keySet().iterator(); it.hasNext();) { - Object element = (Object) it.next(); + Object element = it.next(); if (other.getCount(element) != getCount(element)) { return false; } diff --git a/src/java/org/apache/commons/collections/MapUtils.java b/src/java/org/apache/commons/collections/MapUtils.java index 9efd58b2d..07bf3b446 100644 --- a/src/java/org/apache/commons/collections/MapUtils.java +++ b/src/java/org/apache/commons/collections/MapUtils.java @@ -18,7 +18,6 @@ package org.apache.commons.collections; import java.io.PrintStream; import java.text.NumberFormat; import java.text.ParseException; -import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -34,6 +33,7 @@ import org.apache.commons.collections.map.FixedSizeSortedMap; import org.apache.commons.collections.map.LazyMap; import org.apache.commons.collections.map.LazySortedMap; import org.apache.commons.collections.map.ListOrderedMap; +import org.apache.commons.collections.map.MultiValueMap; import org.apache.commons.collections.map.PredicatedMap; import org.apache.commons.collections.map.PredicatedSortedMap; import org.apache.commons.collections.map.TransformedMap; @@ -42,7 +42,6 @@ import org.apache.commons.collections.map.TypedMap; import org.apache.commons.collections.map.TypedSortedMap; import org.apache.commons.collections.map.UnmodifiableMap; import org.apache.commons.collections.map.UnmodifiableSortedMap; -import org.apache.commons.collections.map.MultiValueMap; /** * Provides utility methods and decorators for @@ -1065,8 +1064,7 @@ public class MapUtils { * If the input map had multiple entries with the same value mapped to * different keys, the returned map will map one of those keys to the * value, but the exact key which will be mapped is undefined. - * - * @see DoubleOrderedMap + * * @param map the map to invert, may not be null * @return a new HashMap containing the inverted data * @throws NullPointerException if the map is null diff --git a/src/java/org/apache/commons/collections/set/MapBackedSet.java b/src/java/org/apache/commons/collections/set/MapBackedSet.java index bdfd0c94e..cf32a9ce8 100644 --- a/src/java/org/apache/commons/collections/set/MapBackedSet.java +++ b/src/java/org/apache/commons/collections/set/MapBackedSet.java @@ -114,7 +114,7 @@ public final class MapBackedSet implements Set, Serializable { public boolean addAll(Collection coll) { int size = map.size(); for (Iterator it = coll.iterator(); it.hasNext();) { - Object obj = (Object) it.next(); + Object obj = it.next(); map.put(obj, dummyValue); } return (map.size() != size);