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 IteratorUtils.java HashBag.java FastTreeMap.java FastHashMap.java FastArrayList.java LRUMap.java ExtendedProperties.java
Date Fri, 16 May 2003 14:36:40 GMT
scolebourne    2003/05/16 07:36:40

  Modified:    collections/src/java/org/apache/commons/collections
                        IteratorUtils.java HashBag.java FastTreeMap.java
                        FastHashMap.java FastArrayList.java LRUMap.java
                        ExtendedProperties.java
  Log:
  Update licence and javadoc
  
  Revision  Changes    Path
  1.10      +4 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/IteratorUtils.java
  
  Index: IteratorUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/IteratorUtils.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- IteratorUtils.java	15 Jan 2003 21:55:43 -0000	1.9
  +++ IteratorUtils.java	16 May 2003 14:36:40 -0000	1.10
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -88,6 +88,7 @@
   import org.apache.commons.collections.iterators.SingletonIterator;
   import org.apache.commons.collections.iterators.SingletonListIterator;
   import org.apache.commons.collections.iterators.TransformIterator;
  +
   /**
    * Provides static utility methods and decorators for {@link Iterator} 
    * instances. The implementations are provided in the 
  
  
  
  1.8       +23 -22    jakarta-commons/collections/src/java/org/apache/commons/collections/HashBag.java
  
  Index: HashBag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/HashBag.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HashBag.java	13 Jan 2003 23:54:38 -0000	1.7
  +++ HashBag.java	16 May 2003 14:36:40 -0000	1.8
  @@ -1,9 +1,10 @@
   /*
    * $Header$
    * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -54,7 +55,6 @@
    * <http://www.apache.org/>.
    *
    */
  -
   package org.apache.commons.collections;
   
   import java.util.Collection;
  @@ -65,26 +65,27 @@
    *
    * @since Commons Collections 2.0
    * @version $Revision$ $Date$
  + * 
    * @author Chuck Burdick
  - **/
  + */
   public class HashBag extends DefaultMapBag implements Bag {
   
  -   /**
  -    * Constructs an empty <Code>HashBag</Code>.
  -    */
  -   public HashBag() {
  -      super(new HashMap());
  -   }
  +    /**
  +     * Constructs an empty <Code>HashBag</Code>.
  +     */
  +    public HashBag() {
  +        super(new HashMap());
  +    }
  +
  +    /**
  +     * Constructs a {@link Bag} containing all the members of the given
  +     * collection.
  +     * 
  +     * @param coll  a collection to copy into this bag
  +     */
  +    public HashBag(Collection coll) {
  +        this();
  +        addAll(coll);
  +    }
   
  -   /**
  -    * Constructs a {@link Bag} containing all the members of the given
  -    * collection.
  -    * @see #addAll
  -    */
  -   public HashBag(Collection c) {
  -      this();
  -      addAll(c);
  -   }
   }
  -
  -
  
  
  
  1.12      +8 -8      jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java
  
  Index: FastTreeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastTreeMap.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- FastTreeMap.java	18 Jan 2003 14:03:28 -0000	1.11
  +++ FastTreeMap.java	16 May 2003 14:36:40 -0000	1.12
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -88,8 +88,8 @@
    * <code>java.util.TreeMap</code> directly (with no synchronization), for
    * maximum performance.</p>
    *
  - * <P><strong>NOTE</strong>: <I>This class is not cross-platform.
 
  - * Using it may cause unexpected failures on some architectures.</I>
  + * <p><strong>NOTE</strong>: <i>This class is not cross-platform.
 
  + * Using it may cause unexpected failures on some architectures.</i>
    * It suffers from the same problems as the double-checked locking idiom.  
    * In particular, the instruction that clones the internal collection and the 
    * instruction that sets the internal reference to the clone can be executed 
  @@ -97,10 +97,10 @@
    * unexpectedly, as it may be reading the state of the internal collection
    * before the internal collection is fully formed.
    * For more information on the double-checked locking idiom, see the
  - * <A Href="http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html">
  - * Double-Checked Locking Idiom Is Broken Declartion</A>.</P>
  + * <a href="http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html">
  + * Double-Checked Locking Idiom Is Broken Declartion</a>.</p>
    *
  - * @since 1.0
  + * @since Commons Collections 1.0
    * @version $Revision$ $Date$
    * 
    * @author Craig R. McClanahan
  
  
  
  1.13      +7 -7      jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java
  
  Index: FastHashMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastHashMap.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- FastHashMap.java	18 Jan 2003 13:37:12 -0000	1.12
  +++ FastHashMap.java	16 May 2003 14:36:40 -0000	1.13
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -86,8 +86,8 @@
    * <code>java.util.HashMap</code> directly (with no synchronization), for
    * maximum performance.</p>
    *
  - * <P><strong>NOTE</strong>: <I>This class is not cross-platform.
 
  - * Using it may cause unexpected failures on some architectures.</I>
  + * <p><strong>NOTE</strong>: <i>This class is not cross-platform.
 
  + * Using it may cause unexpected failures on some architectures.</i>
    * It suffers from the same problems as the double-checked locking idiom.  
    * In particular, the instruction that clones the internal collection and the 
    * instruction that sets the internal reference to the clone can be executed 
  @@ -95,8 +95,8 @@
    * unexpectedly, as it may be reading the state of the internal collection
    * before the internal collection is fully formed.
    * For more information on the double-checked locking idiom, see the
  - * <A Href="http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html">
  - * Double-Checked Locking Idiom Is Broken Declartion</A>.</P>
  + * <a href="http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html">
  + * Double-Checked Locking Idiom Is Broken Declartion</a>.</p>
    *
    * @since Commons Collections 1.0
    * @version $Revision$ $Date$
  
  
  
  1.10      +13 -20    jakarta-commons/collections/src/java/org/apache/commons/collections/FastArrayList.java
  
  Index: FastArrayList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/FastArrayList.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FastArrayList.java	12 Oct 2002 22:15:18 -0000	1.9
  +++ FastArrayList.java	16 May 2003 14:36:40 -0000	1.10
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -23,11 +20,11 @@
    *    distribution.
    *
    * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  + *    any, must include the following acknowledgment:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
    *
    * 4. The names "The Jakarta Project", "Commons", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  @@ -36,7 +33,7 @@
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  - *    permission of the Apache Group.
  + *    permission of the Apache Software Foundation.
    *
    * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  @@ -58,11 +55,8 @@
    * <http://www.apache.org/>.
    *
    */
  -
  -
   package org.apache.commons.collections;
   
  -
   import java.util.ArrayList;
   import java.util.Collection;
   import java.util.ConcurrentModificationException;
  @@ -70,7 +64,6 @@
   import java.util.List;
   import java.util.ListIterator;
   
  -
   /**
    * <p>A customized implementation of <code>java.util.ArrayList</code>
designed
    * to operate in a multithreaded environment where the large majority of
  @@ -93,8 +86,8 @@
    * <code>java.util.ArrayList</code> directly (with no synchronization), for
    * maximum performance.</p>
    *
  - * <P><strong>NOTE</strong>: <I>This class is not cross-platform.
  - * Using it may cause unexpected failures on some architectures.</I>
  + * <p><strong>NOTE</strong>: <i>This class is not cross-platform.
  + * Using it may cause unexpected failures on some architectures.</i>
    * It suffers from the same problems as the double-checked locking idiom.  
    * In particular, the instruction that clones the internal collection and the 
    * instruction that sets the internal reference to the clone can be executed 
  @@ -102,14 +95,14 @@
    * unexpectedly, as it may be reading the state of the internal collection
    * before the internal collection is fully formed.
    * For more information on the double-checked locking idiom, see the
  - * <A Href="http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html">
  - * Double-Checked Locking Idiom Is Broken Declartion</A>.</P>
  + * <a href="http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html">
  + * Double-Checked Locking Idiom Is Broken Declartion</a>.</p>
    *
  - * @since 1.0
  - * @author Craig R. McClanahan
  + * @since Commons Collections 1.0
    * @version $Revision$ $Date$
  + * 
  + * @author Craig R. McClanahan
    */
  -
   public class FastArrayList extends ArrayList {
   
   
  
  
  
  1.19      +5 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/LRUMap.java
  
  Index: LRUMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/LRUMap.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- LRUMap.java	13 Jan 2003 23:54:38 -0000	1.18
  +++ LRUMap.java	16 May 2003 14:36:40 -0000	1.19
  @@ -1,9 +1,10 @@
   /*
    * $Header$
    * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -85,6 +86,7 @@
    * 
    * @since Commons Collections 1.0
    * @version $Revision$ $Date$
  + * 
    * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
    * @author <a href="mailto:morgand@apache.org">Morgan Delagrange</a>
    */
  
  
  
  1.11      +6 -6      jakarta-commons/collections/src/java/org/apache/commons/collections/ExtendedProperties.java
  
  Index: ExtendedProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/ExtendedProperties.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ExtendedProperties.java	18 Apr 2003 23:17:09 -0000	1.10
  +++ ExtendedProperties.java	16 May 2003 14:36:40 -0000	1.11
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -157,7 +157,7 @@
    * much time to improve it), I wrote it this way.  If you don't like
    * it, go ahead and tune it up!
    *
  - * @since 1.0
  + * @since Commons Collections 1.0
    * @version $Revision$ $Date$
    * 
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  @@ -170,8 +170,8 @@
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
    * @author <a href="mailto:ipriha@surfeu.fi">Ilkka Priha</a>
    */
  -public class ExtendedProperties extends Hashtable
  -{
  +public class ExtendedProperties extends Hashtable {
  +    
       /**
        * Default configurations repository.
        */
  
  
  

---------------------------------------------------------------------
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