From ebdaf3cb688b5fc90a94eb4cf1af36e325f07ae4 Mon Sep 17 00:00:00 2001 From: pjack Date: Wed, 21 Aug 2002 23:54:18 +0000 Subject: [PATCH] Placed Abstract*ArrayList layer under Abstract*List layer. Erased Serializable declarations from all abstract superclasses (but kept it in all concrete implementations). git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130806 13f79535-47bb-0310-9956-ffa450edef68 --- .../primitives/AbstractIntArrayList.java | 103 +++++++++++++++++ .../primitives/AbstractIntList.java | 33 +----- .../primitives/AbstractLongArrayList.java | 105 ++++++++++++++++++ .../primitives/AbstractLongList.java | 32 +----- .../primitives/AbstractShortArrayList.java | 105 ++++++++++++++++++ .../primitives/AbstractShortList.java | 32 +----- .../collections/primitives/IntArrayList.java | 10 +- .../collections/primitives/LongArrayList.java | 10 +- .../primitives/ShortArrayList.java | 10 +- .../primitives/UnsignedByteArrayList.java | 10 +- .../primitives/UnsignedIntArrayList.java | 10 +- .../primitives/UnsignedShortArrayList.java | 10 +- 12 files changed, 358 insertions(+), 112 deletions(-) create mode 100644 src/java/org/apache/commons/collections/primitives/AbstractIntArrayList.java create mode 100644 src/java/org/apache/commons/collections/primitives/AbstractLongArrayList.java create mode 100644 src/java/org/apache/commons/collections/primitives/AbstractShortArrayList.java diff --git a/src/java/org/apache/commons/collections/primitives/AbstractIntArrayList.java b/src/java/org/apache/commons/collections/primitives/AbstractIntArrayList.java new file mode 100644 index 000000000..8af1758cb --- /dev/null +++ b/src/java/org/apache/commons/collections/primitives/AbstractIntArrayList.java @@ -0,0 +1,103 @@ +/* + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractIntArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ + * + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * 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 acknowlegement: + * "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. + * + * 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" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.commons.collections.primitives; + +import java.io.Serializable; +import java.util.AbstractList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +/** + * Abstract base class for lists backed by an int array. + * + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ + * @author Rodney Waldhoff + */ +public abstract class AbstractIntArrayList extends AbstractIntList { + + //------------------------------------------------------ Abstract Accessors + + /** + * Returns the maximum size the list can reach before the array + * is resized. + * + * @return the maximum size the list can reach before the array is resized + */ + abstract public int capacity(); + + /** + * Ensures that the length of the internal int array is + * at list the given value. + * + * @param mincap the minimum capcity for this list + */ + abstract public void ensureCapacity(int mincap); + + /** + * Resizes the internal array such that {@link #capacity()} is equal + * to {@link #size()}. + */ + abstract public void trimToSize(); + +} diff --git a/src/java/org/apache/commons/collections/primitives/AbstractIntList.java b/src/java/org/apache/commons/collections/primitives/AbstractIntList.java index 4eda73299..2f3ecb3bc 100644 --- a/src/java/org/apache/commons/collections/primitives/AbstractIntList.java +++ b/src/java/org/apache/commons/collections/primitives/AbstractIntList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractIntList.java,v 1.1 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.1 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractIntList.java,v 1.2 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.2 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -71,22 +71,13 @@ import java.util.ListIterator; /** * Abstract base class for lists backed by an int array. * - * @version $Revision: 1.1 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.2 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public abstract class AbstractIntList extends AbstractList implements List, Serializable { +public abstract class AbstractIntList extends AbstractList { //------------------------------------------------------ Abstract Accessors - /** - * Returns the maximum size the list can reach before the array - * is resized. - * - * @return the maximum size the list can reach before the array is resized - */ - abstract public int capacity(); - - /** * Returns the number of int elements currently in this * list. @@ -268,20 +259,6 @@ public abstract class AbstractIntList extends AbstractList implements List, Seri */ abstract public void clear(); - /** - * Ensures that the length of the internal int array is - * at list the given value. - * - * @param mincap the minimum capcity for this list - */ - abstract public void ensureCapacity(int mincap); - - /** - * Resizes the internal array such that {@link #capacity()} is equal - * to {@link #size()}. - */ - abstract public void trimToSize(); - //--------------------------------------------------------------- Modifiers /** diff --git a/src/java/org/apache/commons/collections/primitives/AbstractLongArrayList.java b/src/java/org/apache/commons/collections/primitives/AbstractLongArrayList.java new file mode 100644 index 000000000..40b9352db --- /dev/null +++ b/src/java/org/apache/commons/collections/primitives/AbstractLongArrayList.java @@ -0,0 +1,105 @@ +/* + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractLongArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ + * + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * 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 acknowlegement: + * "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. + * + * 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" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.commons.collections.primitives; + +import java.io.Serializable; +import java.util.AbstractList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +/** + * Abstract base class for lists backed by a long array. + * + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ + * @author Rodney Waldhoff + */ +public abstract class AbstractLongArrayList extends AbstractLongList { + + //------------------------------------------------------ Abstract Accessors + + /** + * Returns the maximum size the list can reach before the array + * is resized. + * + * @return the maximum size the list can reach before the array is resized + */ + abstract public int capacity(); + + //------------------------------------------------------ Abstract Modifiers + + /** + * Ensures that the length of the internal long array is + * at list the given value. + * + * @param mincap the minimum capcity for this list + */ + abstract public void ensureCapacity(int mincap); + + /** + * Resizes the internal array such that {@link #capacity()} is equal + * to {@link #size()}. + */ + abstract public void trimToSize(); + +} diff --git a/src/java/org/apache/commons/collections/primitives/AbstractLongList.java b/src/java/org/apache/commons/collections/primitives/AbstractLongList.java index 24d7435ee..616a9231d 100644 --- a/src/java/org/apache/commons/collections/primitives/AbstractLongList.java +++ b/src/java/org/apache/commons/collections/primitives/AbstractLongList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractLongList.java,v 1.1 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.1 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractLongList.java,v 1.2 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.2 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -71,21 +71,13 @@ import java.util.ListIterator; /** * Abstract base class for lists backed by a long array. * - * @version $Revision: 1.1 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.2 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public abstract class AbstractLongList extends AbstractList implements List, Serializable { +public abstract class AbstractLongList extends AbstractList { //------------------------------------------------------ Abstract Accessors - /** - * Returns the maximum size the list can reach before the array - * is resized. - * - * @return the maximum size the list can reach before the array is resized - */ - abstract public int capacity(); - /** * Returns the number of long elements currently in this * list. @@ -260,20 +252,6 @@ public abstract class AbstractLongList extends AbstractList implements List, Ser */ abstract public void clear(); - /** - * Ensures that the length of the internal long array is - * at list the given value. - * - * @param mincap the minimum capcity for this list - */ - abstract public void ensureCapacity(int mincap); - - /** - * Resizes the internal array such that {@link #capacity()} is equal - * to {@link #size()}. - */ - abstract public void trimToSize(); - //--------------------------------------------------------------- Modifiers /** diff --git a/src/java/org/apache/commons/collections/primitives/AbstractShortArrayList.java b/src/java/org/apache/commons/collections/primitives/AbstractShortArrayList.java new file mode 100644 index 000000000..dd0d2479e --- /dev/null +++ b/src/java/org/apache/commons/collections/primitives/AbstractShortArrayList.java @@ -0,0 +1,105 @@ +/* + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractShortArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ + * + * ==================================================================== + * + * The Apache Software License, Version 1.1 + * + * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * 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 acknowlegement: + * "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. + * + * 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" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.commons.collections.primitives; + +import java.io.Serializable; +import java.util.AbstractList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +/** + * Abstract base class for lists backed by a short array. + * + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ + * @author Rodney Waldhoff + */ +public abstract class AbstractShortArrayList extends AbstractShortList { + + //------------------------------------------------------ Abstract Accessors + + /** + * Returns the maximum size the list can reach before the array + * is resized. + * + * @return the maximum size the list can reach before the array is resized + */ + abstract public int capacity(); + + //------------------------------------------------------ Abstract Modifiers + + /** + * Ensures that the length of the internal short array is + * at list the given value. + * + * @param mincap the minimum capcity for this list + */ + abstract public void ensureCapacity(int mincap); + + /** + * Resizes the internal array such that {@link #capacity()} is equal + * to {@link #size()}. + */ + abstract public void trimToSize(); + +} diff --git a/src/java/org/apache/commons/collections/primitives/AbstractShortList.java b/src/java/org/apache/commons/collections/primitives/AbstractShortList.java index 682dc77c6..bb66bf136 100644 --- a/src/java/org/apache/commons/collections/primitives/AbstractShortList.java +++ b/src/java/org/apache/commons/collections/primitives/AbstractShortList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractShortList.java,v 1.1 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.1 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/AbstractShortList.java,v 1.2 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.2 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -71,21 +71,13 @@ import java.util.ListIterator; /** * Abstract base class for lists backed by a short array. * - * @version $Revision: 1.1 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.2 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public abstract class AbstractShortList extends AbstractList implements List, Serializable { +public abstract class AbstractShortList extends AbstractList { //------------------------------------------------------ Abstract Accessors - /** - * Returns the maximum size the list can reach before the array - * is resized. - * - * @return the maximum size the list can reach before the array is resized - */ - abstract public int capacity(); - /** * Returns the number of short elements currently in this * list. @@ -260,20 +252,6 @@ public abstract class AbstractShortList extends AbstractList implements List, Se */ abstract public void clear(); - /** - * Ensures that the length of the internal short array is - * at list the given value. - * - * @param mincap the minimum capcity for this list - */ - abstract public void ensureCapacity(int mincap); - - /** - * Resizes the internal array such that {@link #capacity()} is equal - * to {@link #size()}. - */ - abstract public void trimToSize(); - //--------------------------------------------------------------- Modifiers /** diff --git a/src/java/org/apache/commons/collections/primitives/IntArrayList.java b/src/java/org/apache/commons/collections/primitives/IntArrayList.java index eea192052..9ddd3900b 100644 --- a/src/java/org/apache/commons/collections/primitives/IntArrayList.java +++ b/src/java/org/apache/commons/collections/primitives/IntArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/IntArrayList.java,v 1.3 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.3 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/IntArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -74,10 +74,10 @@ import java.util.ListIterator; /** * A list of int elements. * - * @version $Revision: 1.3 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public class IntArrayList extends AbstractIntList implements List, Serializable { +public class IntArrayList extends AbstractIntArrayList implements Serializable { //------------------------------------------------------------ Constructors diff --git a/src/java/org/apache/commons/collections/primitives/LongArrayList.java b/src/java/org/apache/commons/collections/primitives/LongArrayList.java index e22e383e7..b0bbeeb9e 100644 --- a/src/java/org/apache/commons/collections/primitives/LongArrayList.java +++ b/src/java/org/apache/commons/collections/primitives/LongArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/LongArrayList.java,v 1.3 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.3 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/LongArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -74,10 +74,10 @@ import java.util.ListIterator; /** * A list of long elements. * - * @version $Revision: 1.3 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public class LongArrayList extends AbstractLongList implements List, Serializable { +public class LongArrayList extends AbstractLongArrayList implements Serializable { //------------------------------------------------------------ Constructors diff --git a/src/java/org/apache/commons/collections/primitives/ShortArrayList.java b/src/java/org/apache/commons/collections/primitives/ShortArrayList.java index d061fb5b6..dc52b2ee6 100644 --- a/src/java/org/apache/commons/collections/primitives/ShortArrayList.java +++ b/src/java/org/apache/commons/collections/primitives/ShortArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/ShortArrayList.java,v 1.3 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.3 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/ShortArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -74,10 +74,10 @@ import java.util.ListIterator; /** * A list of short elements. * - * @version $Revision: 1.3 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public class ShortArrayList extends AbstractShortList implements List, Serializable { +public class ShortArrayList extends AbstractShortArrayList implements Serializable { //------------------------------------------------------------ Constructors diff --git a/src/java/org/apache/commons/collections/primitives/UnsignedByteArrayList.java b/src/java/org/apache/commons/collections/primitives/UnsignedByteArrayList.java index 5c54979bb..1397ad15a 100644 --- a/src/java/org/apache/commons/collections/primitives/UnsignedByteArrayList.java +++ b/src/java/org/apache/commons/collections/primitives/UnsignedByteArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/UnsignedByteArrayList.java,v 1.3 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.3 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/UnsignedByteArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -76,10 +76,10 @@ import java.util.ListIterator; * Mutators on this class will reject any short that does not * express an unsigned 8-bit value. * - * @version $Revision: 1.3 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public class UnsignedByteArrayList extends AbstractShortList implements List, Serializable { +public class UnsignedByteArrayList extends AbstractShortArrayList implements Serializable { //------------------------------------------------------------ Constructors diff --git a/src/java/org/apache/commons/collections/primitives/UnsignedIntArrayList.java b/src/java/org/apache/commons/collections/primitives/UnsignedIntArrayList.java index 192e4c1df..86cb8f44e 100644 --- a/src/java/org/apache/commons/collections/primitives/UnsignedIntArrayList.java +++ b/src/java/org/apache/commons/collections/primitives/UnsignedIntArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/UnsignedIntArrayList.java,v 1.3 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.3 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/UnsignedIntArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -76,10 +76,10 @@ import java.util.ListIterator; * Mutators on this class will reject any long that does not * express an unsigned 16-bit value. * - * @version $Revision: 1.3 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public class UnsignedIntArrayList extends AbstractLongList implements List, Serializable { +public class UnsignedIntArrayList extends AbstractLongArrayList implements Serializable { //------------------------------------------------------------ Constructors diff --git a/src/java/org/apache/commons/collections/primitives/UnsignedShortArrayList.java b/src/java/org/apache/commons/collections/primitives/UnsignedShortArrayList.java index 27da8b5e9..a68def55e 100644 --- a/src/java/org/apache/commons/collections/primitives/UnsignedShortArrayList.java +++ b/src/java/org/apache/commons/collections/primitives/UnsignedShortArrayList.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/UnsignedShortArrayList.java,v 1.3 2002/08/19 21:19:03 pjack Exp $ - * $Revision: 1.3 $ - * $Date: 2002/08/19 21:19:03 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/primitives/Attic/UnsignedShortArrayList.java,v 1.4 2002/08/21 23:54:18 pjack Exp $ + * $Revision: 1.4 $ + * $Date: 2002/08/21 23:54:18 $ * * ==================================================================== * @@ -76,10 +76,10 @@ import java.util.ListIterator; * Mutators on this class will reject any int that does not * express an unsigned 16-bit value. * - * @version $Revision: 1.3 $ $Date: 2002/08/19 21:19:03 $ + * @version $Revision: 1.4 $ $Date: 2002/08/21 23:54:18 $ * @author Rodney Waldhoff */ -public class UnsignedShortArrayList extends AbstractIntList implements List, Serializable { +public class UnsignedShortArrayList extends AbstractIntArrayList implements Serializable { //------------------------------------------------------------ Constructors