Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 466FD101EE for ; Tue, 10 Sep 2013 20:00:53 +0000 (UTC) Received: (qmail 71228 invoked by uid 500); 10 Sep 2013 20:00:52 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 71025 invoked by uid 500); 10 Sep 2013 20:00:50 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 71011 invoked by uid 99); 10 Sep 2013 20:00:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Sep 2013 20:00:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Sep 2013 20:00:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9D44A238890D; Tue, 10 Sep 2013 20:00:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1521617 - in /commons/proper/collections/trunk: RELEASE-NOTES.txt src/changes/changes.xml src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java Date: Tue, 10 Sep 2013 20:00:25 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130910200025.9D44A238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ 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. 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 impl * * @param compositeCollections the collections to composite */ - public CompositeCollection(final Collection[] compositeCollections) { + public CompositeCollection(final Collection... compositeCollections) { super(); addComposited(compositeCollections); } @@ -367,7 +367,7 @@ public class CompositeCollection impl * * @param compositeCollections the Collections to be appended to the composite */ - public void addComposited(final Collection[] compositeCollections) { + public void addComposited(final Collection... compositeCollections) { all.addAll(Arrays.asList(compositeCollections)); }