Author: tn
Date: Tue Sep 10 20:00:25 2013
New Revision: 1521617
URL: http://svn.apache.org/r1521617
Log:
[COLLECTIONS-481] Also change to varargs parameter in CompositeCollection.
Modified:
commons/proper/collections/trunk/RELEASE-NOTES.txt
commons/proper/collections/trunk/src/changes/changes.xml
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
Modified: commons/proper/collections/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/RELEASE-NOTES.txt?rev=1521617&r1=1521616&r2=1521617&view=diff
==============================================================================
--- commons/proper/collections/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/collections/trunk/RELEASE-NOTES.txt Tue Sep 10 20:00:25 2013
@@ -47,8 +47,8 @@ Changes since 4.0-alpha1
------------------------
- [COLLECTIONS-481] No collision detection/resolution was performed when
calling "CompositeSet#addComposited(...)"
- with more than one Set as argument. Also changed the the
method with an array argument to use
- a varargs parameter. Thanks to Hollis Waite.
+ with more than one Set as argument. Additionally use
varargs parameters instead of arrays
+ in CompositeSet and CompositeCollection constructor and
addComposited method. Thanks to Hollis Waite.
- [COLLECTIONS-480] Narrow return type of "BidiMap#values()" to Set as the
values are required to be unique. Thanks to Hollis Waite.
- [COLLECTIONS-468] Renamed CompliantBag to CollectionBag.
- [COLLECTIONS-475] Fixed conversion of timeout parameters in
"PassiveExpiringMap".
@@ -213,8 +213,8 @@ Fixed Bugs
----------
o [COLLECTIONS-481] No collision detection/resolution was performed when
calling "CompositeSet#addComposited(...)"
- with more than one Set as argument. Also changed the the
method with an array argument to use
- a varargs parameter. Thanks to Hollis Waite.
+ with more than one Set as argument. Additionally use
varargs parameters instead of arrays
+ in CompositeSet and CompositeCollection constructor and
addComposited method. Thanks to Hollis Waite.
o [COLLECTIONS-475] Fixed conversion of timeout parameters in
"PassiveExpiringMap".
o [COLLECTIONS-474] ListOrderedMap#putAll(index, Object, Object) does not
throw an exception anymore if the
map contains null values. Additionally added javadoc
clarification on the supported bounds
Modified: commons/proper/collections/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/changes/changes.xml?rev=1521617&r1=1521616&r2=1521617&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/changes/changes.xml (original)
+++ commons/proper/collections/trunk/src/changes/changes.xml Tue Sep 10
20:00:25 2013
@@ -24,8 +24,8 @@
<release version="4.0" date="TBA" description="Next release">
<action issue="COLLECTIONS-481" dev="tn" type="fix" due-to="Hollis Waite">
No collision detection/resolution was performed when calling
"CompositeSet#addComposited(...)"
- with more than one Set as argument. Also changed the the method with an
array argument to use a
- varargs parameter.
+ with more than one Set as argument. Additionally use varargs parameters
instead of arrays
+ in CompositeSet and CompositeCollection constructor and addComposited
method.
</action>
<action issue="COLLECTIONS-480" dev="tn" type="update" due-to="Hollis
Waite">
Narrow return type of "BidiMap#values()" to Set as the values are
required to be unique.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java?rev=1521617&r1=1521616&r2=1521617&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
Tue Sep 10 20:00:25 2013
@@ -84,7 +84,7 @@ public class CompositeCollection<E> impl
*
* @param compositeCollections the collections to composite
*/
- public CompositeCollection(final Collection<E>[] compositeCollections) {
+ public CompositeCollection(final Collection<E>... compositeCollections) {
super();
addComposited(compositeCollections);
}
@@ -367,7 +367,7 @@ public class CompositeCollection<E> impl
*
* @param compositeCollections the Collections to be appended to the
composite
*/
- public void addComposited(final Collection<E>[] compositeCollections) {
+ public void addComposited(final Collection<E>... compositeCollections) {
all.addAll(Arrays.asList(compositeCollections));
}
