diff --git a/src/java/org/apache/commons/collections/ArrayStack.java b/src/java/org/apache/commons/collections/ArrayStack.java index 5fb401464..bca132cfb 100644 --- a/src/java/org/apache/commons/collections/ArrayStack.java +++ b/src/java/org/apache/commons/collections/ArrayStack.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ArrayStack.java,v 1.10 2002/10/13 12:56:42 scolebourne Exp $ - * $Revision: 1.10 $ - * $Date: 2002/10/13 12:56:42 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ArrayStack.java,v 1.11 2003/05/11 14:15:24 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 @@ -62,6 +59,7 @@ package org.apache.commons.collections; import java.util.ArrayList; import java.util.EmptyStackException; + /** * An implementation of the {@link java.util.Stack} API that is based on an * ArrayList instead of a Vector, so it is not @@ -77,12 +75,13 @@ import java.util.EmptyStackException; *

* Unlike Stack, ArrayStack accepts null entries. * + * @see java.util.Stack + * @since Commons Collections 1.0 + * @version $Revision: 1.11 $ $Date: 2003/05/11 14:15:24 $ + * * @author Craig R. McClanahan * @author Paul Jack * @author Stephen Colebourne - * @since 1.0 - * @version $Id: ArrayStack.java,v 1.10 2002/10/13 12:56:42 scolebourne Exp $ - * @see java.util.Stack */ public class ArrayStack extends ArrayList implements Buffer { diff --git a/src/java/org/apache/commons/collections/BeanMap.java b/src/java/org/apache/commons/collections/BeanMap.java index 97a923e89..d48f5cd67 100644 --- a/src/java/org/apache/commons/collections/BeanMap.java +++ b/src/java/org/apache/commons/collections/BeanMap.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BeanMap.java,v 1.18 2003/04/18 23:29:24 rwaldhoff Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BeanMap.java,v 1.19 2003/05/11 14:15:23 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 @@ -73,7 +73,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Set; - /** * An implementation of Map for JavaBeans which uses introspection to * get and put properties in the bean. @@ -82,7 +81,7 @@ import java.util.Set; * property is considered non existent in the Map * * @since Commons Collections 1.0 - * @version $Revision: 1.18 $ $Date: 2003/04/18 23:29:24 $ + * @version $Revision: 1.19 $ $Date: 2003/05/11 14:15:23 $ * * @author James Strachan * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/collections/BinaryHeap.java b/src/java/org/apache/commons/collections/BinaryHeap.java index eab9c9246..99ff064ac 100644 --- a/src/java/org/apache/commons/collections/BinaryHeap.java +++ b/src/java/org/apache/commons/collections/BinaryHeap.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BinaryHeap.java,v 1.12 2003/02/19 20:14:25 scolebourne Exp $ - * $Revision: 1.12 $ - * $Date: 2003/02/19 20:14:25 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BinaryHeap.java,v 1.13 2003/05/11 14:15:23 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 @@ -64,6 +61,7 @@ import java.util.AbstractCollection; import java.util.Comparator; import java.util.Iterator; import java.util.NoSuchElementException; + /** * Binary heap implementation of {@link PriorityQueue} and {@link Buffer}. *

@@ -88,13 +86,14 @@ import java.util.NoSuchElementException; * Buffer heap = BufferUtils.synchronizedBuffer(new BinaryHeap()); * * + * @since Commons Collections 1.0 + * @version $Revision: 1.13 $ $Date: 2003/05/11 14:15:23 $ + * * @author Peter Donald * @author Ram Chidambaram * @author Michael A. Smith * @author Paul Jack * @author Stephen Colebourne - * @since 1.0 - * @version $Id: BinaryHeap.java,v 1.12 2003/02/19 20:14:25 scolebourne Exp $ */ public final class BinaryHeap extends AbstractCollection implements PriorityQueue, Buffer { diff --git a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java index fcb4dba55..c5119899d 100644 --- a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java +++ b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java @@ -1,10 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BoundedFifoBuffer.java,v 1.7 2003/04/26 15:09:48 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BoundedFifoBuffer.java,v 1.8 2003/05/11 14:15:23 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 @@ -20,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 @@ -33,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 @@ -84,7 +84,7 @@ import java.util.NoSuchElementException; * This buffer prevents null objects from being added. * * @since 2.1 - * @version $Revision: 1.7 $ $Date: 2003/04/26 15:09:48 $ + * @version $Revision: 1.8 $ $Date: 2003/05/11 14:15:23 $ * * @author Avalon * @author Berin Loritsch diff --git a/src/java/org/apache/commons/collections/Buffer.java b/src/java/org/apache/commons/collections/Buffer.java index 33ef42984..b3d2aca80 100644 --- a/src/java/org/apache/commons/collections/Buffer.java +++ b/src/java/org/apache/commons/collections/Buffer.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Buffer.java,v 1.3 2002/10/13 12:58:04 scolebourne Exp $ - * $Revision: 1.3 $ - * $Date: 2002/10/13 12:58:04 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Buffer.java,v 1.4 2003/05/11 14:15:23 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2002 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 @@ -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 @@ -61,6 +58,7 @@ package org.apache.commons.collections; import java.util.Collection; + /** * A Buffer is a collection that allows objects to be removed in some * well-defined order. The removal order can be based on insertion order @@ -78,12 +76,13 @@ import java.util.Collection; * also implement {@link java.util.List}, {@link java.util.Set} or * {@link Bag}. * + * @since Commons Collections 2.1 + * @version $Revision: 1.4 $ $Date: 2003/05/11 14:15:23 $ + * * @author Avalon * @author Berin Loritsch * @author Paul Jack * @author Stephen Colebourne - * @version $Id: Buffer.java,v 1.3 2002/10/13 12:58:04 scolebourne Exp $ - * @since 2.1 */ public interface Buffer extends Collection { @@ -102,4 +101,5 @@ public interface Buffer extends Collection { * @throws BufferUnderflowException if the buffer is empty */ Object get(); + } diff --git a/src/java/org/apache/commons/collections/BufferOverflowException.java b/src/java/org/apache/commons/collections/BufferOverflowException.java index 3393b3081..1543ba73e 100644 --- a/src/java/org/apache/commons/collections/BufferOverflowException.java +++ b/src/java/org/apache/commons/collections/BufferOverflowException.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferOverflowException.java,v 1.4 2002/10/13 12:57:12 scolebourne Exp $ - * $Revision: 1.4 $ - * $Date: 2002/10/13 12:57:12 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferOverflowException.java,v 1.5 2003/05/11 14:15:23 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2002 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 @@ -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 @@ -64,23 +61,26 @@ package org.apache.commons.collections; * The BufferOverflowException is used when the buffer's capacity has been * exceeded. * + * @since Commons Collections 2.1 + * @version $Revision: 1.5 $ $Date: 2003/05/11 14:15:23 $ + * * @author Avalon * @author Berin Loritsch * @author Jeff Turner * @author Paul Jack * @author Stephen Colebourne - * @since 2.1 - * @version $Id: BufferOverflowException.java,v 1.4 2002/10/13 12:57:12 scolebourne Exp $ */ public class BufferOverflowException extends RuntimeException { - private final Throwable m_throwable; + + /** The root cause throwable */ + private final Throwable throwable; /** * Constructs a new BufferOverflowException. */ public BufferOverflowException() { super(); - m_throwable = null; + throwable = null; } /** @@ -100,7 +100,7 @@ public class BufferOverflowException extends RuntimeException { */ public BufferOverflowException(String message, Throwable exception) { super(message); - m_throwable = exception; + throwable = exception; } /** @@ -109,6 +109,7 @@ public class BufferOverflowException extends RuntimeException { * @return the root cause */ public final Throwable getCause() { - return m_throwable; + return throwable; } + } diff --git a/src/java/org/apache/commons/collections/BufferUnderflowException.java b/src/java/org/apache/commons/collections/BufferUnderflowException.java index 129721062..f5be6cbc1 100644 --- a/src/java/org/apache/commons/collections/BufferUnderflowException.java +++ b/src/java/org/apache/commons/collections/BufferUnderflowException.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUnderflowException.java,v 1.5 2002/10/13 12:57:38 scolebourne Exp $ - * $Revision: 1.5 $ - * $Date: 2002/10/13 12:57:38 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUnderflowException.java,v 1.6 2003/05/11 14:15:23 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2002 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 @@ -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 @@ -61,25 +58,28 @@ package org.apache.commons.collections; /** - * The BufferUnderflowException is used when the buffer is already empty + * The BufferUnderflowException is used when the buffer is already empty. + * + * @since Commons Collections 2.1 + * @version $Revision: 1.6 $ $Date: 2003/05/11 14:15:23 $ * * @author Avalon * @author Berin Loritsch * @author Jeff Turner * @author Paul Jack * @author Stephen Colebourne - * @since 2.1 - * @version $Id: BufferUnderflowException.java,v 1.5 2002/10/13 12:57:38 scolebourne Exp $ */ public class BufferUnderflowException extends RuntimeException { - private final Throwable m_throwable; + + /** The root cause throwable */ + private final Throwable throwable; /** * Constructs a new BufferUnderflowException. */ public BufferUnderflowException() { super(); - m_throwable = null; + throwable = null; } /** @@ -99,7 +99,7 @@ public class BufferUnderflowException extends RuntimeException { */ public BufferUnderflowException(String message, Throwable exception) { super(message); - m_throwable = exception; + throwable = exception; } /** @@ -108,6 +108,7 @@ public class BufferUnderflowException extends RuntimeException { * @return the root cause */ public final Throwable getCause() { - return m_throwable; + return throwable; } + } diff --git a/src/java/org/apache/commons/collections/CircularFifoBuffer.java b/src/java/org/apache/commons/collections/CircularFifoBuffer.java index 56d4c717b..5a589651a 100644 --- a/src/java/org/apache/commons/collections/CircularFifoBuffer.java +++ b/src/java/org/apache/commons/collections/CircularFifoBuffer.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/CircularFifoBuffer.java,v 1.1 2003/04/26 15:10:56 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/CircularFifoBuffer.java,v 1.2 2003/05/11 14:15:23 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -20,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 @@ -33,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 @@ -82,7 +82,7 @@ import org.apache.commons.collections.BoundedFifoBuffer; * This buffer prevents null objects from being added. * * @since Commons Collections 2.2 - * @version $Revision: 1.1 $ $Date: 2003/04/26 15:10:56 $ + * @version $Revision: 1.2 $ $Date: 2003/05/11 14:15:23 $ * * @author Stefano Fornari * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/collections/Closure.java b/src/java/org/apache/commons/collections/Closure.java index ab16038a8..699a51bcb 100644 --- a/src/java/org/apache/commons/collections/Closure.java +++ b/src/java/org/apache/commons/collections/Closure.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Closure.java,v 1.4 2002/06/12 03:59:15 mas Exp $ - * $Revision: 1.4 $ - * $Date: 2002/06/12 03:59:15 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Closure.java,v 1.5 2003/05/11 14:15:23 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 @@ -60,16 +57,21 @@ */ package org.apache.commons.collections; -/** An interface to represent some Closure, a block of code which is executed - * from inside some block, function or iteration which operates on an input - * object. - * - * @since 1.0 - * @author James Strachan - */ +/** + * An interface to represent some Closure, a block of code which is executed + * from inside some block, function or iteration which operates on an input + * object. + * + * @since Commons Collections 1.0 + * @version $Revision: 1.5 $ $Date: 2003/05/11 14:15:23 $ + * + * @author James Strachan + */ public interface Closure { - /** Performs some operation on the input object - */ - public void execute(Object input); + /** + * Performs some operation on the input object. + */ + void execute(Object input); + } diff --git a/src/java/org/apache/commons/collections/CommonsLinkedList.java b/src/java/org/apache/commons/collections/CommonsLinkedList.java index 992755d99..b34bb7f42 100644 --- a/src/java/org/apache/commons/collections/CommonsLinkedList.java +++ b/src/java/org/apache/commons/collections/CommonsLinkedList.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/CommonsLinkedList.java,v 1.4 2003/02/19 20:14:25 scolebourne Exp $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/CommonsLinkedList.java,v 1.5 2003/05/11 14:15:23 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 @@ -76,8 +76,9 @@ import java.util.NoSuchElementException; * subclasses to extend. * * @since Commons Collections 2.2 + * @version $Revision: 1.5 $ $Date: 2003/05/11 14:15:23 $ + * * @author Rich Dougherty - * @version $Revision: 1.4 $ $Date: 2003/02/19 20:14:25 $ */ class CommonsLinkedList extends LinkedList implements List, Serializable { diff --git a/src/java/org/apache/commons/collections/ComparatorUtils.java b/src/java/org/apache/commons/collections/ComparatorUtils.java index d6337dbb4..67d85b6ac 100644 --- a/src/java/org/apache/commons/collections/ComparatorUtils.java +++ b/src/java/org/apache/commons/collections/ComparatorUtils.java @@ -1,7 +1,10 @@ -/* ==================================================================== +/* + * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/BufferUtils.java,v 1.12 2003/05/11 13:29:16 scolebourne Exp $ + * ==================================================================== + * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 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 @@ -16,21 +19,21 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Commons" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact apache@apache.org. + * 4. The names "The Jakarta Project", "Commons", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. * - * 5. Products derived from this software may not be called "Apache", - * "Apache Turbine", nor may "Apache" appear in their name, without - * prior written permission of the Apache Software Foundation. + * 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 Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -50,6 +53,7 @@ * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . + * */ package org.apache.commons.collections; @@ -62,6 +66,7 @@ import org.apache.commons.collections.comparators.ComparatorChain; import org.apache.commons.collections.comparators.NullComparator; import org.apache.commons.collections.comparators.ReverseComparator; import org.apache.commons.collections.comparators.TransformingComparator; + /** * Provides convenient static utility methods for Comparator * objects. @@ -75,17 +80,18 @@ import org.apache.commons.collections.comparators.TransformingComparator; * null instead of a comparator, in which case * {@link #NATURAL_COMPARATOR} will be used. * - * @since 2.1 + * @since Commons Collections 2.1 + * @version $Revision: $ $Date: $ + * * @author Paul Jack - * @author Stephen Colebourne - * @version $Id: $ + * @author Stephen Colebourne */ public class ComparatorUtils { /** - * Restrictive constructor + * ComparatorUtils should not normally be constructed. */ - private ComparatorUtils() { + public ComparatorUtils() { } /** @@ -276,4 +282,5 @@ public class ComparatorUtils { int c = comparator.compare(o1, o2); return (c > 0) ? o1 : o2; } + } diff --git a/src/java/org/apache/commons/collections/CursorableLinkedList.java b/src/java/org/apache/commons/collections/CursorableLinkedList.java index d7d434290..d3e530ad7 100644 --- a/src/java/org/apache/commons/collections/CursorableLinkedList.java +++ b/src/java/org/apache/commons/collections/CursorableLinkedList.java @@ -1,13 +1,10 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v 1.11 2003/02/19 20:14:25 scolebourne Exp $ - * $Revision: 1.11 $ - * $Date: 2003/02/19 20:14:25 $ - * + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v 1.12 2003/05/11 14:15:23 scolebourne Exp $ * ==================================================================== * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2002 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 @@ -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,9 +55,6 @@ * . * */ - -// to do: use weak references to cursors in case they aren't closed directly - package org.apache.commons.collections; import java.io.IOException; @@ -88,12 +82,14 @@ import java.util.NoSuchElementException; *

* Note that this implementation is not synchronized. * - * @since 1.0 - * @author Rodney Waldhoff - * @version $Id: CursorableLinkedList.java,v 1.11 2003/02/19 20:14:25 scolebourne Exp $ * @see java.util.LinkedList + * @since Commons Collections 1.0 + * @version $Revision: 1.12 $ $Date: 2003/05/11 14:15:23 $ + * + * @author Rodney Waldhoff */ public class CursorableLinkedList implements List, Serializable { + // TODO: use weak references to cursors in case they aren't closed directly //--- public methods ---------------------------------------------