ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java
Date Wed, 23 Jul 2003 07:28:01 GMT
bodewig     2003/07/23 00:28:01

  Modified:    src/main/org/apache/tools/ant DirectoryScanner.java
  Log:
  whitespace changes
  
  Revision  Changes    Path
  1.53      +30 -29    ant/src/main/org/apache/tools/ant/DirectoryScanner.java
  
  Index: DirectoryScanner.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- DirectoryScanner.java	23 Jul 2003 07:25:59 -0000	1.52
  +++ DirectoryScanner.java	23 Jul 2003 07:28:01 -0000	1.53
  @@ -883,7 +883,7 @@
               File   file = new File(dir, newfiles[i]);
               if (file.isDirectory()) {
                   if (isIncluded(name)) {
  -                  accountForIncludedDir(name, file, fast);
  +                    accountForIncludedDir(name, file, fast);
                   } else {
                       everythingIncluded = false;
                       dirsNotIncluded.addElement(name);
  @@ -914,17 +914,17 @@
               && !filesExcluded.contains(name)
               && !filesDeselected.contains(name)) {
           
  -        if (!isExcluded(name)) {
  -            if (isSelected(name, file)) {
  -                filesIncluded.addElement(name);
  +            if (!isExcluded(name)) {
  +                if (isSelected(name, file)) {
  +                    filesIncluded.addElement(name);
  +                } else {
  +                    everythingIncluded = false;
  +                    filesDeselected.addElement(name);
  +                }
               } else {
                   everythingIncluded = false;
  -                filesDeselected.addElement(name);
  +                filesExcluded.addElement(name);
               }
  -        } else {
  -            everythingIncluded = false;
  -            filesExcluded.addElement(name);
  -        }
           }
       }
   
  @@ -939,27 +939,28 @@
           if (!dirsIncluded.contains(name)
               && !dirsExcluded.contains(name)
               && !dirsDeselected.contains(name)) {
  -      if (!isExcluded(name)) {
  -          if (isSelected(name, file)) {
  -              dirsIncluded.addElement(name);
  -              if (fast) {
  -                  scandir(file, name + File.separator, fast);
  -              }
  -          } else {
  -              everythingIncluded = false;
  -              dirsDeselected.addElement(name);
  -              if (fast && couldHoldIncluded(name)) {
  -                  scandir(file, name + File.separator, fast);
  -              }
  -          }
   
  -      } else {
  -          everythingIncluded = false;
  -          dirsExcluded.addElement(name);
  -          if (fast && couldHoldIncluded(name)) {
  -              scandir(file, name + File.separator, fast);
  -          }
  -      }
  +            if (!isExcluded(name)) {
  +                if (isSelected(name, file)) {
  +                    dirsIncluded.addElement(name);
  +                    if (fast) {
  +                        scandir(file, name + File.separator, fast);
  +                    }
  +                } else {
  +                    everythingIncluded = false;
  +                    dirsDeselected.addElement(name);
  +                    if (fast && couldHoldIncluded(name)) {
  +                        scandir(file, name + File.separator, fast);
  +                    }
  +                }
  +                
  +            } else {
  +                everythingIncluded = false;
  +                dirsExcluded.addElement(name);
  +                if (fast && couldHoldIncluded(name)) {
  +                    scandir(file, name + File.separator, fast);
  +                }
  +            }
           }
       }
       /**
  
  
  

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


Mime
View raw message