Remove unused imports, remove glob imports, sort imports.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273169 13f79535-47bb-0310-9956-ffa450edef68

34 files changed, 80 insertions, 115 deletions

diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index b42de15f8..eaf2aaa52 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -53,17 +53,32 @@
  */
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.FileScanner;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.selectors.*;
-
 import java.io.File;
+import java.util.Enumeration;
+import java.util.Hashtable;
 import java.util.Stack;
 import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.FileScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.selectors.AndSelector;
+import org.apache.tools.ant.types.selectors.ContainsSelector;
+import org.apache.tools.ant.types.selectors.DateSelector;
+import org.apache.tools.ant.types.selectors.DependSelector;
+import org.apache.tools.ant.types.selectors.DepthSelector;
+import org.apache.tools.ant.types.selectors.ExtendSelector;
+import org.apache.tools.ant.types.selectors.FileSelector;
+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.SelectorContainer;
+import org.apache.tools.ant.types.selectors.SelectorScanner;
+import org.apache.tools.ant.types.selectors.SizeSelector;
 
 /**
  * Class that holds an implicit patternset and supports nested
diff --git a/src/main/org/apache/tools/ant/types/AntFilterReader.java b/src/main/org/apache/tools/ant/types/AntFilterReader.java
index fa73a85e0..9e508aa81 100644
--- a/src/main/org/apache/tools/ant/types/AntFilterReader.java
+++ b/src/main/org/apache/tools/ant/types/AntFilterReader.java
@@ -53,8 +53,8 @@
  */
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.BuildException;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
 
 /**
  * An AntFileReader is a wrapper class that encloses the classname
diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java
index 23eeab308..32b0cfd97 100644
--- a/src/main/org/apache/tools/ant/types/Commandline.java
+++ b/src/main/org/apache/tools/ant/types/Commandline.java
@@ -54,11 +54,11 @@
 
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.StringUtils;
 import java.io.File;
-import java.util.Vector;
 import java.util.StringTokenizer;
+import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.util.StringUtils;
 
 
 /**
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 8ea71bf7e..bc68d729a 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -54,11 +54,11 @@
 
 package org.apache.tools.ant.types;
 
-import java.util.Properties;
 import java.util.Enumeration;
+import java.util.Properties;
 import java.util.Vector;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.JavaEnvUtils;
 
 /**
diff --git a/src/main/org/apache/tools/ant/types/Environment.java b/src/main/org/apache/tools/ant/types/Environment.java
index b49266fbb..ae6bb69b4 100644
--- a/src/main/org/apache/tools/ant/types/Environment.java
+++ b/src/main/org/apache/tools/ant/types/Environment.java
@@ -54,8 +54,8 @@
 
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.BuildException;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
 
 /**
  * Wrapper for environment variables.
diff --git a/src/main/org/apache/tools/ant/types/FileList.java b/src/main/org/apache/tools/ant/types/FileList.java
index a79508a88..bf1a7f5d4 100644
--- a/src/main/org/apache/tools/ant/types/FileList.java
+++ b/src/main/org/apache/tools/ant/types/FileList.java
@@ -54,15 +54,12 @@
 
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
 import java.io.File;
-
-import java.util.StringTokenizer;
-
 import java.util.Stack;
+import java.util.StringTokenizer;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 
 /**
  * FileList represents an explicitly named list of files.  FileLists
@@ -70,12 +67,12 @@ import java.util.Vector;
  * whether they currently exist.  By contrast, FileSet operates as a
  * filter, only returning the name of a matched file if it currently
  * exists in the file system.
- * 
+ *
  * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  * @version $Revision$ $Date$
  */
 public class FileList extends DataType {
-    
+
     private Vector filenames = new Vector();
     private File dir;
 
@@ -94,7 +91,7 @@ public class FileList extends DataType {
      * instance.
      *
      * <p>You must not set another attribute or nest elements inside
-     * this element if you make it a reference.</p> 
+     * this element if you make it a reference.</p>
      */
     public void setRefid(Reference r) throws BuildException {
         if ((dir != null) || (filenames.size() != 0)) {
@@ -149,10 +146,10 @@ public class FileList extends DataType {
         filenames.copyInto(result);
         return result;
     }
-    
+
     /**
      * Performs the check for circular references and returns the
-     * referenced FileList.  
+     * referenced FileList.
      */
     protected FileList getRef(Project p) {
         if (!isChecked()) {
@@ -160,7 +157,7 @@ public class FileList extends DataType {
             stk.push(this);
             dieOnCircularReference(stk, p);
         }
-        
+
         Object o = getRefid().getReferencedObject(p);
         if (!(o instanceof FileList)) {
             String msg = getRefid().getRefId() + " doesn\'t denote a filelist";
diff --git a/src/main/org/apache/tools/ant/types/FilterChain.java b/src/main/org/apache/tools/ant/types/FilterChain.java
index 197a58df3..ec1f4bcb6 100644
--- a/src/main/org/apache/tools/ant/types/FilterChain.java
+++ b/src/main/org/apache/tools/ant/types/FilterChain.java
@@ -54,7 +54,6 @@
 package org.apache.tools.ant.types;
 
 import java.util.Vector;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.filters.ClassConstants;
 import org.apache.tools.ant.filters.ExpandProperties;
diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java
index 1e2ed7998..c63b21602 100644
--- a/src/main/org/apache/tools/ant/types/FilterSet.java
+++ b/src/main/org/apache/tools/ant/types/FilterSet.java
@@ -57,14 +57,10 @@ package org.apache.tools.ant.types;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-
-// java util classes
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
 import java.util.Vector;
-
-// ant classes
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 
diff --git a/src/main/org/apache/tools/ant/types/FilterSetCollection.java b/src/main/org/apache/tools/ant/types/FilterSetCollection.java
index cbae7e094..14cc2e12e 100644
--- a/src/main/org/apache/tools/ant/types/FilterSetCollection.java
+++ b/src/main/org/apache/tools/ant/types/FilterSetCollection.java
@@ -60,8 +60,6 @@ package org.apache.tools.ant.types;
 
 // java util classes
 import java.util.Enumeration;
-
-
 import java.util.Vector;
 
 // ant classes
diff --git a/src/main/org/apache/tools/ant/types/Mapper.java b/src/main/org/apache/tools/ant/types/Mapper.java
index de1c9e91a..4db6843c7 100644
--- a/src/main/org/apache/tools/ant/types/Mapper.java
+++ b/src/main/org/apache/tools/ant/types/Mapper.java
@@ -54,14 +54,13 @@
 
 package org.apache.tools.ant.types;
 
+import java.util.Properties;
+import java.util.Stack;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.FileNameMapper;
 
-import java.util.Properties;
-import java.util.Stack;
-
 /**
  * Element to define a FileNameMapper.
  *
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index b552d4ccd..9f71ab21e 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -54,18 +54,16 @@
 
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.PathTokenizer;
-import org.apache.tools.ant.util.JavaEnvUtils;
-
 import java.io.File;
-
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Stack;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.PathTokenizer;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.JavaEnvUtils;
 
 
 
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index 80c3a938d..d6c167a34 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -54,18 +54,16 @@
 
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.Project;
-
-import org.apache.tools.ant.BuildException;
-
-import java.io.File;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Stack;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 
 /**
  * Named collection of include/exclude tags.
diff --git a/src/main/org/apache/tools/ant/types/Reference.java b/src/main/org/apache/tools/ant/types/Reference.java
index 548c130dc..06a82cd6c 100644
--- a/src/main/org/apache/tools/ant/types/Reference.java
+++ b/src/main/org/apache/tools/ant/types/Reference.java
@@ -54,8 +54,8 @@
 
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 
 /**
  * Class to hold a reference to another object in the project.
diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java
index 37e6fe83f..aec564582 100644
--- a/src/main/org/apache/tools/ant/types/XMLCatalog.java
+++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java
@@ -56,26 +56,24 @@ package org.apache.tools.ant.types;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.FileNotFoundException;
-import java.net.URL;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Enumeration;
 import java.util.Stack;
 import java.util.Vector;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.sax.SAXSource;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
+import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.util.FileUtils;
-
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java
index 1079a999f..260c205d8 100644
--- a/src/main/org/apache/tools/ant/types/ZipFileSet.java
+++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java
@@ -54,11 +54,10 @@
 package org.apache.tools.ant.types;
 
 import java.io.File;
-
+import java.util.Stack;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
-import java.util.Stack;
 
 /**
  * A ZipFileSet is a FileSet with extra attributes useful in the context of
diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java
index 4225d48ab..8f04b8811 100644
--- a/src/main/org/apache/tools/ant/types/ZipScanner.java
+++ b/src/main/org/apache/tools/ant/types/ZipScanner.java
@@ -54,8 +54,8 @@
 
 package org.apache.tools.ant.types;
 
-import org.apache.tools.ant.DirectoryScanner;
 import java.io.File;
+import org.apache.tools.ant.DirectoryScanner;
 
 /**
  * ZipScanner accesses the pattern matching algorithm in DirectoryScanner,
diff --git a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
index 0a5b319e5..226985331 100644
--- a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
+++ b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
@@ -53,8 +53,8 @@
  */
 package org.apache.tools.ant.types.optional.depend;
 
-import java.util.Vector;
 import java.util.Enumeration;
+import java.util.Vector;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
diff --git a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
index 50e5cc3f7..328c744cf 100644
--- a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
+++ b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
@@ -54,13 +54,13 @@
 package org.apache.tools.ant.types.optional.depend;
 
 import java.io.File;
-import java.util.Vector;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import org.apache.tools.ant.util.depend.DependencyAnalyzer;
-import org.apache.tools.ant.DirectoryScanner;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.depend.DependencyAnalyzer;
 
 
 /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
index a69b799ce..9d56edbbc 100644
--- a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
@@ -55,9 +55,8 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
-import  org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.DataType;
 
 /**
  * A convenience base class that you can subclass Selectors from. It
diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
index a783a7999..916f2dd30 100644
--- a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
@@ -54,14 +54,11 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
-import  org.apache.tools.ant.types.Reference;
-
 import java.io.File;
 import java.util.Enumeration;
-import java.util.Stack;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 
 /**
  * This is the base class for selectors that can contain other selectors.
@@ -136,7 +133,6 @@ public abstract class BaseSelectorContainer extends BaseSelector
      * Add a new selector into this container.
      *
      * @param selector the new selector to add
-     * @return the selector that was added
      */
     public void appendSelector(FileSelector selector) {
         selectorsList.addElement(selector);
diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
index dfe5b04b0..e84e60eff 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
@@ -54,15 +54,14 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import java.io.File;
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-
+import java.io.InputStreamReader;
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Parameter;
-import org.apache.tools.ant.BuildException;
 
 /**
  * Selector that filters files based on whether they contain a
diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
index 215253aa1..cdeada858 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
@@ -58,11 +58,10 @@ import java.io.File;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Locale;
-
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Parameter;
-import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**
  * Selector that chooses files based on their last modified date.
diff --git a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
index 0bcc09633..37799c629 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
@@ -55,12 +55,11 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-
-import org.apache.tools.ant.types.Mapper;
-import org.apache.tools.ant.util.IdentityMapper;
-import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.types.Mapper;
+import org.apache.tools.ant.util.FileNameMapper;
+import org.apache.tools.ant.util.IdentityMapper;
 
 /**
  * Selector that filters files based on whether they are newer than
diff --git a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
index 0742521cf..7d8ffc237 100644
--- a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
@@ -56,10 +56,8 @@ package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
 import java.util.StringTokenizer;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Parameter;
 
 /**
  * Selector that filters files based on the how deep in the directory
diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java
index 0d7fd10bc..a37ee39fc 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java
@@ -54,8 +54,6 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import java.io.File;
-
 import org.apache.tools.ant.types.Parameterizable;
 
 /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
index 46533c31f..b46f97ce0 100644
--- a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
@@ -56,12 +56,10 @@ package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
 import java.util.Vector;
-
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.types.DataType;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.Parameter;
+import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 
 /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/FileSelector.java b/src/main/org/apache/tools/ant/types/selectors/FileSelector.java
index f877ff7bc..00ca347f8 100644
--- a/src/main/org/apache/tools/ant/types/selectors/FileSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/FileSelector.java
@@ -55,7 +55,6 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-
 import org.apache.tools.ant.BuildException;
 
 /**
diff --git a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
index 3c8b2b4f5..7b9c64ea0 100644
--- a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
@@ -55,7 +55,6 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Parameter;
 
diff --git a/src/main/org/apache/tools/ant/types/selectors/NotSelector.java b/src/main/org/apache/tools/ant/types/selectors/NotSelector.java
index 7a16930e0..1c5dadcd2 100644
--- a/src/main/org/apache/tools/ant/types/selectors/NotSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/NotSelector.java
@@ -54,8 +54,7 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import java.io.File;
-import java.util.Enumeration;
+
 
 /**
  * This selector has one other selectors whose meaning it inverts. It
diff --git a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
index 6adc381e2..6bf7cb67d 100644
--- a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
@@ -55,12 +55,11 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Mapper;
-import org.apache.tools.ant.util.IdentityMapper;
 import org.apache.tools.ant.util.FileNameMapper;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.util.IdentityMapper;
 
 /**
  * Selector that filters files based on whether they appear in another
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
index 535b537e0..eff32d153 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
@@ -54,12 +54,8 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import java.io.File;
 import java.util.Enumeration;
-
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
-import  org.apache.tools.ant.types.Reference;
 
 /**
  * This selector just holds one other selector and forwards all
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
index 66382d811..865b95634 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java
@@ -54,14 +54,8 @@
 
 package org.apache.tools.ant.types.selectors;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
-import  org.apache.tools.ant.types.Reference;
-
-import java.io.File;
 import java.util.Enumeration;
-import java.util.Stack;
-import java.util.Vector;
+import org.apache.tools.ant.Project;
 
 /**
  * This is the interface for selectors that can contain other selectors.
diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
index 1c9d7daec..73d26b7f4 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
@@ -58,8 +58,6 @@ import java.io.File;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import org.apache.tools.ant.BuildException;
-
 /**
  * <p>This is a utility class used by selectors and DirectoryScanner. The
  * functionality more properly belongs just to selectors, but unfortunately
diff --git a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
index 52e883da3..a6668fc75 100644
--- a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
+++ b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
@@ -55,10 +55,8 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Parameter;
-import org.apache.tools.ant.BuildException;
 
 /**
  * Selector that filters files based on their size.