scolebourne    2003/10/09 13:44:32

  Modified:    collections/src/java/org/apache/commons/collections/comparators
                        NullComparator.java
               collections/src/java/org/apache/commons/collections/iterators
                        ObjectArrayListIterator.java SingletonIterator.java
                        ArrayListIterator.java SingletonListIterator.java
               collections/src/java/org/apache/commons/collections/decorators
                        SetList.java
  Log:
  Fix various javadoc link warnings
  bug 23680, from Eric Johnson
  
  Revision  Changes    Path
  1.9       +8 -8      
jakarta-commons/collections/src/java/org/apache/commons/collections/comparators/NullComparator.java
  
  Index: NullComparator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/comparators/NullComparator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- NullComparator.java       31 Aug 2003 17:25:49 -0000      1.8
  +++ NullComparator.java       9 Oct 2003 20:44:32 -0000       1.9
  @@ -60,14 +60,14 @@
   import java.util.Comparator;
   
   /**
  - *  A Comparator that will compare nulls to be either lower or higher than
  - *  other objects.
  + * A Comparator that will compare nulls to be either lower or higher than
  + * other objects.
    *
  - *  @since Commons Collections 2.0
  - *  @version $Revision$ $Date$ 
  + * @since Commons Collections 2.0
  + * @version $Revision$ $Date$ 
    *
  - *  @author <a href="mailto:[EMAIL PROTECTED]">Michael A. Smith</a>
  - **/
  + * @author Michael A. Smith
  + */
   public class NullComparator implements Comparator, Serializable {
   
       /**
  @@ -191,7 +191,7 @@
        *  Determines whether the specified object represents a comparator that is
        *  equal to this comparator.
        *
  -     *  @param o the object to compare this comparator with.
  +     *  @param obj  the object to compare this comparator with.
        *
        *  @return <code>true</code> if the specified object is a NullComparator
        *  with equivalent <code>null</code> comparison behavior
  
  
  
  1.8       +5 -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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ObjectArrayListIterator.java      29 Sep 2003 03:56:12 -0000      1.7
  +++ ObjectArrayListIterator.java      9 Oct 2003 20:44:32 -0000       1.8
  @@ -57,6 +57,7 @@
    */
   package org.apache.commons.collections.iterators;
   
  +import java.util.ListIterator;
   import java.util.NoSuchElementException;
   
   /**
  @@ -79,7 +80,8 @@
    * @author Stephen Colebourne
    * @author Phil Steitz
    */
  -public class ObjectArrayListIterator extends ObjectArrayIterator implements 
ResetableListIterator {
  +public class ObjectArrayListIterator extends ObjectArrayIterator
  +             implements ListIterator, ResetableListIterator {
   
       /**
        * Holds the index of the last item returned by a call to <code>next()</code> 
  
  
  
  1.8       +8 -6      
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SingletonIterator.java    9 Oct 2003 11:05:27 -0000       1.7
  +++ SingletonIterator.java    9 Oct 2003 20:44:32 -0000       1.8
  @@ -57,20 +57,22 @@
    */
   package org.apache.commons.collections.iterators;
   
  +import java.util.Iterator;
   import java.util.NoSuchElementException;
   
   /** 
  - * <p><code>SingletonIterator</code> is an [EMAIL PROTECTED] Iterator} over a 
single 
  - * object instance.</p>
  + * <code>SingletonIterator</code> is an [EMAIL PROTECTED] Iterator} over a single 
  + * object instance.
    *
    * @since Commons Collections 2.0
    * @version $Revision$ $Date$
    * 
  - * @author <a href="mailto:[EMAIL PROTECTED]">James Strachan</a>
  + * @author James Strachan
    * @author Stephen Colebourne
    * @author Rodney Waldhoff
    */
  -public class SingletonIterator implements ResetableIterator {
  +public class SingletonIterator
  +             implements Iterator, ResetableIterator {
   
       private boolean beforeFirst = true;
       private boolean removed = false;
  
  
  
  1.8       +7 -6      
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ArrayListIterator.java    5 Oct 2003 23:21:07 -0000       1.7
  +++ ArrayListIterator.java    9 Oct 2003 20:44:32 -0000       1.8
  @@ -58,14 +58,14 @@
   package org.apache.commons.collections.iterators;
   
   import java.lang.reflect.Array;
  +import java.util.ListIterator;
   import java.util.NoSuchElementException;
   
   /**
  - * Implements a [EMAIL PROTECTED] java.util.ListIterator ListIterator} over an 
array. 
  + * Implements a [EMAIL PROTECTED] ListIterator} over an array. 
    * <p>
    * The array can be either an array of object or of primitives. If you know 
  - * that you have an object array, the 
  - * [EMAIL PROTECTED] 
org.apache.commons.collections.iterators.ObjectArrayListIterator 
ObjectArrayListIterator}
  + * that you have an object array, the [EMAIL PROTECTED] ObjectArrayListIterator}
    * class is a better choice, as it will perform better.
    * 
    * <p>
  @@ -83,7 +83,8 @@
    * @author Stephen Colebourne
    * @author Phil Steitz
    */
  -public class ArrayListIterator extends ArrayIterator implements 
ResetableListIterator {
  +public class ArrayListIterator extends ArrayIterator
  +             implements ListIterator, ResetableListIterator {
   
       /**
        * Holds the index of the last item returned by a call to <code>next()</code>
  
  
  
  1.8       +9 -6      
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SingletonListIterator.java        9 Oct 2003 11:05:27 -0000       1.7
  +++ SingletonListIterator.java        9 Oct 2003 20:44:32 -0000       1.8
  @@ -57,10 +57,12 @@
    */
   package org.apache.commons.collections.iterators;
   
  +import java.util.ListIterator;
   import java.util.NoSuchElementException;
  -/** 
  - * <p><code>SingletonIterator</code> is an [EMAIL PROTECTED] ListIterator} over a 
single 
  - * object instance.</p>
  +
  +/**
  + * <code>SingletonIterator</code> is an [EMAIL PROTECTED] ListIterator} over a 
single 
  + * object instance.
    *
    * @since Commons Collections 2.1
    * @version $Revision$ $Date$
  @@ -68,7 +70,8 @@
    * @author Stephen Colebourne
    * @author Rodney Waldhoff
    */
  -public class SingletonListIterator implements ResetableListIterator {
  +public class SingletonListIterator
  +             implements ListIterator, ResetableListIterator {
   
       private boolean beforeFirst = true;
       private boolean nextCalled = false;
  
  
  
  1.3       +6 -8      
jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/SetList.java
  
  Index: SetList.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/SetList.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetList.java      4 Oct 2003 00:50:35 -0000       1.2
  +++ SetList.java      9 Oct 2003 20:44:32 -0000       1.3
  @@ -75,10 +75,9 @@
    * result of rejecting duplicates.
    * Each violation is explained in the method, but it should not affect you.
    * <p>
  - * The [EMAIL PROTECTED] org.apache.commons.collections.decorators.OrderedSet 
OrderedSet}
  - * class provides an alternative approach, by wrapping an existing Set and
  - * retaining insertion order in the iterator. This class offers the 
<code>List</code>
  - * interface implementation as well.
  + * The [EMAIL PROTECTED] OrderedSet} class provides an alternative approach, by 
wrapping
  + * an existing Set and retaining insertion order in the iterator.
  + * This class offers the <code>List</code> interface implementation as well.
    *
    * @since Commons Collections 3.0
    * @version $Revision$ $Date$
  @@ -193,8 +192,7 @@
        * The <code>List</code> interface makes the assumption that the element is
        * always inserted. This may not happen with this implementation.
        * 
  -     * @param index  the index to insert at
  -     * @param object  the object to add
  +     * @param coll  the collection to add
        */
       public boolean addAll(Collection coll) {
           return addAll(size(), coll);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to