From c65205e9224ab7d0bbc94736710a57e03e757053 Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Wed, 21 Sep 2005 18:14:49 +0000 Subject: [PATCH] Remove DirectoryScanner import; restructure for taste git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@290772 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/Delete.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index 3a1770f66..9d2ba01db 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -21,9 +21,8 @@ import java.io.File; import java.util.Vector; import java.util.Iterator; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.FileSet; @@ -32,24 +31,24 @@ import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.Sort; import org.apache.tools.ant.types.resources.BCFileSet; import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.types.resources.comparators.FileSystem; import org.apache.tools.ant.types.resources.comparators.Reverse; +import org.apache.tools.ant.types.resources.comparators.FileSystem; +import org.apache.tools.ant.types.selectors.OrSelector; import org.apache.tools.ant.types.selectors.AndSelector; -import org.apache.tools.ant.types.selectors.ContainsRegexpSelector; -import org.apache.tools.ant.types.selectors.ContainsSelector; +import org.apache.tools.ant.types.selectors.NotSelector; import org.apache.tools.ant.types.selectors.DateSelector; -import org.apache.tools.ant.types.selectors.DependSelector; +import org.apache.tools.ant.types.selectors.FileSelector; +import org.apache.tools.ant.types.selectors.NoneSelector; +import org.apache.tools.ant.types.selectors.SizeSelector; import org.apache.tools.ant.types.selectors.DepthSelector; +import org.apache.tools.ant.types.selectors.DependSelector; import org.apache.tools.ant.types.selectors.ExtendSelector; +import org.apache.tools.ant.types.selectors.SelectSelector; +import org.apache.tools.ant.types.selectors.PresentSelector; +import org.apache.tools.ant.types.selectors.ContainsSelector; import org.apache.tools.ant.types.selectors.FilenameSelector; import org.apache.tools.ant.types.selectors.MajoritySelector; -import org.apache.tools.ant.types.selectors.NoneSelector; -import org.apache.tools.ant.types.selectors.NotSelector; -import org.apache.tools.ant.types.selectors.OrSelector; -import org.apache.tools.ant.types.selectors.PresentSelector; -import org.apache.tools.ant.types.selectors.SelectSelector; -import org.apache.tools.ant.types.selectors.SizeSelector; -import org.apache.tools.ant.types.selectors.FileSelector; +import org.apache.tools.ant.types.selectors.ContainsRegexpSelector; import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector; /**