diff --git a/src/java/org/apache/commons/collections/ExtendedProperties.java b/src/java/org/apache/commons/collections/ExtendedProperties.java index d4b7b54b7..d875e9d91 100644 --- a/src/java/org/apache/commons/collections/ExtendedProperties.java +++ b/src/java/org/apache/commons/collections/ExtendedProperties.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ExtendedProperties.java,v 1.10 2003/04/18 23:17:09 rwaldhoff Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ExtendedProperties.java,v 1.11 2003/05/16 14:36:40 scolebourne Exp $ * ==================================================================== * * 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,8 +157,8 @@ import java.util.Vector; * 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 - * @version $Revision: 1.10 $ $Date: 2003/04/18 23:17:09 $ + * @since Commons Collections 1.0 + * @version $Revision: 1.11 $ $Date: 2003/05/16 14:36:40 $ * * @author Stefano Mazzocchi * @author Jon S. Stevens @@ -170,8 +170,8 @@ import java.util.Vector; * @author Daniel Rall * @author Ilkka Priha */ -public class ExtendedProperties extends Hashtable -{ +public class ExtendedProperties extends Hashtable { + /** * Default configurations repository. */ diff --git a/src/java/org/apache/commons/collections/FastArrayList.java b/src/java/org/apache/commons/collections/FastArrayList.java index f2f4e8f23..eaabb891f 100644 --- a/src/java/org/apache/commons/collections/FastArrayList.java +++ b/src/java/org/apache/commons/collections/FastArrayList.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastArrayList.java,v 1.9 2002/10/12 22:15:18 scolebourne Exp $ - * $Revision: 1.9 $ - * $Date: 2002/10/12 22:15:18 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastArrayList.java,v 1.10 2003/05/16 14:36:40 scolebourne Exp $ * ==================================================================== * * 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 @@ * . * */ - - package org.apache.commons.collections; - import java.util.ArrayList; import java.util.Collection; import java.util.ConcurrentModificationException; @@ -70,7 +64,6 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; - /** *

A customized implementation of java.util.ArrayList designed * to operate in a multithreaded environment where the large majority of @@ -93,8 +86,8 @@ import java.util.ListIterator; * java.util.ArrayList directly (with no synchronization), for * maximum performance.

* - *

NOTE: This class is not cross-platform. - * Using it may cause unexpected failures on some architectures. + *

NOTE: This class is not cross-platform. + * Using it may cause unexpected failures on some architectures. * 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 @@ import java.util.ListIterator; * 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 - * - * Double-Checked Locking Idiom Is Broken Declartion.

+ * + * Double-Checked Locking Idiom Is Broken Declartion.

* - * @since 1.0 + * @since Commons Collections 1.0 + * @version $Revision: 1.10 $ $Date: 2003/05/16 14:36:40 $ + * * @author Craig R. McClanahan - * @version $Revision: 1.9 $ $Date: 2002/10/12 22:15:18 $ */ - public class FastArrayList extends ArrayList { diff --git a/src/java/org/apache/commons/collections/FastHashMap.java b/src/java/org/apache/commons/collections/FastHashMap.java index 7a551e30d..18ff89102 100644 --- a/src/java/org/apache/commons/collections/FastHashMap.java +++ b/src/java/org/apache/commons/collections/FastHashMap.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastHashMap.java,v 1.12 2003/01/18 13:37:12 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastHashMap.java,v 1.13 2003/05/16 14:36:40 scolebourne Exp $ * ==================================================================== * * 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 @@ import java.util.Set; * java.util.HashMap directly (with no synchronization), for * maximum performance.

* - *

NOTE: This class is not cross-platform. - * Using it may cause unexpected failures on some architectures. + *

NOTE: This class is not cross-platform. + * Using it may cause unexpected failures on some architectures. * 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,11 +95,11 @@ import java.util.Set; * 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 - * - * Double-Checked Locking Idiom Is Broken Declartion.

+ * + * Double-Checked Locking Idiom Is Broken Declartion.

* * @since Commons Collections 1.0 - * @version $Revision: 1.12 $ $Date: 2003/01/18 13:37:12 $ + * @version $Revision: 1.13 $ $Date: 2003/05/16 14:36:40 $ * * @author Craig R. McClanahan * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/collections/FastTreeMap.java b/src/java/org/apache/commons/collections/FastTreeMap.java index b783957f8..89b698637 100644 --- a/src/java/org/apache/commons/collections/FastTreeMap.java +++ b/src/java/org/apache/commons/collections/FastTreeMap.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastTreeMap.java,v 1.11 2003/01/18 14:03:28 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FastTreeMap.java,v 1.12 2003/05/16 14:36:40 scolebourne Exp $ * ==================================================================== * * 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 @@ import java.util.TreeMap; * java.util.TreeMap directly (with no synchronization), for * maximum performance.

* - *

NOTE: This class is not cross-platform. - * Using it may cause unexpected failures on some architectures. + *

NOTE: This class is not cross-platform. + * Using it may cause unexpected failures on some architectures. * 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,11 +97,11 @@ import java.util.TreeMap; * 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 - * - * Double-Checked Locking Idiom Is Broken Declartion.

+ * + * Double-Checked Locking Idiom Is Broken Declartion.

* - * @since 1.0 - * @version $Revision: 1.11 $ $Date: 2003/01/18 14:03:28 $ + * @since Commons Collections 1.0 + * @version $Revision: 1.12 $ $Date: 2003/05/16 14:36:40 $ * * @author Craig R. McClanahan * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/collections/HashBag.java b/src/java/org/apache/commons/collections/HashBag.java index 451567413..d84bd4abd 100644 --- a/src/java/org/apache/commons/collections/HashBag.java +++ b/src/java/org/apache/commons/collections/HashBag.java @@ -1,9 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/HashBag.java,v 1.7 2003/01/13 23:54:38 rwaldhoff Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/HashBag.java,v 1.8 2003/05/16 14:36:40 scolebourne Exp $ * ==================================================================== + * * 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 @@ * . * */ - package org.apache.commons.collections; import java.util.Collection; @@ -64,27 +64,28 @@ import java.util.HashMap; * A {@link Bag} that is backed by a {@link HashMap}. * * @since Commons Collections 2.0 - * @version $Revision: 1.7 $ $Date: 2003/01/13 23:54:38 $ + * @version $Revision: 1.8 $ $Date: 2003/05/16 14:36:40 $ + * * @author Chuck Burdick - **/ + */ public class HashBag extends DefaultMapBag implements Bag { - /** - * Constructs an empty HashBag. - */ - public HashBag() { - super(new HashMap()); - } + /** + * Constructs an empty HashBag. + */ + 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); - } } - - diff --git a/src/java/org/apache/commons/collections/IteratorUtils.java b/src/java/org/apache/commons/collections/IteratorUtils.java index a86956611..623be9b59 100644 --- a/src/java/org/apache/commons/collections/IteratorUtils.java +++ b/src/java/org/apache/commons/collections/IteratorUtils.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/IteratorUtils.java,v 1.9 2003/01/15 21:55:43 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/IteratorUtils.java,v 1.10 2003/05/16 14:36:40 scolebourne Exp $ * ==================================================================== * * 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,13 +88,14 @@ import org.apache.commons.collections.iterators.ResetableListIterator; 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 * {@link org.apache.commons.collections.iterators} subpackage. * * @since Commons Collections 2.1 - * @version $Revision: 1.9 $ $Date: 2003/01/15 21:55:43 $ + * @version $Revision: 1.10 $ $Date: 2003/05/16 14:36:40 $ * * @author Stephen Colebourne */ diff --git a/src/java/org/apache/commons/collections/LRUMap.java b/src/java/org/apache/commons/collections/LRUMap.java index 208da8b66..7b73cbc2c 100644 --- a/src/java/org/apache/commons/collections/LRUMap.java +++ b/src/java/org/apache/commons/collections/LRUMap.java @@ -1,9 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/LRUMap.java,v 1.18 2003/01/13 23:54:38 rwaldhoff Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/LRUMap.java,v 1.19 2003/05/16 14:36:40 scolebourne Exp $ * ==================================================================== + * * 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 @@ -84,7 +85,8 @@ import java.util.Iterator; *

* * @since Commons Collections 1.0 - * @version $Revision: 1.18 $ $Date: 2003/01/13 23:54:38 $ + * @version $Revision: 1.19 $ $Date: 2003/05/16 14:36:40 $ + * * @author James Strachan * @author Morgan Delagrange */ diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java index b74a1df59..e128fc6cf 100644 --- a/src/java/org/apache/commons/collections/MultiHashMap.java +++ b/src/java/org/apache/commons/collections/MultiHashMap.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MultiHashMap.java,v 1.10 2003/05/11 14:00:09 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MultiHashMap.java,v 1.11 2003/05/16 14:40:56 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -89,7 +89,7 @@ import java.util.Set; * coll will be a list containing "A", "B", "C". * * @since Commons Collections 2.0 - * @version $Revision: 1.10 $ $Date: 2003/05/11 14:00:09 $ + * @version $Revision: 1.11 $ $Date: 2003/05/16 14:40:56 $ * * @author Christopher Berry * @author James Strachan diff --git a/src/java/org/apache/commons/collections/MultiKey.java b/src/java/org/apache/commons/collections/MultiKey.java index 74b9867e9..eb816df3c 100644 --- a/src/java/org/apache/commons/collections/MultiKey.java +++ b/src/java/org/apache/commons/collections/MultiKey.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/MultiKey.java,v 1.1 2003/03/09 00:06:44 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/MultiKey.java,v 1.2 2003/05/16 14:40:56 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -69,7 +69,7 @@ import java.util.Arrays; * can be used instead by creating an instance passing in the key and locale. * * @since Commons Collections 2.2 - * @version $Revision: 1.1 $ $Date: 2003/03/09 00:06:44 $ + * @version $Revision: 1.2 $ $Date: 2003/05/16 14:40:56 $ * * @author Howard Lewis Ship * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java index 8b3cf18d0..a6b31b915 100644 --- a/src/java/org/apache/commons/collections/MultiMap.java +++ b/src/java/org/apache/commons/collections/MultiMap.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MultiMap.java,v 1.5 2002/11/24 19:33:19 scolebourne Exp $ - * $Revision: 1.5 $ - * $Date: 2002/11/24 19:33:19 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MultiMap.java,v 1.6 2003/05/16 14:40:56 scolebourne Exp $ * ==================================================================== * * 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 @@ -81,7 +78,9 @@ import java.util.Map; *

* coll will be a list containing "A", "B", "C". * - * @since 2.0 + * @since Commons Collections 2.0 + * @version $Revision: 1.6 $ $Date: 2003/05/16 14:40:56 $ + * * @author Christopher Berry * @author James Strachan * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/collections/NodeCachingLinkedList.java b/src/java/org/apache/commons/collections/NodeCachingLinkedList.java index 00ea0d45a..5924cd7b2 100644 --- a/src/java/org/apache/commons/collections/NodeCachingLinkedList.java +++ b/src/java/org/apache/commons/collections/NodeCachingLinkedList.java @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/NodeCachingLinkedList.java,v 1.4 2003/01/10 20:21:23 rwaldhoff Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/NodeCachingLinkedList.java,v 1.5 2003/05/16 14:40:56 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -65,9 +65,10 @@ import java.util.Collection; * improvement. * * @since Commons Collections 2.2 + * @version $Revision: 1.5 $ $Date: 2003/05/16 14:40:56 $ + * * @author Jeff Varszegi * @author Rich Dougherty - * @version $Revision: 1.4 $ $Date: 2003/01/10 20:21:23 $ */ public class NodeCachingLinkedList extends CommonsLinkedList {