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

src/main/org/apache/tools/ant/AntClassLoader.java

@@ -69,7 +69,6 @@ import java.util.Hashtable;
 import java.util.Vector;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import org.apache.tools.ant.util.LoaderUtils;

src/main/org/apache/tools/ant/BuildException.java

@@ -53,8 +53,8 @@
  */
 package org.apache.tools.ant;
 
-import java.io.PrintWriter;
 import java.io.PrintStream;
+import java.io.PrintWriter;
 
 /**
  * Signals an error condition during a build

src/main/org/apache/tools/ant/DefaultLogger.java

@@ -58,9 +58,8 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.StringReader;
-
-import org.apache.tools.ant.util.StringUtils;
 import org.apache.tools.ant.util.DateUtils;
+import org.apache.tools.ant.util.StringUtils;
 
 /**
  * Writes build events to a PrintStream. Currently, it

src/main/org/apache/tools/ant/DemuxOutputStream.java

@@ -54,9 +54,9 @@
 
 package org.apache.tools.ant;
 
-import java.io.OutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.Hashtable;
 
 /**

src/main/org/apache/tools/ant/Diagnostics.java

@@ -55,13 +55,13 @@ package org.apache.tools.ant;
 
 import java.io.File;
 import java.io.FilenameFilter;
-import java.io.PrintStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Enumeration;
 import java.util.Properties;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 
 /**
  * A little diagnostic helper that output some information that may help

src/main/org/apache/tools/ant/DirectoryScanner.java

@@ -57,10 +57,8 @@ package org.apache.tools.ant;
 import java.io.File;
 import java.io.IOException;
 import java.util.Vector;
-import java.util.StringTokenizer;
-
-import org.apache.tools.ant.types.selectors.SelectorScanner;
 import org.apache.tools.ant.types.selectors.FileSelector;
+import org.apache.tools.ant.types.selectors.SelectorScanner;
 import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.apache.tools.ant.util.FileUtils;
 

src/main/org/apache/tools/ant/IntrospectionHelper.java

@@ -54,10 +54,6 @@
 
 package org.apache.tools.ant;
 
-import org.apache.tools.ant.DynamicConfigurator;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Path;
-
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -65,6 +61,8 @@ import java.lang.reflect.Method;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Locale;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.Path;
 
 /**
  * Helper class that collects the methods a task or nested element

src/main/org/apache/tools/ant/Main.java

@@ -54,19 +54,18 @@
 
 package org.apache.tools.ant;
 
-import org.apache.tools.ant.input.DefaultInputHandler;
-import org.apache.tools.ant.input.InputHandler;
-import org.apache.tools.ant.util.JavaEnvUtils;
-
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.PrintStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Vector;
-import java.util.Properties;
+import java.io.PrintStream;
 import java.util.Enumeration;
+import java.util.Properties;
+import java.util.Vector;
+import org.apache.tools.ant.input.DefaultInputHandler;
+import org.apache.tools.ant.input.InputHandler;
+import org.apache.tools.ant.util.JavaEnvUtils;
 
 /**
  * Command line entry point into Ant. This class is entered via the

src/main/org/apache/tools/ant/PathTokenizer.java

@@ -53,11 +53,10 @@
  */
 package org.apache.tools.ant;
 
-import org.apache.tools.ant.taskdefs.condition.Os;
-
+import java.io.File;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
-import java.io.File;
+import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**
  * A Path tokenizer takes a path and returns the components that make up

src/main/org/apache/tools/ant/Project.java

@@ -55,21 +55,20 @@
 package org.apache.tools.ant;
 
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Modifier;
+import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Vector;
 import java.util.Properties;
-import java.util.Enumeration;
 import java.util.Stack;
-import java.lang.reflect.Modifier;
-
+import java.util.Vector;
+import org.apache.tools.ant.input.DefaultInputHandler;
+import org.apache.tools.ant.input.InputHandler;
 import org.apache.tools.ant.types.FilterSet;
 import org.apache.tools.ant.types.FilterSetCollection;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
-import org.apache.tools.ant.input.DefaultInputHandler;
-import org.apache.tools.ant.input.InputHandler;
 
 /**
  * Central representation of an Ant project. This class defines an

src/main/org/apache/tools/ant/ProjectHelper.java

@@ -54,18 +54,17 @@
 
 package org.apache.tools.ant;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStream;
-import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.util.Hashtable;
-import java.util.Vector;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import java.util.Locale;
-
-import org.xml.sax.AttributeList;
+import java.util.Vector;
 import org.apache.tools.ant.helper.ProjectHelperImpl;
 import org.apache.tools.ant.util.LoaderUtils;
+import org.xml.sax.AttributeList;
 
 /**
  * Configures a Project (complete with Targets and Tasks) based on

src/main/org/apache/tools/ant/Target.java

@@ -55,8 +55,8 @@
 package org.apache.tools.ant;
 
 import java.util.Enumeration;
-import java.util.Vector;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 /**
  * Class to implement a target object with required parameters.

src/main/org/apache/tools/ant/XmlLogger.java

@@ -54,14 +54,6 @@
 
 package org.apache.tools.ant;
 
-import org.apache.tools.ant.util.DOMElementWriter;
-import org.apache.tools.ant.util.StringUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -70,6 +62,13 @@ import java.io.PrintStream;
 import java.io.Writer;
 import java.util.Hashtable;
 import java.util.Stack;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.tools.ant.util.DOMElementWriter;
+import org.apache.tools.ant.util.StringUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
 
 /**
  * Generates a file in the current directory with

src/main/org/apache/tools/ant/filters/BaseFilterReader.java

@@ -57,7 +57,6 @@ import java.io.FilterReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.FileUtils;
 

src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java

@@ -54,7 +54,6 @@
 package org.apache.tools.ant.filters;
 
 import java.io.Reader;
-
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.Parameterizable;
 

src/main/org/apache/tools/ant/filters/ExpandProperties.java

@@ -55,7 +55,6 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-
 import org.apache.tools.ant.Project;
 
 /**

src/main/org/apache/tools/ant/filters/HeadFilter.java

@@ -55,7 +55,6 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/LineContains.java

@@ -56,7 +56,6 @@ package org.apache.tools.ant.filters;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Vector;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/LineContainsRegExp.java

@@ -56,7 +56,6 @@ package org.apache.tools.ant.filters;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Vector;
-
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.RegularExpression;
 import org.apache.tools.ant.util.regexp.Regexp;

src/main/org/apache/tools/ant/filters/PrefixLines.java

@@ -55,7 +55,6 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/ReplaceTokens.java

@@ -56,7 +56,6 @@ package org.apache.tools.ant.filters;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Hashtable;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/StripLineBreaks.java

@@ -55,7 +55,6 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/StripLineComments.java

@@ -56,7 +56,6 @@ package org.apache.tools.ant.filters;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.Vector;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/TabsToSpaces.java

@@ -55,7 +55,6 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/TailFilter.java

@@ -55,7 +55,6 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-
 import org.apache.tools.ant.types.Parameter;
 
 /**

src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java

@@ -53,6 +53,12 @@
  */
 package org.apache.tools.ant.filters.util;
 
+import java.io.FilterReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Vector;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -60,18 +66,11 @@ import org.apache.tools.ant.filters.BaseFilterReader;
 import org.apache.tools.ant.filters.ChainableReader;
 import org.apache.tools.ant.types.AntFilterReader;
 import org.apache.tools.ant.types.FilterChain;
-import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.Parameterizable;
+import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.FileUtils;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.io.FilterReader;
-import java.io.Reader;
-import java.io.IOException;
-import java.util.Vector;
-
 /**
  * Process a FilterReader chain.
  *

src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java

@@ -55,7 +55,6 @@ package org.apache.tools.ant.filters.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.ConstantValue;
 import org.apache.bcel.classfile.Field;

src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java

@@ -60,26 +60,26 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Locale;
-import org.xml.sax.Locator;
-import org.xml.sax.InputSource;
-import org.xml.sax.HandlerBase;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.DocumentHandler;
-import org.xml.sax.AttributeList;
-import org.xml.sax.helpers.XMLReaderAdapter;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.UnknownElement;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.RuntimeConfigurable;
 import org.apache.tools.ant.IntrospectionHelper;
-import org.apache.tools.ant.TaskContainer;
 import org.apache.tools.ant.Location;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+import org.apache.tools.ant.RuntimeConfigurable;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.TaskAdapter;
+import org.apache.tools.ant.TaskContainer;
+import org.apache.tools.ant.UnknownElement;
 import org.apache.tools.ant.util.JAXPUtils;
+import org.xml.sax.AttributeList;
+import org.xml.sax.DocumentHandler;
+import org.xml.sax.HandlerBase;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.XMLReaderAdapter;
 
 /**
  * Original helper.

src/main/org/apache/tools/ant/input/DefaultInputHandler.java

@@ -59,7 +59,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Enumeration;
-
 import org.apache.tools.ant.BuildException;
 
 /**

src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java

@@ -54,11 +54,10 @@
 
 package org.apache.tools.ant.input;
 
-import org.apache.tools.ant.BuildException;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
+import org.apache.tools.ant.BuildException;
 
 /**
  * Reads input from a property file, the file name is read from the

src/main/org/apache/tools/ant/listener/AnsiColorLogger.java

@@ -54,11 +54,10 @@
 package org.apache.tools.ant.listener;
 
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.Properties;
-
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 

src/main/org/apache/tools/ant/listener/MailLogger.java

@@ -53,12 +53,6 @@
  */
 package org.apache.tools.ant.listener;
 
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.DefaultLogger;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.StringUtils;
-import org.apache.tools.mail.MailMessage;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -67,6 +61,11 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import org.apache.tools.ant.BuildEvent;
+import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.StringUtils;
+import org.apache.tools.mail.MailMessage;
 
 /**
  *  Buffers log messages from DefaultLogger, and sends an e-mail with the

src/main/org/apache/tools/ant/taskdefs/Ant.java

@@ -54,22 +54,22 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.DefaultLogger;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.util.FileUtils;
 import java.io.File;
-import java.io.PrintStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.lang.reflect.Method;
-import java.util.Vector;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectComponent;
+import org.apache.tools.ant.ProjectHelper;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Build a sub-project.

src/main/org/apache/tools/ant/taskdefs/AntStructure.java

@@ -54,24 +54,22 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.IntrospectionHelper;
-
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.TaskContainer;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.OutputStreamWriter;
-import java.io.FileOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.FileWriter;
-import java.io.IOException;
-
 /**
  * Creates a partial DTD for Ant from the currently known tasks.
  *

src/main/org/apache/tools/ant/taskdefs/Available.java

@@ -55,11 +55,10 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Path;

src/main/org/apache/tools/ant/taskdefs/BuildNumber.java

@@ -58,8 +58,8 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.util.FileUtils;
 
 /**

src/main/org/apache/tools/ant/taskdefs/CVSPass.java

@@ -54,17 +54,16 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.StringUtils;
-
-import java.io.File;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileReader;
-import java.io.PrintWriter;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.util.StringUtils;
 
 /**
  * Adds an new entry to a CVS password file.

src/main/org/apache/tools/ant/taskdefs/CallTarget.java

@@ -54,8 +54,8 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 /**
  * Call another target in the same project.

src/main/org/apache/tools/ant/taskdefs/Checksum.java

@@ -57,8 +57,8 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

src/main/org/apache/tools/ant/taskdefs/Chmod.java

@@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Os;

src/main/org/apache/tools/ant/taskdefs/Concat.java

@@ -53,17 +53,6 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.BuildException;
-
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.FileList;
-
-import org.apache.tools.ant.util.StringUtils;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -76,9 +65,16 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringReader;
-
-import java.util.Vector; // 1.1
-import java.util.Enumeration; // 1.1
+import java.util.Enumeration;
+import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileList;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.util.StringUtils; // 1.1
 
 /**
  * This class contains the 'concat' task, used to concatenate a series

src/main/org/apache/tools/ant/taskdefs/Copy.java

@@ -54,27 +54,26 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.types.FilterSet;
 import org.apache.tools.ant.types.FilterSetCollection;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.util.FileNameMapper;
+import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.FlatFileNameMapper;
 import org.apache.tools.ant.util.IdentityMapper;
 import org.apache.tools.ant.util.SourceFileScanner;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
 /**
  * Copies a file or directory to a new file
  * or directory.  Files are only copied if the source file is newer

src/main/org/apache/tools/ant/taskdefs/Copydir.java

@@ -56,8 +56,8 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

src/main/org/apache/tools/ant/taskdefs/Copyfile.java

@@ -56,10 +56,9 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
-
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 
 /**
  * Copies a file.

src/main/org/apache/tools/ant/taskdefs/Definer.java

@@ -54,20 +54,19 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+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.Task;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 
-import java.util.Properties;
-import java.util.Enumeration;
-import java.io.File;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-
 /**
  * Base class for Taskdef and Typedef - does all the classpath
  * handling and and class loading.

src/main/org/apache/tools/ant/taskdefs/Delete.java

@@ -54,13 +54,13 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Project;
+import java.io.File;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
-import java.io.File;
-import java.util.Vector;
 
 /**
  * Deletes a file or directory, or set of files defined by a fileset.

src/main/org/apache/tools/ant/taskdefs/Deltree.java

@@ -54,10 +54,10 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
 import java.io.File;
 import java.io.IOException;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 /**
  *

src/main/org/apache/tools/ant/taskdefs/DependSet.java

@@ -55,15 +55,15 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import java.util.Date;
 import java.util.Enumeration;
 import java.util.Vector;
-import java.util.Date;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Os;
-import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.FileList;
+import org.apache.tools.ant.types.FileSet;
 
 /**
  * Examines and removes out of date target files.  If any of the target files

src/main/org/apache/tools/ant/taskdefs/Dirname.java

@@ -55,7 +55,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 

src/main/org/apache/tools/ant/taskdefs/Ear.java

@@ -53,14 +53,13 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+import java.io.IOException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.tools.zip.ZipOutputStream;
 
-import java.io.File;
-import java.io.IOException;
-
 /**
  * Creates a EAR archive. Based on WAR task
  *

src/main/org/apache/tools/ant/taskdefs/Echo.java

@@ -54,14 +54,13 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
-
-import org.apache.tools.ant.types.EnumeratedAttribute;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 /**
  * Writes a message to the Ant logging facilities.
  *

src/main/org/apache/tools/ant/taskdefs/Exec.java

@@ -54,16 +54,16 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.PrintWriter;
 import java.io.FileWriter;
-import java.io.InputStream;
 import java.io.IOException;
-import java.io.BufferedReader;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 
 /**
  * Executes a given command if the os platform is appropriate.

src/main/org/apache/tools/ant/taskdefs/ExecTask.java

@@ -54,21 +54,20 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.Environment;
 import org.apache.tools.ant.util.StringUtils;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.FileNotFoundException;
-
 /**
  * Executes a given command if the os platform is appropriate.
  *

src/main/org/apache/tools/ant/taskdefs/Execute.java

@@ -54,21 +54,19 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.taskdefs.condition.Os;
-
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-
-import java.io.BufferedReader;
 import java.io.StringReader;
-import java.io.ByteArrayOutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.types.Commandline;
 
 /**
  * Runs an external program.

src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java

@@ -55,20 +55,19 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.TimeoutObserver;
 import org.apache.tools.ant.util.Watchdog;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.io.PrintStream;
-
 /**
  *
  * @author thomas.haas@softwired-inc.com

src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java

@@ -54,21 +54,20 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.util.SourceFileScanner;
 
-import java.util.Hashtable;
-import java.util.Vector;
-import java.io.File;
-import java.io.IOException;
-
 /**
  * Executes a given command, supplying a set of files as arguments. 
  *

src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java

@@ -54,8 +54,8 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 
 /**

src/main/org/apache/tools/ant/taskdefs/Exit.java

@@ -54,8 +54,8 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 
 /**

src/main/org/apache/tools/ant/taskdefs/Expand.java

@@ -54,23 +54,23 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.PatternSet;
-import org.apache.tools.ant.util.FileUtils;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Date;
 import java.util.Vector;
-import java.util.zip.ZipInputStream;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.PatternSet;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Unzip a file.

src/main/org/apache/tools/ant/taskdefs/Filter.java

@@ -55,10 +55,9 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 
 /**
  * Sets a token filter that is used by the file copy tasks

src/main/org/apache/tools/ant/taskdefs/FixCRLF.java

@@ -54,13 +54,6 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-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.util.FileUtils;
-
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -75,6 +68,12 @@ import java.io.Reader;
 import java.io.Writer;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+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.util.FileUtils;
 
 /**
  * Converts text source files to local OS formatting conventions, as

src/main/org/apache/tools/ant/taskdefs/GUnzip.java

@@ -54,12 +54,11 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPInputStream;
+import org.apache.tools.ant.BuildException;
 
 /**
  * Expands a file that has been compressed with the GZIP

src/main/org/apache/tools/ant/taskdefs/GZip.java

@@ -54,11 +54,10 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-
-import java.io.IOException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.zip.GZIPOutputStream;
+import org.apache.tools.ant.BuildException;
 
 /**
  * Compresses a file with the GZIP algorithm. Normally used to compress

src/main/org/apache/tools/ant/taskdefs/GenerateKey.java

@@ -55,11 +55,10 @@ package org.apache.tools.ant.taskdefs;
 
 import java.util.Enumeration;
 import java.util.Vector;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.JavaEnvUtils;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.util.JavaEnvUtils;
 
 /**
  * Generates a key in a keystore.

src/main/org/apache/tools/ant/taskdefs/Get.java

@@ -56,15 +56,15 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.HttpURLConnection;
 import java.util.Date;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 

src/main/org/apache/tools/ant/taskdefs/Input.java

@@ -54,10 +54,8 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import  java.util.Vector;
-
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.input.InputRequest;
 import org.apache.tools.ant.input.MultipleChoiceInputRequest;

src/main/org/apache/tools/ant/taskdefs/JDBCTask.java

@@ -54,19 +54,18 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.Driver;
 import java.sql.SQLException;
 import java.util.Hashtable;
 import java.util.Properties;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
 
 /**
  * Handles JDBC configuration needed by SQL type tasks.

src/main/org/apache/tools/ant/taskdefs/Jar.java

@@ -54,25 +54,24 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.util.Enumeration;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.FileScanner;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.tools.zip.ZipOutputStream;
 
-import java.io.IOException;
-import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.FileReader;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-import java.io.ByteArrayInputStream;
-import java.io.OutputStreamWriter;
-import java.io.InputStreamReader;
-import java.util.Enumeration;
-
 
 /**
  * Creates a JAR archive.

src/main/org/apache/tools/ant/taskdefs/Java.java

@@ -54,22 +54,20 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ExitException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.types.Environment;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import java.util.Vector;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
 
 /**
  * Launcher for Java applications. Allows use of

src/main/org/apache/tools/ant/taskdefs/Javac.java

@@ -54,19 +54,18 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
+import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.GlobPatternMapper;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import org.apache.tools.ant.util.SourceFileScanner;
 import org.apache.tools.ant.util.facade.FacadeTaskHelper;
-import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
-import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory;
-
-import java.io.File;
 
 /**
  * Compiles Java source files. This task can take the following

src/main/org/apache/tools/ant/taskdefs/Javadoc.java

@@ -54,16 +54,16 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.PrintWriter;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.FilenameFilter;
-import java.net.URL;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.MalformedURLException;
-import java.util.Locale;
-import java.util.Vector;
+import java.net.URL;
 import java.util.Enumeration;
+import java.util.Locale;
 import java.util.StringTokenizer;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

src/main/org/apache/tools/ant/taskdefs/Jikes.java

@@ -54,13 +54,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.PrintWriter;
 import java.io.FileWriter;
 import java.io.IOException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
-
+import java.io.PrintWriter;
 import java.util.Random;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 
 /**
  * Encapsulates a Jikes compiler, by directly executing an external

src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java

@@ -53,14 +53,13 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-    
 import java.io.BufferedReader;
-import java.io.OutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 
 /**
  * Parses output from jikes and

src/main/org/apache/tools/ant/taskdefs/KeySubst.java

@@ -54,16 +54,16 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import java.io.File;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 /**
  * Keyword substitution. Input file is written to output file.

src/main/org/apache/tools/ant/taskdefs/LoadFile.java

@@ -53,19 +53,18 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.FilterChain;
-import org.apache.tools.ant.filters.util.ChainReaderHelper;
-
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.io.Reader;
-import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.filters.util.ChainReaderHelper;
+import org.apache.tools.ant.types.FilterChain;
 
 /**
  * Load a file into a property

src/main/org/apache/tools/ant/taskdefs/LoadProperties.java

@@ -53,21 +53,20 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.FilterChain;
-import org.apache.tools.ant.filters.util.ChainReaderHelper;
-
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.filters.util.ChainReaderHelper;
+import org.apache.tools.ant.types.FilterChain;
 
 /**
  * Load a file's contents as Ant properties.

src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java

@@ -54,12 +54,11 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.ByteArrayOutputStream;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 
 
 /**

src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java

@@ -54,11 +54,10 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.IOException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
-import java.io.IOException;
-
 /**
  * Logs standard output and error of a subprocess to the log system of ant.
  *

src/main/org/apache/tools/ant/taskdefs/Manifest.java

@@ -54,9 +54,6 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -65,7 +62,9 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.CollectionUtils;
 

src/main/org/apache/tools/ant/taskdefs/ManifestTask.java

@@ -54,16 +54,15 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
  * Creates a manifest file for inclusion in a JAR, Ant task wrapper

src/main/org/apache/tools/ant/taskdefs/MatchingTask.java

@@ -54,16 +54,30 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.StringTokenizer;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
-import org.apache.tools.ant.types.selectors.*;
-
-import java.io.File;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
+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.SizeSelector;
 
 /**
  * This is an abstract task that should be used by all those tasks that

src/main/org/apache/tools/ant/taskdefs/Mkdir.java

@@ -54,9 +54,9 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
 import java.io.File;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 
 /**
  * Creates a given directory.

src/main/org/apache/tools/ant/taskdefs/Move.java

@@ -54,15 +54,14 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FilterSetCollection;
-import org.apache.tools.ant.types.FilterSet;
-import org.apache.tools.ant.types.FileSet;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.FilterSet;
+import org.apache.tools.ant.types.FilterSetCollection;
 
 /**
  * Moves a file or directory to a new file or directory.

src/main/org/apache/tools/ant/taskdefs/Parallel.java

@@ -53,15 +53,14 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.TaskContainer;
+import java.util.Enumeration;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.TaskContainer;
 import org.apache.tools.ant.util.StringUtils;
 
-import java.util.Vector;
-import java.util.Enumeration;
-
 
 
 /**

src/main/org/apache/tools/ant/taskdefs/Patch.java

@@ -54,12 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
+import java.io.File;
+import java.io.IOException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
-import java.io.File;
-import java.io.IOException;
 
 /**
  * Patches a file by applying a 'diff' file to it; requires "patch" to be

src/main/org/apache/tools/ant/taskdefs/PathConvert.java

@@ -53,6 +53,9 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+import java.util.StringTokenizer;
+import java.util.Vector;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -64,10 +67,6 @@ import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.io.File;
-
 /**
  * Converts path and classpath information to a specific target OS
  * format. The resulting formatted path is placed into the specified property.

src/main/org/apache/tools/ant/taskdefs/Property.java

@@ -54,20 +54,20 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Enumeration;
 import java.util.Properties;
 import java.util.Vector;
-import java.util.Enumeration;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Reference;
 
 /**
  * Sets a property by name, or set of properties (from file or

src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java

@@ -54,8 +54,8 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 
 /**

src/main/org/apache/tools/ant/taskdefs/Recorder.java

@@ -53,18 +53,14 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-
-import org.apache.tools.ant.Task;
-
-import java.io.PrintStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-
+import java.io.PrintStream;
 import java.util.Hashtable;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
  * Adds a listener to the current build process that records the

src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java

@@ -53,14 +53,13 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import java.io.PrintStream;
+import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildLogger;
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.util.StringUtils;
 
-import java.io.PrintStream;
-
 /**
  * This is a class that represents a recorder. This is the listener to the
  * build process.

src/main/org/apache/tools/ant/taskdefs/Rename.java

@@ -54,11 +54,10 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
-
-import java.io.File;
+import org.apache.tools.ant.Task;
 
 /**
  * Renames a file.

src/main/org/apache/tools/ant/taskdefs/Replace.java

@@ -54,28 +54,27 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.StringUtils;
-
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Reader;
+import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.InputStreamReader;
-import java.io.Writer;
 import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.FileOutputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
+import java.io.Reader;
+import java.io.Writer;
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.StringUtils;
 
 /**
  * Replaces all occurrences of one or more string tokens with given

src/main/org/apache/tools/ant/taskdefs/Rmic.java

@@ -54,6 +54,10 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+import java.io.IOException;
+import java.rmi.Remote;
+import java.util.Vector;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -68,11 +72,6 @@ import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.SourceFileScanner;
 import org.apache.tools.ant.util.facade.FacadeTaskHelper;
 
-import java.io.File;
-import java.io.IOException;
-import java.rmi.Remote;
-import java.util.Vector;
-
 /**
  * Runs the rmic compiler against classes.</p>
  * <p>Rmic can be run on a single class (as specified with the classname

src/main/org/apache/tools/ant/taskdefs/SQLExec.java

@@ -54,33 +54,31 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.FileSet;
-
-import java.io.File;
-import java.io.PrintStream;
 import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
 import java.io.Reader;
-import java.io.BufferedReader;
 import java.io.StringReader;
-import java.io.FileReader;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
 import java.sql.Connection;
-import java.sql.Statement;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+import java.util.Enumeration;
+import java.util.StringTokenizer;
+import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.FileSet;
 
 /**
  * Executes a series of SQL statements on a database using JDBC.

src/main/org/apache/tools/ant/taskdefs/Sequential.java

@@ -53,12 +53,11 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import java.util.Enumeration;
+import java.util.Vector;
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.TaskContainer;
-import org.apache.tools.ant.BuildException;
-
-import java.util.Vector;
-import java.util.Enumeration;
 
 
 

src/main/org/apache/tools/ant/taskdefs/SignJar.java

@@ -59,10 +59,9 @@ import java.util.Enumeration;
 import java.util.Vector;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
-
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.util.JavaEnvUtils;
 

src/main/org/apache/tools/ant/taskdefs/Sleep.java

@@ -53,9 +53,9 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
 
 /**
  * Sleep, or pause, for a period of time.

src/main/org/apache/tools/ant/taskdefs/Tar.java

@@ -54,26 +54,26 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.IOException;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
-import java.io.FileInputStream;
-import java.io.BufferedOutputStream;
-import java.util.Vector;
 import java.util.Enumeration;
+import java.util.Vector;
+import java.util.zip.GZIPOutputStream;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.util.SourceFileScanner;
+import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.util.MergingMapper;
-import org.apache.tools.tar.TarOutputStream;
+import org.apache.tools.ant.util.SourceFileScanner;
+import org.apache.tools.bzip2.CBZip2OutputStream;
 import org.apache.tools.tar.TarConstants;
 import org.apache.tools.tar.TarEntry;
-import java.util.zip.GZIPOutputStream;
-import org.apache.tools.bzip2.CBZip2OutputStream;
+import org.apache.tools.tar.TarOutputStream;
 
 
 

src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java

@@ -54,9 +54,9 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.Task;
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import org.apache.tools.ant.Task;
 
 /**
  * Redirects text written to a stream thru the standard

src/main/org/apache/tools/ant/taskdefs/TempFile.java

@@ -54,8 +54,8 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.util.FileUtils;
 
 /**