commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/collection PredicatedCollection.java UnmodifiableCollection.java TransformedCollection.java UnmodifiableBoundedCollection.java
Date Wed, 02 Jun 2004 21:58:06 GMT
scolebourne    2004/06/02 14:58:06

  Modified:    collections/src/java/org/apache/commons/collections/collection
                        PredicatedCollection.java
                        UnmodifiableCollection.java
                        TransformedCollection.java
                        UnmodifiableBoundedCollection.java
  Log:
  Make decorator classes serializable, bug 18815
  
  Revision  Changes    Path
  1.6       +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
  
  Index: PredicatedCollection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/collection/PredicatedCollection.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PredicatedCollection.java	21 May 2004 21:38:40 -0000	1.5
  +++ PredicatedCollection.java	2 Jun 2004 21:58:06 -0000	1.6
  @@ -30,6 +30,8 @@
    * <p>
    * One usage would be to ensure that no null entries are added to the collection.
    * <pre>Collection coll = PredicatedCollection.decorate(new ArrayList(), NotNullPredicate.INSTANCE);</pre>
  + * <p>
  + * This class is Serializable from Commons Collections 3.1.
    *
    * @since Commons Collections 3.0
    * @version $Revision$ $Date$
  @@ -37,7 +39,7 @@
    * @author Stephen Colebourne
    * @author Paul Jack
    */
  -public class PredicatedCollection extends AbstractCollectionDecorator {
  +public class PredicatedCollection extends AbstractSerializableCollectionDecorator {
   
       /** The predicate to use */
       protected final Predicate predicate;
  
  
  
  1.7       +6 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
  
  Index: UnmodifiableCollection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- UnmodifiableCollection.java	15 May 2004 12:39:13 -0000	1.6
  +++ UnmodifiableCollection.java	2 Jun 2004 21:58:06 -0000	1.7
  @@ -23,13 +23,17 @@
   
   /**
    * Decorates another <code>Collection</code> to ensure it can't be altered.
  + * <p>
  + * This class is Serializable from Commons Collections 3.1.
    *
    * @since Commons Collections 3.0
    * @version $Revision$ $Date$
    * 
    * @author Stephen Colebourne
    */
  -public final class UnmodifiableCollection extends AbstractCollectionDecorator implements
Unmodifiable {
  +public final class UnmodifiableCollection
  +        extends AbstractSerializableCollectionDecorator
  +        implements Unmodifiable {
   
       /**
        * Factory method to create an unmodifiable collection.
  
  
  
  1.6       +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/collection/TransformedCollection.java
  
  Index: TransformedCollection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/collection/TransformedCollection.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TransformedCollection.java	15 May 2004 12:39:13 -0000	1.5
  +++ TransformedCollection.java	2 Jun 2004 21:58:06 -0000	1.6
  @@ -29,13 +29,15 @@
    * Thus objects must be removed or searched for using their transformed form.
    * For example, if the transformation converts Strings to Integers, you must
    * use the Integer form to remove objects.
  + * <p>
  + * This class is Serializable from Commons Collections 3.1.
    *
    * @since Commons Collections 3.0
    * @version $Revision$ $Date$
    * 
    * @author Stephen Colebourne
    */
  -public class TransformedCollection extends AbstractCollectionDecorator {
  +public class TransformedCollection extends AbstractSerializableCollectionDecorator {
   
       /** The transformer to use */
       protected final Transformer transformer;
  
  
  
  1.9       +7 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
  
  Index: UnmodifiableBoundedCollection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UnmodifiableBoundedCollection.java	15 May 2004 12:39:13 -0000	1.8
  +++ UnmodifiableBoundedCollection.java	2 Jun 2004 21:58:06 -0000	1.9
  @@ -30,13 +30,17 @@
    * longer accessible.
    * The factory on this class will attempt to retrieve the bounded nature by
    * examining the package scope variables.
  + * <p>
  + * This class is Serializable from Commons Collections 3.1.
    *
    * @since Commons Collections 3.0
    * @version $Revision$ $Date$
    * 
    * @author Stephen Colebourne
    */
  -public final class UnmodifiableBoundedCollection extends AbstractCollectionDecorator implements
BoundedCollection {
  +public final class UnmodifiableBoundedCollection
  +        extends AbstractSerializableCollectionDecorator
  +        implements BoundedCollection {
       
       /**
        * Factory method to create an unmodifiable bounded collection.
  @@ -130,5 +134,5 @@
       public int maxSize() {
           return ((BoundedCollection) collection).maxSize();
       }
  -    
  +
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message