From 1ac116d8156df659dbbbc55370dac193bdff2ee2 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 23 Jul 2003 07:28:01 +0000 Subject: [PATCH] whitespace changes git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274896 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/DirectoryScanner.java | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index c3b42aca1..4f1edd203 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -883,7 +883,7 @@ public class DirectoryScanner 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 @@ public class DirectoryScanner && !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 @@ public class DirectoryScanner 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); + } + } } } /**