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/file Move.java
Date Sun, 30 Dec 2001 00:10:57 GMT
donaldp     01/12/29 16:10:57

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file
                        Move.java
  Log:
  Reuse subclasses method to create filters
  
  Revision  Changes    Path
  1.10      +2 -18     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Move.java	30 Dec 2001 00:07:09 -0000	1.9
  +++ Move.java	30 Dec 2001 00:10:57 -0000	1.10
  @@ -14,7 +14,6 @@
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.types.FileSet;
  -import org.apache.tools.ant.types.FilterSet;
   import org.apache.tools.ant.types.FilterSetCollection;
   import org.apache.tools.ant.util.FileUtils;
   
  @@ -92,7 +91,7 @@
                   try
                   {
                       final String message = "Attempting to rename dir: " + fromDir +
  -                                             " to " + toDir;
  +                        " to " + toDir;
                       getLogger().debug( message );
                       renameFile( fromDir, toDir, isFiltering(), isForceOverwrite() );
                   }
  @@ -148,7 +147,7 @@
                           {
                               getLogger().debug( "Moving " + fromFile + " to " + toFile );
   
  -                            final FilterSetCollection executionFilters = getFilters();
  +                            final FilterSetCollection executionFilters = buildFilterSet();
                               if( isForceOverwrite() )
                               {
                                   FileUtil.forceDelete( d );
  @@ -214,21 +213,6 @@
                   }
               }
           }
  -    }
  -
  -    private FilterSetCollection getFilters()
  -    {
  -        final FilterSetCollection executionFilters = new FilterSetCollection();
  -        if( isFiltering() )
  -        {
  -            executionFilters.addFilterSet( getProject().getGlobalFilterSet() );
  -        }
  -
  -        for( Iterator filterEnum = getFilterSets().iterator(); filterEnum.hasNext(); )
  -        {
  -            executionFilters.addFilterSet( (FilterSet)filterEnum.next() );
  -        }
  -        return executionFilters;
       }
   
       /**
  
  
  

--
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