You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/01/15 22:46:55 UTC

cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/iterators IteratorChain.java ListIteratorWrapper.java IteratorEnumeration.java

scolebourne    2003/01/15 13:46:55

  Modified:    collections/src/java/org/apache/commons/collections/iterators
                        IteratorChain.java ListIteratorWrapper.java
                        IteratorEnumeration.java
  Log:
  Update licence
  Update since and version tags
  
  Revision  Changes    Path
  1.4       +10 -12    jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java
  
  Index: IteratorChain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IteratorChain.java	31 Oct 2002 21:55:23 -0000	1.3
  +++ IteratorChain.java	15 Jan 2003 21:46:55 -0000	1.4
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-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
  @@ -85,10 +82,11 @@
    * UnsupportedOperationException.  Subclasses should <i>take care</i>
    * to not alter the underlying List of Iterators.</p>
    * 
  - * @since 2.1
  + * @since Commons Collections 2.1
  + * @version $Revision$ $Date$
  + * 
    * @author Morgan Delagrange
  - * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
  - * @version $Id$
  + * @author Stephen Colebourne
    */
   public class IteratorChain implements Iterator {
   
  
  
  
  1.3       +12 -12    jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
  
  Index: ListIteratorWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ListIteratorWrapper.java	17 Aug 2002 11:33:09 -0000	1.2
  +++ ListIteratorWrapper.java	15 Jan 2003 21:46:55 -0000	1.3
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-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,15 +61,17 @@
   import java.util.LinkedList;
   import java.util.ListIterator;
   import java.util.NoSuchElementException;
  +
   /**
    * As the wrapped Iterator is traversed, ListIteratorWrapper
    * builds a LinkedList of its values, permitting all required
    * operations of ListIterator.
    * 
  - * @since 2.1
  + * @since Commons Collections 2.1
  + * @version $Revision$ $Date$
  + * 
    * @author Morgan Delagrange
  - * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
  - * @version $Id$
  + * @author Stephen Colebourne
    */
   public class ListIteratorWrapper implements ListIterator {
   
  @@ -100,6 +99,7 @@
        * @throws NullPointerException if the iterator is null
        */
       public ListIteratorWrapper(Iterator iterator) {
  +        super();
           if (iterator == null) {
               throw new NullPointerException("Iterator must not be null");
           }
  
  
  
  1.2       +22 -21    jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
  
  Index: IteratorEnumeration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorEnumeration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IteratorEnumeration.java	15 Aug 2002 23:13:51 -0000	1.1
  +++ IteratorEnumeration.java	15 Jan 2003 21:46:55 -0000	1.2
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-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
  @@ -63,31 +60,35 @@
   import java.util.Enumeration;
   import java.util.Iterator;
   
  -/** Adapter to make an {@link Iterator Iterator} instance appear to be an {@link Enumeration Enumeration} instances
  -  *
  -  * @since 1.0
  -  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  -  */
  -
  +/** 
  + * Adapter to make an {@link Iterator Iterator} instance appear to be an {@link Enumeration Enumeration} instances
  + *
  + * @since Commons Collections 1.0
  + * @version $Revision$ $Date$
  + * 
  + * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  + */
   public class IteratorEnumeration implements Enumeration {
       
       private Iterator iterator;
       
       /**
  -     *  Constructs a new <Code>IteratorEnumeration</Code> that will not 
  -     *  function until {@link #setIterator(Iterator) setIterator} is  
  -     *  invoked.
  +     * Constructs a new <Code>IteratorEnumeration</Code> that will not 
  +     * function until {@link #setIterator(Iterator) setIterator} is  
  +     * invoked.
        */
       public IteratorEnumeration() {
  +        super();
       }
   
       /**
  -     *  Constructs a new <Code>IteratorEnumeration</Code> that will use
  -     *  the given iterator. 
  +     * Constructs a new <Code>IteratorEnumeration</Code> that will use
  +     * the given iterator. 
        * 
  -     *  @param iterator  the iterator to use
  +     * @param iterator  the iterator to use
        */
       public IteratorEnumeration( Iterator iterator ) {
  +        super();
           this.iterator = iterator;
       }
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>