Tidy up imports

from Andrew Freeman


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130973 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-02-19 20:14:27 +00:00
parent d7e506ef8e
commit a3ff1ee25b
15 changed files with 72 additions and 73 deletions

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BeanMap.java,v 1.15 2003/01/25 12:06:55 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BeanMap.java,v 1.16 2003/02/19 20:14:25 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -58,8 +58,8 @@
package org.apache.commons.collections;
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@ -82,7 +82,7 @@ import java.util.Set;
* property is considered non existent in the Map
*
* @since Commons Collections 1.0
* @version $Revision: 1.15 $ $Date: 2003/01/25 12:06:55 $
* @version $Revision: 1.16 $ $Date: 2003/02/19 20:14:25 $
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @author Stephen Colebourne

View File

@ -1,7 +1,7 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BinaryHeap.java,v 1.11 2002/10/13 12:59:04 scolebourne Exp $
* $Revision: 1.11 $
* $Date: 2002/10/13 12:59:04 $
* $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 $
*
* ====================================================================
*
@ -61,9 +61,9 @@
package org.apache.commons.collections;
import java.util.AbstractCollection;
import java.util.Comparator;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Comparator;
/**
* Binary heap implementation of {@link PriorityQueue} and {@link Buffer}.
* <p>
@ -94,7 +94,7 @@ import java.util.Comparator;
* @author Paul Jack
* @author Stephen Colebourne
* @since 1.0
* @version $Id: BinaryHeap.java,v 1.11 2002/10/13 12:59:04 scolebourne Exp $
* @version $Id: BinaryHeap.java,v 1.12 2003/02/19 20:14:25 scolebourne Exp $
*/
public final class BinaryHeap extends AbstractCollection
implements PriorityQueue, Buffer {

View File

@ -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.3 2003/01/10 20:21:22 rwaldhoff 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.4 2003/02/19 20:14:25 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -62,7 +62,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.AbstractSequentialList;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
@ -78,7 +77,7 @@ import java.util.NoSuchElementException;
*
* @since Commons Collections 2.2
* @author <a href="mailto:rich@rd.gen.nz">Rich Dougherty</a>
* @version $Revision: 1.3 $ $Date: 2003/01/10 20:21:22 $
* @version $Revision: 1.4 $ $Date: 2003/02/19 20:14:25 $
*/
class CommonsLinkedList extends LinkedList
implements List, Serializable {

View File

@ -1,7 +1,7 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v 1.10 2002/10/12 22:15:19 scolebourne Exp $
* $Revision: 1.10 $
* $Date: 2002/10/12 22:15:19 $
* $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 $
*
* ====================================================================
*
@ -63,18 +63,18 @@
package org.apache.commons.collections;
import java.util.Collection;
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.ListIterator;
import java.util.ConcurrentModificationException;
import java.util.NoSuchElementException;
import java.io.Serializable;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
/**
* A doubly-linked list implementation of the {@link List} interface,
@ -90,7 +90,7 @@ import java.lang.reflect.Array;
*
* @since 1.0
* @author Rodney Waldhoff
* @version $Id: CursorableLinkedList.java,v 1.10 2002/10/12 22:15:19 scolebourne Exp $
* @version $Id: CursorableLinkedList.java,v 1.11 2003/02/19 20:14:25 scolebourne Exp $
* @see java.util.LinkedList
*/
public class CursorableLinkedList implements List, Serializable {

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ExtendedProperties.java,v 1.8 2003/01/25 12:21:19 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ExtendedProperties.java,v 1.9 2003/02/19 20:14:25 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -57,9 +57,9 @@
*/
package org.apache.commons.collections;
import java.io.IOException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
@ -67,7 +67,6 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
@ -159,7 +158,7 @@ import java.util.Vector;
* it, go ahead and tune it up!
*
* @since 1.0
* @version $Revision: 1.8 $ $Date: 2003/01/25 12:21:19 $
* @version $Revision: 1.9 $ $Date: 2003/02/19 20:14:25 $
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
@ -426,7 +425,7 @@ public class ExtendedProperties extends Hashtable
*/
public String getInclude()
{
return this.include;
return include;
}
/**
@ -437,7 +436,7 @@ public class ExtendedProperties extends Hashtable
*/
public void setInclude(String inc)
{
this.include = inc;
include = inc;
}
/**

View File

@ -1,7 +1,7 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MapUtils.java,v 1.15 2002/12/15 13:05:03 scolebourne Exp $
* $Revision: 1.15 $
* $Date: 2002/12/15 13:05:03 $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MapUtils.java,v 1.16 2003/02/19 20:14:25 scolebourne Exp $
* $Revision: 1.16 $
* $Date: 2003/02/19 20:14:25 $
*
* ====================================================================
*
@ -60,10 +60,18 @@
*/
package org.apache.commons.collections;
import java.io.*;
import java.text.*;
import java.io.PrintStream;
import java.text.NumberFormat;
import java.util.*;
import java.text.ParseException;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
/**
* A helper class for using {@link Map Map} instances.<P>
*

View File

@ -1,7 +1,7 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/SequencedHashMap.java,v 1.15 2002/11/24 20:48:35 scolebourne Exp $
* $Revision: 1.15 $
* $Date: 2002/11/24 20:48:35 $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/SequencedHashMap.java,v 1.16 2003/02/19 20:14:25 scolebourne Exp $
* $Revision: 1.16 $
* $Date: 2003/02/19 20:14:25 $
*
* ====================================================================
*
@ -61,22 +61,21 @@
package org.apache.commons.collections;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.AbstractCollection;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.NoSuchElementException;
import java.util.ConcurrentModificationException;
import java.util.Set;
/**
* A map of objects whose mapping entries are sequenced based on the order in
* which they were added. This data structure has fast <I>O(1)</I> search

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/StaticBucketMap.java,v 1.7 2003/02/19 19:54:12 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/StaticBucketMap.java,v 1.8 2003/02/19 20:14:25 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -59,12 +59,12 @@ package org.apache.commons.collections;
import java.util.AbstractCollection;
import java.util.AbstractSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.ArrayList;
import java.util.NoSuchElementException;
import java.util.Set;
/**
* A StaticBucketMap is an efficient, thread-safe implementation of
@ -130,7 +130,7 @@ import java.util.NoSuchElementException;
* operations will affect the map.<P>
*
* @since Commons Collections 2.1
* @version $Revision: 1.7 $ $Date: 2003/02/19 19:54:12 $
* @version $Revision: 1.8 $ $Date: 2003/02/19 20:14:25 $
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:g-froehlich@gmx.de">Gerhard Froehlich</a>

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java,v 1.3 2003/01/15 21:53:14 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java,v 1.4 2003/02/19 20:14:27 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -58,7 +58,6 @@
package org.apache.commons.collections.iterators;
import java.lang.reflect.Array;
import java.util.Iterator;
import java.util.NoSuchElementException;
/**
@ -73,7 +72,7 @@ import java.util.NoSuchElementException;
* the iterator back to the start if required.
*
* @since Commons Collections 1.0
* @version $Revision: 1.3 $ $Date: 2003/01/15 21:53:14 $
* @version $Revision: 1.4 $ $Date: 2003/02/19 20:14:27 $
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @author Mauricio S. Moura

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java,v 1.2 2003/01/15 21:53:14 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java,v 1.3 2003/02/19 20:14:27 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -58,7 +58,6 @@
package org.apache.commons.collections.iterators;
import java.lang.reflect.Array;
import java.util.ListIterator;
import java.util.NoSuchElementException;
/**
@ -78,7 +77,7 @@ import java.util.NoSuchElementException;
* @see java.util.ListIterator
*
* @since Commons Collections 2.2
* @version $Revision: 1.2 $ $Date: 2003/01/15 21:53:14 $
* @version $Revision: 1.3 $ $Date: 2003/02/19 20:14:27 $
*
* @author <a href="mailto:neilotoole@users.sourceforge.net">Neil O'Toole</a>
* @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java,v 1.5 2003/01/15 21:45:23 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java,v 1.6 2003/02/19 20:14:27 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -57,14 +57,14 @@
*/
package org.apache.commons.collections.iterators;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.ArrayList;
import java.util.BitSet;
/**
* Provides an ordered iteration over the elements contained in
@ -74,7 +74,7 @@ import java.util.BitSet;
* <code>A.next()</code> and <code>B.next()</code>.
*
* @since Commons Collections 2.1
* @version $Revision: 1.5 $ $Date: 2003/01/15 21:45:23 $
* @version $Revision: 1.6 $ $Date: 2003/02/19 20:14:27 $
*
* @author Rodney Waldhoff
* @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java,v 1.3 2003/01/15 21:51:57 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java,v 1.4 2003/02/19 20:14:27 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -57,7 +57,6 @@
*/
package org.apache.commons.collections.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
/**
@ -70,7 +69,7 @@ import java.util.NoSuchElementException;
* back to the start if required.
*
* @since Commons Collections 2.2
* @version $Revision: 1.3 $ $Date: 2003/01/15 21:51:57 $
* @version $Revision: 1.4 $ $Date: 2003/02/19 20:14:27 $
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @author Mauricio S. Moura

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java,v 1.3 2003/01/15 21:51:57 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java,v 1.4 2003/02/19 20:14:27 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -57,7 +57,6 @@
*/
package org.apache.commons.collections.iterators;
import java.util.ListIterator;
import java.util.NoSuchElementException;
/**
@ -74,7 +73,7 @@ import java.util.NoSuchElementException;
* @see java.util.ListIterator
*
* @since Commons Collections 2.2
* @version $Revision: 1.3 $ $Date: 2003/01/15 21:51:57 $
* @version $Revision: 1.4 $ $Date: 2003/02/19 20:14:27 $
*
* @author <a href="mailto:neilotoole@users.sourceforge.net">Neil O'Toole</a>
* @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java,v 1.3 2003/01/15 21:51:05 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java,v 1.4 2003/02/19 20:14:27 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -57,7 +57,6 @@
*/
package org.apache.commons.collections.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
/**
@ -65,7 +64,7 @@ import java.util.NoSuchElementException;
* object instance.</p>
*
* @since Commons Collections 2.0
* @version $Revision: 1.3 $ $Date: 2003/01/15 21:51:05 $
* @version $Revision: 1.4 $ $Date: 2003/02/19 20:14:27 $
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java,v 1.3 2003/01/15 21:51:05 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java,v 1.4 2003/02/19 20:14:27 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -57,14 +57,13 @@
*/
package org.apache.commons.collections.iterators;
import java.util.ListIterator;
import java.util.NoSuchElementException;
/**
* <p><code>SingletonIterator</code> is an {@link ListIterator} over a single
* object instance.</p>
*
* @since Commons Collections 2.1
* @version $Revision: 1.3 $ $Date: 2003/01/15 21:51:05 $
* @version $Revision: 1.4 $ $Date: 2003/02/19 20:14:27 $
*
* @author Stephen Colebourne
*/