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/11/16 00:50:46 UTC

cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/iterators AbstractIteratorDecorator.java AbstractMapIteratorDecorator.java AbstractListIteratorDecorator.java

scolebourne    2003/11/15 15:50:46

  Modified:    collections/src/java/org/apache/commons/collections/iterators
                        AbstractIteratorDecorator.java
                        AbstractMapIteratorDecorator.java
                        AbstractListIteratorDecorator.java
  Log:
  Update iterators to be more stadard decorator design
  
  Revision  Changes    Path
  1.2       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
  
  Index: AbstractIteratorDecorator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractIteratorDecorator.java	2 Nov 2003 16:29:12 -0000	1.1
  +++ AbstractIteratorDecorator.java	15 Nov 2003 23:50:46 -0000	1.2
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -73,7 +73,7 @@
   public class AbstractIteratorDecorator implements Iterator {
   
       /** The iterator being decorated */
  -    private Iterator iterator;
  +    protected final Iterator iterator;
   
       //-----------------------------------------------------------------------
       /**
  
  
  
  1.3       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
  
  Index: AbstractMapIteratorDecorator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractMapIteratorDecorator.java	8 Nov 2003 18:43:12 -0000	1.2
  +++ AbstractMapIteratorDecorator.java	15 Nov 2003 23:50:46 -0000	1.3
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -70,7 +70,7 @@
   public class AbstractMapIteratorDecorator implements MapIterator {
   
       /** The iterator being decorated */
  -    private MapIterator iterator;
  +    protected final MapIterator iterator;
   
       //-----------------------------------------------------------------------
       /**
  
  
  
  1.2       +5 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
  
  Index: AbstractListIteratorDecorator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractListIteratorDecorator.java	2 Nov 2003 16:29:12 -0000	1.1
  +++ AbstractListIteratorDecorator.java	15 Nov 2003 23:50:46 -0000	1.2
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -73,7 +73,7 @@
   public class AbstractListIteratorDecorator implements ListIterator {
   
       /** The iterator being decorated */
  -    private ListIterator iterator;
  +    protected final ListIterator iterator;
   
       //-----------------------------------------------------------------------
       /**
  @@ -135,4 +135,5 @@
       public void add(Object obj) {
           iterator.add(obj);
       }
  +    
   }
  
  
  

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