You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2004/12/17 13:03:58 UTC

cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Touch.java

bodewig     2004/12/17 04:03:58

  Modified:    src/main/org/apache/tools/ant/taskdefs Touch.java
  Log:
  Shadowing
  
  Revision  Changes    Path
  1.43      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/Touch.java
  
  Index: Touch.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Touch.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- Touch.java	15 Dec 2004 17:23:24 -0000	1.42
  +++ Touch.java	17 Dec 2004 12:03:58 -0000	1.43
  @@ -316,13 +316,13 @@
       }
   
       private void touch(File fromDir, String filename, long defaultTimestamp) {
  -        File file = fileUtils.resolveFile(fromDir, filename);
  +        File f = fileUtils.resolveFile(fromDir, filename);
           if (fileNameMapper == null) {
  -            touch(file, defaultTimestamp);
  +            touch(f, defaultTimestamp);
           } else {
               String[] mapped = fileNameMapper.mapFileName(filename);
               if (mapped != null && mapped.length > 0) {
  -                long modTime = (file.exists()) ? file.lastModified() : defaultTimestamp;
  +                long modTime = (f.exists()) ? f.lastModified() : defaultTimestamp;
                   for (int i = 0; i < mapped.length ; i++) {
                       touch(getProject().resolveFile(mapped[i]), modTime);
                   }
  
  
  

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