ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs Tar.java
Date Sun, 06 Jan 2002 02:00:39 GMT
donaldp     02/01/05 18:00:39

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Tar.java
  Log:
  Remove access to project as not needed
  
  Revision  Changes    Path
  1.13      +6 -7      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Tar.java	1 Jan 2002 09:13:45 -0000	1.12
  +++ Tar.java	6 Jan 2002 02:00:39 -0000	1.13
  @@ -15,7 +15,6 @@
   import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.DirectoryScanner;
  -import org.apache.tools.ant.Project;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.util.MergingMapper;
  @@ -145,7 +144,7 @@
           for( Iterator e = filesets.iterator(); e.hasNext(); )
           {
               TarFileSet fs = (TarFileSet)e.next();
  -            String[] files = fs.getFiles( getProject() );
  +            String[] files = fs.getFiles();
   
               if( !archiveIsUpToDate( files ) )
               {
  @@ -193,7 +192,7 @@
               for( Iterator e = filesets.iterator(); e.hasNext(); )
               {
                   TarFileSet fs = (TarFileSet)e.next();
  -                String[] files = fs.getFiles( getProject() );
  +                String[] files = fs.getFiles();
                   for( int i = 0; i < files.length; i++ )
                   {
                       File f = new File( fs.getDir(), files[ i ] );
  @@ -344,14 +343,14 @@
            * @return a list of file and directory names, relative to the baseDir
            *      for the project.
            */
  -        public String[] getFiles( Project p )
  +        public String[] getFiles()
               throws TaskException
           {
               if( files == null )
               {
  -                DirectoryScanner ds = getDirectoryScanner();
  -                String[] directories = ds.getIncludedDirectories();
  -                String[] filesPerSe = ds.getIncludedFiles();
  +                final DirectoryScanner scanner = getDirectoryScanner();
  +                final String[] directories = scanner.getIncludedDirectories();
  +                final String[] filesPerSe = scanner.getIncludedFiles();
                   files = new String[ directories.length + filesPerSe.length ];
                   System.arraycopy( directories, 0, files, 0, directories.length );
                   System.arraycopy( filesPerSe, 0, files, directories.length,
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message