You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Benedikt Ritter <br...@apache.org> on 2013/07/05 16:01:53 UTC

Re: svn commit: r1500007 - in /commons/proper/collections/trunk/src: main/java/org/apache/commons/collections4/ main/java/org/apache/commons/collections4/bag/ test/java/org/apache/commons/collections4/bag/

2013/7/5 <gg...@apache.org>

> Author: ggregory
> Date: Fri Jul  5 13:44:02 2013
> New Revision: 1500007
>

Almost hit the 1.5 million ;-)


>
> URL: http://svn.apache.org/r1500007
> Log:
> Rename CompliantBag to CollectionBag.
>
> Added:
>
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
>       - copied, changed from r1500004,
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java
>
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
>       - copied, changed from r1500004,
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
> Removed:
>
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java
>
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
> Modified:
>
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
>
> Modified:
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
> URL:
> http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java?rev=1500007&r1=1500006&r2=1500007&view=diff
>
> ==============================================================================
> ---
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
> (original)
> +++
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
> Fri Jul  5 13:44:02 2013
> @@ -16,7 +16,7 @@
>   */
>  package org.apache.commons.collections4;
>
> -import org.apache.commons.collections4.bag.CompliantBag;
> +import org.apache.commons.collections4.bag.CollectionBag;
>  import org.apache.commons.collections4.bag.HashBag;
>  import org.apache.commons.collections4.bag.PredicatedBag;
>  import org.apache.commons.collections4.bag.PredicatedSortedBag;
> @@ -144,8 +144,8 @@ public class BagUtils {
>       * @throws IllegalArgumentException if bag is null
>       * @since 4.0
>       */
> -    public static <E> Bag<E> compliantBag(final Bag<E> bag) {
> -        return CompliantBag.compliantBag(bag);
> +    public static <E> Bag<E> collectionBag(final Bag<E> bag) {
> +        return CollectionBag.collectionBag(bag);
>      }
>
>
>  //-----------------------------------------------------------------------
>
> Copied:
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
> (from r1500004,
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java)
> URL:
> http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java?p2=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java&p1=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java&r1=1500004&r2=1500007&rev=1500007&view=diff
>
> ==============================================================================
> ---
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java
> (original)
> +++
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
> Fri Jul  5 13:44:02 2013
> @@ -31,7 +31,7 @@ import org.apache.commons.collections4.B
>   * @since 4.0
>   * @version $Id$
>   */
> -public final class CompliantBag<E>
> +public final class CollectionBag<E>
>          extends AbstractBagDecorator<E> implements Serializable {
>
>      /** Serialization version */
> @@ -45,8 +45,8 @@ public final class CompliantBag<E>
>       * @return a Bag that complies to the Collection contract
>       * @throws IllegalArgumentException if bag is null
>       */
> -    public static <E> Bag<E> compliantBag(final Bag<E> bag) {
> -        return new CompliantBag<E>(bag);
> +    public static <E> Bag<E> collectionBag(final Bag<E> bag) {
> +        return new CollectionBag<E>(bag);
>      }
>
>
>  //-----------------------------------------------------------------------
> @@ -56,7 +56,7 @@ public final class CompliantBag<E>
>       * @param bag  the bag to decorate, must not be null
>       * @throws IllegalArgumentException if bag is null
>       */
> -    public CompliantBag(final Bag<E> bag) {
> +    public CollectionBag(final Bag<E> bag) {
>          super(bag);
>      }
>
>
> Copied:
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
> (from r1500004,
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java)
> URL:
> http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java&r1=1500004&r2=1500007&rev=1500007&view=diff
>
> ==============================================================================
> ---
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
> (original)
> +++
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
> Fri Jul  5 13:44:02 2013
> @@ -31,19 +31,19 @@ import org.apache.commons.collections4.b
>  import org.apache.commons.collections4.collection.AbstractCollectionTest;
>
>  /**
> - * Test class for {@link CompliantBag}.
> + * Test class for {@link CollectionBag}.
>   *
>   * @version $Id$
>   * @since 4.0
>   */
> -public class CompliantBagTest<T> extends AbstractCollectionTest<T> {
> +public class CollectionBagTest<T> extends AbstractCollectionTest<T> {
>
>      /**
>       * JUnit constructor.
>       *
>       * @param testName  the test class name
>       */
> -    public CompliantBagTest(final String testName) {
> +    public CollectionBagTest(final String testName) {
>          super(testName);
>      }
>
> @@ -51,7 +51,7 @@ public class CompliantBagTest<T> extends
>
>      @Override
>      public Bag<T> makeObject() {
> -        return CompliantBag.compliantBag(new HashBag<T>());
> +        return CollectionBag.collectionBag(new HashBag<T>());
>      }
>
>      /**
> @@ -83,14 +83,14 @@ public class CompliantBagTest<T> extends
>
>  //    public void testCreate() throws Exception {
>  //        Bag bag = makeObject();
> -//        writeExternalFormToDisk((java.io.Serializable) bag,
> "src/test/resources/data/test/CompliantBag.emptyCollection.version4.obj");
> +//        writeExternalFormToDisk((java.io.Serializable) bag,
> "src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj");
>  //        bag = makeObject();
>  //        bag.add("A");
>  //        bag.add("A");
>  //        bag.add("B");
>  //        bag.add("B");
>  //        bag.add("C");
> -//        writeExternalFormToDisk((java.io.Serializable) bag,
> "src/test/resources/data/test/CompliantBag.fullCollection.version4.obj");
> +//        writeExternalFormToDisk((java.io.Serializable) bag,
> "src/test/resources/data/test/CollectionBag.fullCollection.version4.obj");
>  //    }
>
>
>  //-----------------------------------------------------------------------
>
>
>


-- 
http://people.apache.org/~britter/
http://www.systemoutprintln.de/
http://twitter.com/BenediktRitter
http://github.com/britter

Re: svn commit: r1500007 - in /commons/proper/collections/trunk/src: main/java/org/apache/commons/collections4/ main/java/org/apache/commons/collections4/bag/ test/java/org/apache/commons/collections4/bag/

Posted by Gary Gregory <ga...@gmail.com>.
On Fri, Jul 5, 2013 at 10:01 AM, Benedikt Ritter <br...@apache.org> wrote:

> 2013/7/5 <gg...@apache.org>
>
> > Author: ggregory
> > Date: Fri Jul  5 13:44:02 2013
> > New Revision: 1500007
> >
>
> Almost hit the 1.5 million ;-)
>

There goes my claim to fame, darn. ;)

G


>
>
> >
> > URL: http://svn.apache.org/r1500007
> > Log:
> > Rename CompliantBag to CollectionBag.
> >
> > Added:
> >
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
> >       - copied, changed from r1500004,
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java
> >
> >
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
> >       - copied, changed from r1500004,
> >
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
> > Removed:
> >
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java
> >
> >
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
> > Modified:
> >
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
> >
> > Modified:
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
> > URL:
> >
> http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java?rev=1500007&r1=1500006&r2=1500007&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
> > (original)
> > +++
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/BagUtils.java
> > Fri Jul  5 13:44:02 2013
> > @@ -16,7 +16,7 @@
> >   */
> >  package org.apache.commons.collections4;
> >
> > -import org.apache.commons.collections4.bag.CompliantBag;
> > +import org.apache.commons.collections4.bag.CollectionBag;
> >  import org.apache.commons.collections4.bag.HashBag;
> >  import org.apache.commons.collections4.bag.PredicatedBag;
> >  import org.apache.commons.collections4.bag.PredicatedSortedBag;
> > @@ -144,8 +144,8 @@ public class BagUtils {
> >       * @throws IllegalArgumentException if bag is null
> >       * @since 4.0
> >       */
> > -    public static <E> Bag<E> compliantBag(final Bag<E> bag) {
> > -        return CompliantBag.compliantBag(bag);
> > +    public static <E> Bag<E> collectionBag(final Bag<E> bag) {
> > +        return CollectionBag.collectionBag(bag);
> >      }
> >
> >
> >
>  //-----------------------------------------------------------------------
> >
> > Copied:
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
> > (from r1500004,
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java)
> > URL:
> >
> http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java?p2=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java&p1=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java&r1=1500004&r2=1500007&rev=1500007&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CompliantBag.java
> > (original)
> > +++
> >
> commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
> > Fri Jul  5 13:44:02 2013
> > @@ -31,7 +31,7 @@ import org.apache.commons.collections4.B
> >   * @since 4.0
> >   * @version $Id$
> >   */
> > -public final class CompliantBag<E>
> > +public final class CollectionBag<E>
> >          extends AbstractBagDecorator<E> implements Serializable {
> >
> >      /** Serialization version */
> > @@ -45,8 +45,8 @@ public final class CompliantBag<E>
> >       * @return a Bag that complies to the Collection contract
> >       * @throws IllegalArgumentException if bag is null
> >       */
> > -    public static <E> Bag<E> compliantBag(final Bag<E> bag) {
> > -        return new CompliantBag<E>(bag);
> > +    public static <E> Bag<E> collectionBag(final Bag<E> bag) {
> > +        return new CollectionBag<E>(bag);
> >      }
> >
> >
> >
>  //-----------------------------------------------------------------------
> > @@ -56,7 +56,7 @@ public final class CompliantBag<E>
> >       * @param bag  the bag to decorate, must not be null
> >       * @throws IllegalArgumentException if bag is null
> >       */
> > -    public CompliantBag(final Bag<E> bag) {
> > +    public CollectionBag(final Bag<E> bag) {
> >          super(bag);
> >      }
> >
> >
> > Copied:
> >
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
> > (from r1500004,
> >
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java)
> > URL:
> >
> http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java&r1=1500004&r2=1500007&rev=1500007&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CompliantBagTest.java
> > (original)
> > +++
> >
> commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
> > Fri Jul  5 13:44:02 2013
> > @@ -31,19 +31,19 @@ import org.apache.commons.collections4.b
> >  import
> org.apache.commons.collections4.collection.AbstractCollectionTest;
> >
> >  /**
> > - * Test class for {@link CompliantBag}.
> > + * Test class for {@link CollectionBag}.
> >   *
> >   * @version $Id$
> >   * @since 4.0
> >   */
> > -public class CompliantBagTest<T> extends AbstractCollectionTest<T> {
> > +public class CollectionBagTest<T> extends AbstractCollectionTest<T> {
> >
> >      /**
> >       * JUnit constructor.
> >       *
> >       * @param testName  the test class name
> >       */
> > -    public CompliantBagTest(final String testName) {
> > +    public CollectionBagTest(final String testName) {
> >          super(testName);
> >      }
> >
> > @@ -51,7 +51,7 @@ public class CompliantBagTest<T> extends
> >
> >      @Override
> >      public Bag<T> makeObject() {
> > -        return CompliantBag.compliantBag(new HashBag<T>());
> > +        return CollectionBag.collectionBag(new HashBag<T>());
> >      }
> >
> >      /**
> > @@ -83,14 +83,14 @@ public class CompliantBagTest<T> extends
> >
> >  //    public void testCreate() throws Exception {
> >  //        Bag bag = makeObject();
> > -//        writeExternalFormToDisk((java.io.Serializable) bag,
> >
> "src/test/resources/data/test/CompliantBag.emptyCollection.version4.obj");
> > +//        writeExternalFormToDisk((java.io.Serializable) bag,
> >
> "src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj");
> >  //        bag = makeObject();
> >  //        bag.add("A");
> >  //        bag.add("A");
> >  //        bag.add("B");
> >  //        bag.add("B");
> >  //        bag.add("C");
> > -//        writeExternalFormToDisk((java.io.Serializable) bag,
> > "src/test/resources/data/test/CompliantBag.fullCollection.version4.obj");
> > +//        writeExternalFormToDisk((java.io.Serializable) bag,
> >
> "src/test/resources/data/test/CollectionBag.fullCollection.version4.obj");
> >  //    }
> >
> >
> >
>  //-----------------------------------------------------------------------
> >
> >
> >
>
>
> --
> http://people.apache.org/~britter/
> http://www.systemoutprintln.de/
> http://twitter.com/BenediktRitter
> http://github.com/britter
>



-- 
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory