organize imports

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

@@ -41,6 +41,8 @@ import java.util.jar.Attributes.Name;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+
+import org.apache.tools.ant.launch.Locator;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.CollectionUtils;
 import org.apache.tools.ant.util.FileUtils;
@@ -48,7 +50,6 @@ import org.apache.tools.ant.util.JavaEnvUtils;
 import org.apache.tools.ant.util.LoaderUtils;
 import org.apache.tools.ant.util.ReflectUtil;
 import org.apache.tools.ant.util.VectorSet;
-import org.apache.tools.ant.launch.Locator;
 import org.apache.tools.zip.ZipLong;
 
 /**

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

@@ -18,8 +18,8 @@
 
 package org.apache.tools.ant;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 
 
 /**

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

@@ -22,12 +22,12 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.StringReader;
-import java.util.Date;
 import java.text.DateFormat;
+import java.util.Date;
 
 import org.apache.tools.ant.util.DateUtils;
-import org.apache.tools.ant.util.StringUtils;
 import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.StringUtils;
 
 /**
  * Writes build events to a PrintStream. Currently, it

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

@@ -17,31 +17,32 @@
  */
 package org.apache.tools.ant;
 
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.JAXPUtils;
-import org.apache.tools.ant.util.ProxySetup;
-import org.apache.tools.ant.util.JavaEnvUtils;
-import org.apache.tools.ant.launch.Launcher;
-import org.xml.sax.XMLReader;
-
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.SAXParser;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
 import java.io.File;
-import java.io.FilenameFilter;
-import java.io.PrintStream;
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.URL;
+import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.Properties;
-import java.util.Calendar;
 import java.util.TimeZone;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+
+import org.apache.tools.ant.launch.Launcher;
+import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.JAXPUtils;
+import org.apache.tools.ant.util.JavaEnvUtils;
+import org.apache.tools.ant.util.ProxySetup;
+import org.xml.sax.XMLReader;
 
 /**
  * A little diagnostic helper that output some information that may help

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

@@ -23,17 +23,17 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import org.apache.tools.ant.taskdefs.PreSetDef;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.FileResource;
-import org.apache.tools.ant.taskdefs.PreSetDef;
 import org.apache.tools.ant.util.StringUtils;
 
 /**

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

@@ -19,6 +19,7 @@
 package org.apache.tools.ant;
 
 import java.io.Serializable;
+
 import org.apache.tools.ant.util.FileUtils;
 import org.xml.sax.Locator;
 

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

@@ -24,7 +24,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
-import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

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

@@ -20,6 +20,7 @@ package org.apache.tools.ant;
 import java.io.File;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
+
 import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**

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

@@ -17,29 +17,30 @@
  */
 package org.apache.tools.ant;
 
+import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
-import java.io.EOFException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.Stack;
 import java.util.Vector;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.WeakHashMap;
+
+import org.apache.tools.ant.helper.DefaultExecutor;
 import org.apache.tools.ant.input.DefaultInputHandler;
 import org.apache.tools.ant.input.InputHandler;
-import org.apache.tools.ant.helper.DefaultExecutor;
+import org.apache.tools.ant.types.Description;
 import org.apache.tools.ant.types.FilterSet;
 import org.apache.tools.ant.types.FilterSetCollection;
-import org.apache.tools.ant.types.Description;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceFactory;

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

@@ -28,10 +28,9 @@ import java.util.List;
 import java.util.Map.Entry;
 
 import org.apache.tools.ant.attribute.EnableAttribute;
-
-import org.apache.tools.ant.util.CollectionUtils;
 import org.apache.tools.ant.taskdefs.MacroDef.Attribute;
 import org.apache.tools.ant.taskdefs.MacroInstance;
+import org.apache.tools.ant.util.CollectionUtils;
 import org.xml.sax.AttributeList;
 import org.xml.sax.helpers.AttributeListImpl;
 

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

@@ -18,10 +18,10 @@
 
 package org.apache.tools.ant;
 
-import org.apache.tools.ant.dispatch.DispatchUtils;
-
-import java.util.Enumeration;
 import java.io.IOException;
+import java.util.Enumeration;
+
+import org.apache.tools.ant.dispatch.DispatchUtils;
 
 /**
  * Base class for all tasks.

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

@@ -19,8 +19,9 @@
 package org.apache.tools.ant;
 
 import java.lang.reflect.Method;
-import org.apache.tools.ant.dispatch.Dispatchable;
+
 import org.apache.tools.ant.dispatch.DispatchUtils;
+import org.apache.tools.ant.dispatch.Dispatchable;
 
 /**
  * Uses introspection to "adapt" an arbitrary Bean which doesn't

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

@@ -18,12 +18,13 @@
 
 package org.apache.tools.ant;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.io.IOException;
+
 import org.apache.tools.ant.taskdefs.PreSetDef;
 
 /**

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

@@ -23,9 +23,10 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.Writer;
+import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Stack;
-import java.util.Enumeration;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 

src/main/org/apache/tools/ant/dispatch/DispatchUtils.java

@@ -17,13 +17,13 @@
  */
 package org.apache.tools.ant.dispatch;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.UnknownElement;
-import org.apache.tools.ant.Task;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.UnknownElement;
+
 /**
  * Determines and Executes the action method for the task.
  */

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

@@ -21,6 +21,7 @@ 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

@@ -18,6 +18,7 @@
 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/ClassConstants.java

@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.Reader;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.ResourceUtils;
 

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

@@ -17,11 +17,12 @@
  */
 package org.apache.tools.ant.filters;
 
-import java.io.IOException;
-import java.io.Reader;
-import java.io.File;
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+
 import org.apache.tools.ant.types.Parameter;
 
 /**

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

@@ -19,6 +19,7 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.EnumeratedAttribute;

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

@@ -19,8 +19,9 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-import org.apache.tools.ant.util.LineTokenizer;
+
 import org.apache.tools.ant.types.Parameter;
+import org.apache.tools.ant.util.LineTokenizer;
 
 /**
  * Reads the first <code>n</code> lines of a stream.

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

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

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

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

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

@@ -19,6 +19,7 @@ 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

@@ -18,8 +18,8 @@
 package org.apache.tools.ant.filters;
 
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 import java.util.Enumeration;
 import java.util.Hashtable;

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

@@ -19,6 +19,7 @@ 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

@@ -20,6 +20,7 @@ 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/SuffixLines.java

@@ -19,6 +19,7 @@ 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/TabsToSpaces.java

@@ -19,6 +19,7 @@ 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

@@ -20,6 +20,7 @@ package org.apache.tools.ant.filters;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.LinkedList;
+
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.util.LineTokenizer;
 

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

@@ -19,15 +19,16 @@ package org.apache.tools.ant.filters;
 
 import java.io.IOException;
 import java.io.Reader;
-import java.util.Vector;
 import java.util.Enumeration;
+import java.util.Vector;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.types.RegularExpression;
 import org.apache.tools.ant.types.Substitution;
-import org.apache.tools.ant.util.Tokenizer;
 import org.apache.tools.ant.util.LineTokenizer;
 import org.apache.tools.ant.util.StringUtils;
+import org.apache.tools.ant.util.Tokenizer;
 import org.apache.tools.ant.util.regexp.Regexp;
 import org.apache.tools.ant.util.regexp.RegexpUtil;
 

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

@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
+
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

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

@@ -19,10 +19,10 @@ 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;
-import org.apache.bcel.classfile.JavaClass;
+
+import com.sun.org.apache.bcel.internal.classfile.ClassParser;
+import com.sun.org.apache.bcel.internal.classfile.ConstantValue;
+import com.sun.org.apache.bcel.internal.classfile.JavaClass;
 
 // CheckStyle:HideUtilityClassConstructorCheck OFF - bc
 /**

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

@@ -26,15 +26,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.RuntimeConfigurable;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.util.FileUtils;
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
 
 /**
  * Context information for the ant processing.

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

@@ -18,9 +18,9 @@
 
 package org.apache.tools.ant.helper;
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Executor;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Executor;
+import org.apache.tools.ant.Project;
 
 /**
  * Default Target executor implementation. Runs each target individually

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

@@ -17,6 +17,19 @@
  */
 package org.apache.tools.ant.helper;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Stack;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ExtensionPoint;
 import org.apache.tools.ant.Location;
@@ -41,19 +54,6 @@ import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Stack;
-
 /**
  * Sax2 based project reader
  *

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

@@ -23,6 +23,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Locale;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.IntrospectionHelper;
 import org.apache.tools.ant.Location;
@@ -31,8 +32,8 @@ 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.TypeAdapter;
 import org.apache.tools.ant.TaskContainer;
+import org.apache.tools.ant.TypeAdapter;
 import org.apache.tools.ant.UnknownElement;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JAXPUtils;

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

@@ -19,9 +19,9 @@
 package org.apache.tools.ant.helper;
 
 
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Executor;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Executor;
+import org.apache.tools.ant.Project;
 
 
 /**

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

@@ -22,6 +22,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.KeepAliveInputStream;
 

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

@@ -18,8 +18,9 @@
 
 package org.apache.tools.ant.input;
 
-import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.StreamPumper;
 import org.apache.tools.ant.util.FileUtils;

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

@@ -21,6 +21,7 @@ package org.apache.tools.ant.input;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
+
 import org.apache.tools.ant.BuildException;
 
 /**

src/main/org/apache/tools/ant/launch/Launcher.java

@@ -17,13 +17,13 @@
  */
 package org.apache.tools.ant.launch;
 
+import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.MalformedURLException;
-import java.io.File;
-import java.util.StringTokenizer;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
 
 
 

src/main/org/apache/tools/ant/launch/Locator.java

@@ -17,12 +17,12 @@
  */
 package org.apache.tools.ant.launch;
 
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
-import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 import java.util.Locale;

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

@@ -22,6 +22,7 @@ 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/BigProjectLogger.java

@@ -17,13 +17,13 @@
  */
 package org.apache.tools.ant.listener;
 
+import java.io.File;
+
 import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.SubBuildListener;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.SubBuildListener;
 import org.apache.tools.ant.util.StringUtils;
 
-import java.io.File;
-
 /**
  * This is a special logger that is designed to make it easier to work
  * with big projects, those that use imports and

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

@@ -18,18 +18,18 @@
 
 package org.apache.tools.ant.listener;
 
-import org.apache.commons.logging.Log;
+import java.io.PrintStream;
+
 import org.apache.commons.logging.LogConfigurationException;
 import org.apache.commons.logging.LogFactory;
-
+import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.BuildLogger;
-import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.UnknownElement;
 
-import java.io.PrintStream;
+import sun.rmi.runtime.Log;
 
 /**
  * Jakarta Commons Logging listener.

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

@@ -18,7 +18,6 @@
 
 package org.apache.tools.ant.listener;
 
-import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.NullEnumeration;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;

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

@@ -22,11 +22,11 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Vector;
 import java.util.Properties;
-import java.util.Enumeration;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildException;
@@ -34,8 +34,8 @@ import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.email.EmailAddress;
 import org.apache.tools.ant.taskdefs.email.Header;
-import org.apache.tools.ant.taskdefs.email.Message;
 import org.apache.tools.ant.taskdefs.email.Mailer;
+import org.apache.tools.ant.taskdefs.email.Message;
 import org.apache.tools.ant.util.ClasspathUtils;
 import org.apache.tools.ant.util.DateUtils;
 import org.apache.tools.ant.util.FileUtils;

src/main/org/apache/tools/ant/loader/AntClassLoader5.java

@@ -18,10 +18,10 @@
 
 package org.apache.tools.ant.loader;
 
-import java.util.Enumeration;
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Enumeration;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.Project;

src/main/org/apache/tools/ant/property/LocalProperties.java

@@ -17,9 +17,9 @@
  */
 package org.apache.tools.ant.property;
 
-import org.apache.tools.ant.PropertyHelper;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.MagicNames;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.PropertyHelper;
 
 /**
  * Thread local class containing local properties.

src/main/org/apache/tools/ant/property/ParseProperties.java

@@ -19,6 +19,7 @@ package org.apache.tools.ant.property;
 
 import java.text.ParsePosition;
 import java.util.Collection;
+
 import org.apache.tools.ant.Project;
 
 /**

src/main/org/apache/tools/ant/property/PropertyExpander.java

@@ -17,10 +17,10 @@
  */
 package org.apache.tools.ant.property;
 
-import org.apache.tools.ant.PropertyHelper;
-
 import java.text.ParsePosition;
 
+import org.apache.tools.ant.PropertyHelper;
+
 /**
  * Responsible for locating a property reference inside a String.
  * @since Ant 1.8.0

src/main/org/apache/tools/ant/property/ResolvePropertyMap.java

@@ -17,13 +17,13 @@
  */
 package org.apache.tools.ant.property;
 
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
-import java.util.Collection;
 
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 
 /**
  * Class to resolve properties in a map. This class is explicitly not threadsafe.

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

@@ -27,13 +27,14 @@ import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 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.types.Commandline;
 import org.apache.tools.ant.types.Environment;
-import org.apache.tools.ant.util.StringUtils;
 import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.StringUtils;
 
 /**
  * original Cvs.java 1.20

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

@@ -28,6 +28,7 @@ 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.Project;

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

@@ -17,16 +17,16 @@
  */
 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.Project;
 import org.apache.tools.ant.taskdefs.compilers.AptExternalCompilerAdapter;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.JavaEnvUtils;
 
-import java.util.Vector;
-import java.io.File;
-
 /**
  * Apt Task for running the Annotation processing tool for JDK 1.5.  It derives
  * from the existing Javac task, and forces the compiler based on whether we're

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

@@ -18,9 +18,9 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.ComponentHelper;
 import org.apache.tools.ant.AntTypeDefinition;
+import org.apache.tools.ant.ComponentHelper;
+import org.apache.tools.ant.ProjectHelper;
 import org.apache.tools.ant.attribute.AttributeNamespace;
 
 /**

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

@@ -19,6 +19,7 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

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

@@ -23,6 +23,7 @@ import java.io.BufferedInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.bzip2.CBZip2InputStream;

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

@@ -22,6 +22,7 @@ package org.apache.tools.ant.taskdefs;
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.bzip2.CBZip2OutputStream;

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

@@ -19,6 +19,7 @@
 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/BuildNumber.java

@@ -22,9 +22,10 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
+
 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;
 
 /**

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

@@ -24,6 +24,7 @@ import java.io.File;
 import java.io.FileReader;
 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;

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

@@ -20,8 +20,8 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.IOException;
 
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.PropertySet;
 
 /**

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

@@ -17,23 +17,23 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import java.security.DigestInputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.BufferedReader;
 import java.io.IOException;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.text.MessageFormat;
+import java.text.ParseException;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Hashtable;
-import java.util.Arrays;
-import java.text.MessageFormat;
-import java.text.ParseException;
+import java.util.Map;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -43,8 +43,8 @@ import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.resources.FileProvider;
-import org.apache.tools.ant.types.resources.Union;
 import org.apache.tools.ant.types.resources.Restrict;
+import org.apache.tools.ant.types.resources.Union;
 import org.apache.tools.ant.types.resources.selectors.Type;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.StringUtils;

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

@@ -20,6 +20,7 @@ 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/Classloader.java

@@ -18,15 +18,15 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.MagicNames;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.MagicNames;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.types.Path;
-
-import java.io.File;
+import org.apache.tools.ant.types.Reference;
 
 /**
  * EXPERIMENTAL

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

@@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.IOException;
 import java.net.URL;
+
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;

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

@@ -17,40 +17,40 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.Reader;
-import java.io.Writer;
+import java.io.FileInputStream;
 import java.io.FileReader;
-import java.io.InputStream;
 import java.io.IOException;
-import java.io.StringReader;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Vector;
 
-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.ProjectComponent;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.filters.util.ChainReaderHelper;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.FileList;
+import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.FilterChain;
+import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.Intersect;
 import org.apache.tools.ant.types.resources.LogOutputResource;
-import org.apache.tools.ant.types.resources.Restrict;
 import org.apache.tools.ant.types.resources.Resources;
+import org.apache.tools.ant.types.resources.Restrict;
 import org.apache.tools.ant.types.resources.StringResource;
-import org.apache.tools.ant.types.resources.selectors.Not;
 import org.apache.tools.ant.types.resources.selectors.Exists;
+import org.apache.tools.ant.types.resources.selectors.Not;
 import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
 import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.apache.tools.ant.util.ConcatResourceInputStream;

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

@@ -27,27 +27,28 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.types.Mapper;
+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.FilterSet;
 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.types.Mapper;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.ResourceFactory;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.FileResource;
-import org.apache.tools.ant.util.FileUtils;
 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.LinkedHashtable;
 import org.apache.tools.ant.util.ResourceUtils;
 import org.apache.tools.ant.util.SourceFileScanner;
-import org.apache.tools.ant.util.FlatFileNameMapper;
 
 /**
  * <p>Copies a file or directory to a new file

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

@@ -18,16 +18,16 @@
 
 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.Task;
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
-
-import java.io.File;
-import java.io.IOException;
+import org.apache.tools.ant.util.FileNameMapper;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Copy the contents of a path to a destination, using the mapper of choice

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

@@ -20,6 +20,7 @@ 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.Task;

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

@@ -18,10 +18,10 @@
 
 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.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
 import org.apache.tools.ant.util.StringUtils;
 
 /**

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

@@ -30,14 +30,14 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.tools.ant.AntTypeDefinition;
-import org.apache.tools.ant.ComponentHelper;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.ComponentHelper;
 import org.apache.tools.ant.Location;
+import org.apache.tools.ant.MagicNames;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.MagicNames;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Base class for Taskdef and Typedef - handles all

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

@@ -20,44 +20,44 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.util.Arrays;
-import java.util.Vector;
-import java.util.Iterator;
 import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Vector;
 
-import org.apache.tools.ant.Project;
 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.PatternSet;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.resources.FileProvider;
-import org.apache.tools.ant.types.resources.Sort;
-import org.apache.tools.ant.types.resources.Restrict;
-import org.apache.tools.ant.types.resources.Resources;
 import org.apache.tools.ant.types.resources.FileResourceIterator;
-import org.apache.tools.ant.types.resources.comparators.Reverse;
+import org.apache.tools.ant.types.resources.Resources;
+import org.apache.tools.ant.types.resources.Restrict;
+import org.apache.tools.ant.types.resources.Sort;
 import org.apache.tools.ant.types.resources.comparators.FileSystem;
 import org.apache.tools.ant.types.resources.comparators.ResourceComparator;
+import org.apache.tools.ant.types.resources.comparators.Reverse;
 import org.apache.tools.ant.types.resources.selectors.Exists;
 import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
-import org.apache.tools.ant.types.selectors.OrSelector;
 import org.apache.tools.ant.types.selectors.AndSelector;
-import org.apache.tools.ant.types.selectors.NotSelector;
+import org.apache.tools.ant.types.selectors.ContainsRegexpSelector;
+import org.apache.tools.ant.types.selectors.ContainsSelector;
 import org.apache.tools.ant.types.selectors.DateSelector;
-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.DepthSelector;
 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.FileSelector;
 import org.apache.tools.ant.types.selectors.FilenameSelector;
 import org.apache.tools.ant.types.selectors.MajoritySelector;
-import org.apache.tools.ant.types.selectors.ContainsRegexpSelector;
+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.modifiedselector.ModifiedSelector;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.SymbolicLinkUtils;

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

@@ -20,6 +20,7 @@ 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.Task;
 

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

@@ -21,22 +21,23 @@ package org.apache.tools.ant.taskdefs;
 import java.io.File;
 import java.util.Date;
 import java.util.Iterator;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.FileList;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.TimeComparison;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.resources.Union;
-import org.apache.tools.ant.types.resources.Restrict;
+import org.apache.tools.ant.types.TimeComparison;
 import org.apache.tools.ant.types.resources.Resources;
-import org.apache.tools.ant.types.resources.selectors.Not;
+import org.apache.tools.ant.types.resources.Restrict;
+import org.apache.tools.ant.types.resources.Union;
+import org.apache.tools.ant.types.resources.comparators.ResourceComparator;
+import org.apache.tools.ant.types.resources.comparators.Reverse;
 import org.apache.tools.ant.types.resources.selectors.Exists;
+import org.apache.tools.ant.types.resources.selectors.Not;
 import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
-import org.apache.tools.ant.types.resources.comparators.Reverse;
-import org.apache.tools.ant.types.resources.comparators.ResourceComparator;
 
 /**
  * Examines and removes out of date target files.  If any of the target files

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

@@ -19,6 +19,7 @@
 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/Echo.java

@@ -24,14 +24,14 @@ 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.util.ResourceUtils;
-import org.apache.tools.ant.util.StringUtils;
 import org.apache.tools.ant.types.LogLevel;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.LogOutputResource;
 import org.apache.tools.ant.types.resources.StringResource;
+import org.apache.tools.ant.util.ResourceUtils;
+import org.apache.tools.ant.util.StringUtils;
 
 /**
  * Writes a message to the Ant logging facilities.

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

@@ -18,18 +18,17 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.OutputStream;
 import java.io.FileOutputStream;
+import java.io.OutputStream;
 
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.util.XMLFragment;
 import org.apache.tools.ant.util.DOMElementWriter;
 import org.apache.tools.ant.util.FileUtils;
-
-import org.w3c.dom.Node;
+import org.apache.tools.ant.util.XMLFragment;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 /**
  * Echo XML.

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

@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Map;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

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

@@ -24,6 +24,7 @@ import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

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

@@ -22,11 +22,12 @@ import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
 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.Commandline;
 import org.apache.tools.ant.types.AbstractFileSet;
+import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.DirSet;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileList;

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

@@ -18,11 +18,11 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.ExitStatusException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.PropertyHelper;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ExitStatusException;
 import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.apache.tools.ant.taskdefs.condition.ConditionBase;
 

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

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

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

@@ -18,23 +18,24 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.Reader;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
 import java.io.InputStreamReader;
-import java.util.Vector;
+import java.io.Reader;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
-import org.apache.tools.ant.Project;
+import java.util.Vector;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.filters.FixCrLfFilter;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.filters.ChainableReader;
-import org.apache.tools.ant.types.FilterChain;
+import org.apache.tools.ant.filters.FixCrLfFilter;
 import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.util.FileUtils;
 
 /**

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

@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
 

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

@@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPOutputStream;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
 

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

@@ -19,6 +19,7 @@ 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.types.Commandline;

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

@@ -18,9 +18,14 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Vector;
+
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
 import org.apache.tools.ant.ProjectHelperRepository;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Resource;
@@ -32,11 +37,6 @@ import org.apache.tools.ant.types.resources.URLResource;
 import org.apache.tools.ant.types.resources.Union;
 import org.apache.tools.ant.util.FileUtils;
 
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Vector;
-
 /**
  * Task to import another build file into the current project.
  * <p>

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

@@ -23,21 +23,22 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Vector;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ExitException;
+import org.apache.tools.ant.ExitStatusException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.ExitStatusException;
+import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.types.Assertions;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Environment;
 import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PropertySet;
-import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.types.Assertions;
 import org.apache.tools.ant.types.Permissions;
+import org.apache.tools.ant.types.PropertySet;
 import org.apache.tools.ant.types.RedirectorElement;
-import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.util.KeepAliveInputStream;
 
 /**

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

@@ -22,6 +22,7 @@ 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;
 

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

@@ -26,6 +26,7 @@ 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;
 import org.apache.tools.ant.util.FileUtils;

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

@@ -19,20 +19,20 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.PrintStream;
 import java.io.OutputStream;
+import java.io.PrintStream;
 
-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;
 import org.apache.tools.ant.taskdefs.condition.Condition;
+import org.apache.tools.ant.types.Comparison;
+import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.Comparison;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.resources.Resources;
 import org.apache.tools.ant.types.resources.FileResource;
+import org.apache.tools.ant.types.resources.Resources;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.PropertyOutputStream;
 

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

@@ -18,6 +18,7 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+
 import org.apache.tools.ant.types.resources.FileResource;
 
 

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

@@ -25,15 +25,16 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 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.Task;
 import org.apache.tools.ant.filters.util.ChainReaderHelper;
+import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.JavaResource;
 import org.apache.tools.ant.util.FileUtils;

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

@@ -23,6 +23,7 @@ import java.io.InputStream;
 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;

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

@@ -19,6 +19,7 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.IOException;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Task;

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

@@ -19,10 +19,10 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Locale;
-import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.tools.ant.AntTypeDefinition;
 import org.apache.tools.ant.BuildException;

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

@@ -19,16 +19,16 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Enumeration;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DynamicAttribute;