commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/iterators CollatingIterator.java ObjectArrayIterator.java ObjectArrayListIterator.java SingletonIterator.java ArrayListIterator.java SingletonListIterator.java ArrayIterator.java
Date Wed, 19 Feb 2003 20:14:28 GMT
scolebourne    2003/02/19 12:14:28

  Modified:    collections/src/java/org/apache/commons/collections
                        CursorableLinkedList.java SequencedHashMap.java
                        CommonsLinkedList.java StaticBucketMap.java
                        MapUtils.java BinaryHeap.java
                        ExtendedProperties.java BeanMap.java
               collections/src/java/org/apache/commons/collections/iterators
                        CollatingIterator.java ObjectArrayIterator.java
                        ObjectArrayListIterator.java SingletonIterator.java
                        ArrayListIterator.java SingletonListIterator.java
                        ArrayIterator.java
  Log:
  Tidy up imports
  from Andrew Freeman
  
  Revision  Changes    Path
  1.11      +12 -12    jakarta-commons/collections/src/java/org/apache/commons/collections/CursorableLinkedList.java
  
  Index: CursorableLinkedList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/CursorableLinkedList.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CursorableLinkedList.java	12 Oct 2002 22:15:19 -0000	1.10
  +++ CursorableLinkedList.java	19 Feb 2003 20:14:25 -0000	1.11
  @@ -63,18 +63,18 @@
   
   package org.apache.commons.collections;
   
  -import java.util.Collection;
  -import java.util.List;
  +import java.io.IOException;
  +import java.io.ObjectInputStream;
  +import java.io.ObjectOutputStream;
  +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.ConcurrentModificationException;
   import java.util.NoSuchElementException;
  -import java.io.Serializable;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
  -import java.io.IOException;
  -import java.lang.reflect.Array;
   
   /**
    * A doubly-linked list implementation of the {@link List} interface,
  
  
  
  1.16      +9 -10     jakarta-commons/collections/src/java/org/apache/commons/collections/SequencedHashMap.java
  
  Index: SequencedHashMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/SequencedHashMap.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SequencedHashMap.java	24 Nov 2002 20:48:35 -0000	1.15
  +++ SequencedHashMap.java	19 Feb 2003 20:14:25 -0000	1.16
  @@ -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.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.AbstractCollection;
  -import java.util.AbstractSet;
  -import java.util.ArrayList;
   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
  
  
  
  1.4       +2 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/CommonsLinkedList.java
  
  Index: CommonsLinkedList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/CommonsLinkedList.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CommonsLinkedList.java	10 Jan 2003 20:21:22 -0000	1.3
  +++ CommonsLinkedList.java	19 Feb 2003 20:14:25 -0000	1.4
  @@ -62,7 +62,6 @@
   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;
  
  
  
  1.8       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java
  
  Index: StaticBucketMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StaticBucketMap.java	19 Feb 2003 19:54:12 -0000	1.7
  +++ StaticBucketMap.java	19 Feb 2003 20:14:25 -0000	1.8
  @@ -59,12 +59,12 @@
   
   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
  
  
  
  1.16      +14 -6     jakarta-commons/collections/src/java/org/apache/commons/collections/MapUtils.java
  
  Index: MapUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/MapUtils.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- MapUtils.java	15 Dec 2002 13:05:03 -0000	1.15
  +++ MapUtils.java	19 Feb 2003 20:14:25 -0000	1.16
  @@ -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>
    *
  
  
  
  1.12      +5 -5      jakarta-commons/collections/src/java/org/apache/commons/collections/BinaryHeap.java
  
  Index: BinaryHeap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/BinaryHeap.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BinaryHeap.java	13 Oct 2002 12:59:04 -0000	1.11
  +++ BinaryHeap.java	19 Feb 2003 20:14:25 -0000	1.12
  @@ -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>
  
  
  
  1.9       +5 -6      jakarta-commons/collections/src/java/org/apache/commons/collections/ExtendedProperties.java
  
  Index: ExtendedProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/ExtendedProperties.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ExtendedProperties.java	25 Jan 2003 12:21:19 -0000	1.8
  +++ ExtendedProperties.java	19 Feb 2003 20:14:25 -0000	1.9
  @@ -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.PrintWriter;
   import java.io.Reader;
   import java.io.UnsupportedEncodingException;
  -
   import java.util.ArrayList;
   import java.util.Enumeration;
   import java.util.Hashtable;
  @@ -426,7 +425,7 @@
        */
       public String getInclude()
       {
  -        return this.include;
  +        return include;
       }
   
       /**
  @@ -437,7 +436,7 @@
        */
       public void setInclude(String inc)
       {
  -        this.include = inc;
  +        include = inc;
       }
   
       /**
  
  
  
  1.16      +3 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/BeanMap.java
  
  Index: BeanMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/BeanMap.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- BeanMap.java	25 Jan 2003 12:06:55 -0000	1.15
  +++ BeanMap.java	19 Feb 2003 20:14:25 -0000	1.16
  @@ -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;
  
  
  
  1.6       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
  
  Index: CollatingIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/CollatingIterator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CollatingIterator.java	15 Jan 2003 21:45:23 -0000	1.5
  +++ CollatingIterator.java	19 Feb 2003 20:14:27 -0000	1.6
  @@ -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
  
  
  
  1.4       +2 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
  
  Index: ObjectArrayIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ObjectArrayIterator.java	15 Jan 2003 21:51:57 -0000	1.3
  +++ ObjectArrayIterator.java	19 Feb 2003 20:14:27 -0000	1.4
  @@ -57,7 +57,6 @@
    */
   package org.apache.commons.collections.iterators;
   
  -import java.util.Iterator;
   import java.util.NoSuchElementException;
   
   /** 
  
  
  
  1.4       +2 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
  
  Index: ObjectArrayListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ObjectArrayListIterator.java	15 Jan 2003 21:51:57 -0000	1.3
  +++ ObjectArrayListIterator.java	19 Feb 2003 20:14:27 -0000	1.4
  @@ -57,7 +57,6 @@
    */
   package org.apache.commons.collections.iterators;
   
  -import java.util.ListIterator;
   import java.util.NoSuchElementException;
   
   /**
  
  
  
  1.4       +2 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
  
  Index: SingletonIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SingletonIterator.java	15 Jan 2003 21:51:05 -0000	1.3
  +++ SingletonIterator.java	19 Feb 2003 20:14:27 -0000	1.4
  @@ -57,7 +57,6 @@
    */
   package org.apache.commons.collections.iterators;
   
  -import java.util.Iterator;
   import java.util.NoSuchElementException;
   
   /** 
  
  
  
  1.3       +2 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
  
  Index: ArrayListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArrayListIterator.java	15 Jan 2003 21:53:14 -0000	1.2
  +++ ArrayListIterator.java	19 Feb 2003 20:14:27 -0000	1.3
  @@ -58,7 +58,6 @@
   package org.apache.commons.collections.iterators;
   
   import java.lang.reflect.Array;
  -import java.util.ListIterator;
   import java.util.NoSuchElementException;
   
   /**
  
  
  
  1.4       +2 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
  
  Index: SingletonListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SingletonListIterator.java	15 Jan 2003 21:51:05 -0000	1.3
  +++ SingletonListIterator.java	19 Feb 2003 20:14:27 -0000	1.4
  @@ -57,7 +57,6 @@
    */
   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 
  
  
  
  1.4       +2 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
  
  Index: ArrayIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ArrayIterator.java	15 Jan 2003 21:53:14 -0000	1.3
  +++ ArrayIterator.java	19 Feb 2003 20:14:27 -0000	1.4
  @@ -58,7 +58,6 @@
   package org.apache.commons.collections.iterators;
   
   import java.lang.reflect.Array;
  -import java.util.Iterator;
   import java.util.NoSuchElementException;
   
   /** 
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message