cziegeler    2003/01/08 04:09:32

  Modified:    sourceresolve/src/java/org/apache/excalibur/source/impl
                        AbstractSource.java URLSource.java
               sourceresolve/src/java/org/apache/excalibur/source
                        Source.java
  Log:
  Changed children type from Iterator to Collection 
  I couldn't compile it, so hopefully everything is ok...
  
  Revision  Changes    Path
  1.7       +4 -4      
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/AbstractSource.java
  
  Index: AbstractSource.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/AbstractSource.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractSource.java       15 Dec 2002 12:18:57 -0000      1.6
  +++ AbstractSource.java       8 Jan 2003 12:09:31 -0000       1.7
  @@ -57,7 +57,7 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.util.Collections;
  -import java.util.Iterator;
  +import java.util.Collection;
   
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
  @@ -225,8 +225,8 @@
        * The returned URIs are relative to the URI of the parent
        * (this object)
        */
  -    public Iterator getChildrenLocations() 
  +    public Collection getChildrenLocations() 
       {
  -     return Collections.EMPTY_LIST.iterator();
  +     return Collections.EMPTY_LIST;
       }
   }
  
  
  
  1.16      +5 -5      
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/URLSource.java
  
  Index: URLSource.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/URLSource.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- URLSource.java    15 Dec 2002 12:18:57 -0000      1.15
  +++ URLSource.java    8 Jan 2003 12:09:32 -0000       1.16
  @@ -65,7 +65,7 @@
   import java.net.URLConnection;
   import java.util.Arrays;
   import java.util.Collections;
  -import java.util.Iterator;
  +import java.util.Collection;
   import java.util.Map;
   
   import org.apache.excalibur.source.*;
  @@ -416,13 +416,13 @@
        * The returned URIs are relative to the URI of the parent
        * (this object)
        */
  -    public Iterator getChildrenLocations() 
  +    public Collection getChildrenLocations() 
       {
        if ( null != this.file && this.file.isDirectory() )
        {
                final String[] files = this.file.list();
  -             return Arrays.asList(files).iterator();
  +             return Arrays.asList(files);
        }
  -     return Collections.EMPTY_LIST.iterator();
  +     return Collections.EMPTY_LIST;
       }
   }
  
  
  
  1.10      +3 -3      
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/Source.java
  
  Index: Source.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/Source.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Source.java       15 Dec 2002 12:18:57 -0000      1.9
  +++ Source.java       8 Jan 2003 12:09:32 -0000       1.10
  @@ -56,7 +56,7 @@
   
   import java.io.IOException;
   import java.io.InputStream;
  -import java.util.Iterator;
  +import java.util.Collection;
   
   /**
    * Description of a source. This interface provides a simple interface
  @@ -186,5 +186,5 @@
        * The returned URIs are relative to the URI of the parent
        * (this object)
        */
  -    Iterator getChildrenLocations();
  +    Collection getChildrenLocations();
   }
  
  
  

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

Reply via email to