diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index c6589bd14..2213e7c24 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/BuildException.java b/src/main/org/apache/tools/ant/BuildException.java index ca7902fb5..08073e1c3 100644 --- a/src/main/org/apache/tools/ant/BuildException.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java index 429fd3dbc..6b2f6370c 100644 --- a/src/main/org/apache/tools/ant/DefaultLogger.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java index 35e926467..7da083b09 100644 --- a/src/main/org/apache/tools/ant/DemuxOutputStream.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java index 3a164684c..a4d32ccbc 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index f461bc20b..16baf90cc 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index 3e62537f0..a4dec726f 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 66938daf3..dbd46dab1 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/PathTokenizer.java b/src/main/org/apache/tools/ant/PathTokenizer.java index e3892f180..dcc7dae0b 100644 --- a/src/main/org/apache/tools/ant/PathTokenizer.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index ae0a9264b..aa5e6f7a3 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index f1b7e5552..cce8f2fd6 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java index 95672ad79..a30608ceb 100644 --- a/src/main/org/apache/tools/ant/Target.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java index cf0cccbf3..c0d6f28aa 100644 --- a/src/main/org/apache/tools/ant/XmlLogger.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java index a5438b251..66bda6a9e 100644 --- a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java index 833fe052a..861a3ed9c 100644 --- a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/filters/ExpandProperties.java b/src/main/org/apache/tools/ant/filters/ExpandProperties.java index 8f0a7867d..ca4c1ef80 100644 --- a/src/main/org/apache/tools/ant/filters/ExpandProperties.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java b/src/main/org/apache/tools/ant/filters/HeadFilter.java index 25e9044c9..7957d190a 100644 --- a/src/main/org/apache/tools/ant/filters/HeadFilter.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java index d27ce3ed2..994833dce 100644 --- a/src/main/org/apache/tools/ant/filters/LineContains.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java index 222beca7f..6999c7ae3 100644 --- a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/filters/PrefixLines.java b/src/main/org/apache/tools/ant/filters/PrefixLines.java index 1886f5af0..d3c4d9499 100644 --- a/src/main/org/apache/tools/ant/filters/PrefixLines.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java index bd0f8b4b5..515f59db7 100644 --- a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/StripLineBreaks.java b/src/main/org/apache/tools/ant/filters/StripLineBreaks.java index 0b1be719c..f20f6a89e 100644 --- a/src/main/org/apache/tools/ant/filters/StripLineBreaks.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/StripLineComments.java b/src/main/org/apache/tools/ant/filters/StripLineComments.java index 7a48a89b7..726f74f17 100644 --- a/src/main/org/apache/tools/ant/filters/StripLineComments.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java index efcfc1e7e..c70fffef3 100644 --- a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/TailFilter.java b/src/main/org/apache/tools/ant/filters/TailFilter.java index cabef1c63..620afdadc 100644 --- a/src/main/org/apache/tools/ant/filters/TailFilter.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java index cc48a30c0..34e66a94a 100644 --- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java +++ b/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. * diff --git a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java b/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java index 9b17f37c7..2ae18aeb2 100644 --- a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java index afe43ef55..9bd909c58 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java index 679e3574f..66697a4bd 100644 --- a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java index b58c456a6..ba35334fd 100644 --- a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java index 3ce0276f5..1b258ac0e 100644 --- a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java index b6f8eec30..9db3f5242 100644 --- a/src/main/org/apache/tools/ant/listener/MailLogger.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index e3cccdd02..402737901 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 80a120ef9..8f2866906 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/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. * diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java index bec39f1ab..96da3cbf1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java b/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java index b133f1e24..3b8c5e52f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java index d598908e4..ffc2ebcf7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java index 8c294991b..ac61ead2b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 755627f78..b9e17d011 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java index 870a3de84..72e4f3957 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Chmod.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index a33400419..e56eefe86 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index ea7225142..525c9bb77 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Copydir.java b/src/main/org/apache/tools/ant/taskdefs/Copydir.java index dbfe410f6..e0117df88 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copydir.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Copyfile.java b/src/main/org/apache/tools/ant/taskdefs/Copyfile.java index 39aa53791..42aef7aa2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copyfile.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java index c5b8aa023..ea129c83d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Definer.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index c11490ef9..b2fa6bedf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Deltree.java b/src/main/org/apache/tools/ant/taskdefs/Deltree.java index c0efe6a9b..fd30f30c9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Deltree.java +++ b/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; /** * diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 813716b29..d57f4a3c2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Dirname.java b/src/main/org/apache/tools/ant/taskdefs/Dirname.java index 2e176d7f3..3fa3dac82 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Dirname.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Ear.java b/src/main/org/apache/tools/ant/taskdefs/Ear.java index 543a4b61c..95e79f260 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ear.java +++ b/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 * diff --git a/src/main/org/apache/tools/ant/taskdefs/Echo.java b/src/main/org/apache/tools/ant/taskdefs/Echo.java index a51eea773..14d32248b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Echo.java +++ b/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. * diff --git a/src/main/org/apache/tools/ant/taskdefs/Exec.java b/src/main/org/apache/tools/ant/taskdefs/Exec.java index 8c6dc59de..85c0175c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exec.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java index 0cbe97056..404bc35ab 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java +++ b/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. * diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index 12cf8b968..8359cc07d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java index 6be3ba0e9..b67d53518 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index d26a92270..3cbb5c7e2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/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. * diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java index 55af62322..84f51efc2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 0a4f1e88a..f1047b9e5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index e1010569e..b84c07a16 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Filter.java b/src/main/org/apache/tools/ant/taskdefs/Filter.java index 2cd05a9a9..44cc00350 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Filter.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java index 832f9c187..4b66dcf25 100644 --- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java index e94bfd18b..0b611a5a7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/GZip.java b/src/main/org/apache/tools/ant/taskdefs/GZip.java index 6c9c59890..ee608987e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GZip.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java index d63475965..880c8516a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index aa751a310..8ee98307e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java index c9e51df95..9c5072344 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Input.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java b/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java index 7919f74f1..e0fda1a92 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 8d2aca62c..04aadd4fb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index e91e5a87b..675eb6dd7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index abeb1efde..dcfda7026 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 57028ba96..1300b9f4b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java index 6cc322132..4fc103387 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java index f80c04ddf..7986da044 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java index 85aa3116b..df6c26d73 100644 --- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java index e8f32bef1..67d0c0f46 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java index 1da0813cd..9d71476e4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java index f450eefa6..c0e903e1f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java index a46dde898..118312653 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java +++ b/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. * diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index a2eb2a10d..97731c722 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java index e4b6badf6..7ca721afa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java index 6b232875d..2c843df7f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java index 7d0f51f88..eb4ecf089 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java index 6fe0c6f6c..ad5dbead5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Move.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java index 116147794..cb5b30d06 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java +++ b/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; - /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Patch.java b/src/main/org/apache/tools/ant/taskdefs/Patch.java index 812608738..03939735c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Patch.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index 9d05f9613..741007385 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java index 1e2b4b75d..8d2083d45 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java index 4e219e83b..9a6652277 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java index 27858f064..334d34ef3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java index a046a45d5..83eea7c21 100644 --- a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Rename.java b/src/main/org/apache/tools/ant/taskdefs/Rename.java index d873ecb72..730e76dee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rename.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 6c99d33aa..b5a824bdd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 8c5165ce7..385277773 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/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.

*

Rmic can be run on a single class (as specified with the classname diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index 0c5d32101..1525d3e18 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Sequential.java b/src/main/org/apache/tools/ant/taskdefs/Sequential.java index 29a58f1db..dffd8144a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sequential.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java index 58d4c3a45..938c69a85 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Sleep.java b/src/main/org/apache/tools/ant/taskdefs/Sleep.java index 3a59e5429..06888821c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sleep.java +++ b/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. diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java index 118852483..cc6f462c0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/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; diff --git a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java index 742989c34..e9bb2779c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java +++ b/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 diff --git a/src/main/org/apache/tools/ant/taskdefs/TempFile.java b/src/main/org/apache/tools/ant/taskdefs/TempFile.java index a39b6b998..751f37b6f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TempFile.java +++ b/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; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java index 65b338218..5f309a7ce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -54,20 +54,19 @@ 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.DirectoryScanner; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.JavaEnvUtils; - import java.io.File; import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; import java.util.Locale; 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.Task; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.JavaEnvUtils; /** * Touch a file and/or fileset(s); corresponds to the Unix touch command. diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index 87a968302..9ad75e595 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -54,12 +54,7 @@ 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.Location; -import org.apache.tools.ant.types.EnumeratedAttribute; - +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.Enumeration; @@ -69,7 +64,11 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.TimeZone; import java.util.Vector; -import java.text.SimpleDateFormat; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Location; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.EnumeratedAttribute; /** * Sets properties to the current time, or offsets from the current time. diff --git a/src/main/org/apache/tools/ant/taskdefs/Untar.java b/src/main/org/apache/tools/ant/taskdefs/Untar.java index 663172051..aee4f62da 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Untar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Untar.java @@ -54,19 +54,19 @@ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.tar.TarInputStream; -import org.apache.tools.tar.TarEntry; -import org.apache.tools.ant.util.FileUtils; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.BufferedInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.util.zip.GZIPInputStream; -import org.apache.tools.bzip2.CBZip2InputStream; +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.FileUtils; +import org.apache.tools.bzip2.CBZip2InputStream; +import org.apache.tools.tar.TarEntry; +import org.apache.tools.tar.TarInputStream; diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 615303d06..173a03860 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -54,20 +54,19 @@ package org.apache.tools.ant.taskdefs; +import java.io.File; +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.Task; import org.apache.tools.ant.taskdefs.condition.Condition; -import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.util.SourceFileScanner; +import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.MergingMapper; -import java.io.File; -import java.util.Enumeration; - -import java.util.Vector; +import org.apache.tools.ant.util.SourceFileScanner; /** * Sets the given property if the specified target has a timestamp diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java index 67033fb6a..e6a9c9105 100644 --- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java @@ -54,13 +54,12 @@ package org.apache.tools.ant.taskdefs; +import java.util.Hashtable; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.condition.ConditionBase; import org.apache.tools.ant.taskdefs.condition.Condition; +import org.apache.tools.ant.taskdefs.condition.ConditionBase; import org.apache.tools.ant.types.EnumeratedAttribute; -import java.util.Hashtable; - /** * Wait for an external event to occur. * diff --git a/src/main/org/apache/tools/ant/taskdefs/War.java b/src/main/org/apache/tools/ant/taskdefs/War.java index 1eb3a358b..5071780d8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/War.java +++ b/src/main/org/apache/tools/ant/taskdefs/War.java @@ -54,14 +54,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; - /** * An extension of <jar> to create a WAR archive. diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index b43b0f7d3..d01037bc0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -57,16 +57,16 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.Enumeration; import java.util.Vector; +import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.DynamicConfigurator; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.optional.TraXLiaison; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.types.XMLCatalog; +import org.apache.tools.ant.util.FileUtils; /** * Processes a set of XML documents via XSLT. This is diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java index 1d43a3b71..aa2af432c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java +++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java @@ -54,6 +54,13 @@ package org.apache.tools.ant.taskdefs; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.w3c.dom.Element; @@ -61,14 +68,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; - /** * Loads property values from a valid XML file, * generating the property names from the file's element and attribute names. diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index a82284199..ba8934fd1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -53,35 +53,34 @@ */ package org.apache.tools.ant.taskdefs; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FileOutputStream; -import java.io.FileInputStream; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; import java.util.Enumeration; import java.util.Hashtable; import java.util.Stack; import java.util.Vector; import java.util.zip.CRC32; import java.util.zip.ZipInputStream; - import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.FileScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.PatternSet; import org.apache.tools.ant.types.ZipFileSet; import org.apache.tools.ant.types.ZipScanner; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.SourceFileScanner; import org.apache.tools.ant.util.MergingMapper; -import org.apache.tools.zip.ZipOutputStream; +import org.apache.tools.ant.util.SourceFileScanner; import org.apache.tools.zip.ZipEntry; +import org.apache.tools.zip.ZipOutputStream; /** * Create a Zip file. diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java index 35c45a10d..06781ce22 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java @@ -55,8 +55,8 @@ package org.apache.tools.ant.taskdefs.compilers; 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.JavaEnvUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 8c0a29a23..bb249cde3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -54,22 +54,21 @@ package org.apache.tools.ant.taskdefs.compilers; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.Execute; +import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.LogStreamHandler; -import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.JavaEnvUtils; -import java.io.File; -import java.io.PrintWriter; -import java.io.FileWriter; -import java.io.IOException; - /** * This is the default implementation for the CompilerAdapter interface. * Currently, this is a cut-and-paste of the original javac task. diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java index d124ecdc8..4ddb95cce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java @@ -54,16 +54,15 @@ package org.apache.tools.ant.taskdefs.compilers; +import java.io.IOException; +import java.io.OutputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.types.Commandline; -import java.io.OutputStream; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - /** * The implementation of the javac compiler for JDK 1.2 * This is primarily a cut-and-paste from the original javac task before it diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java index 6202ac9e8..94433071d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java @@ -54,13 +54,11 @@ package org.apache.tools.ant.taskdefs.compilers; +import java.lang.reflect.Method; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; - import org.apache.tools.ant.types.Commandline; -import java.lang.reflect.Method; - /** * The implementation of the javac compiler for JDK 1.3 diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java index 173887174..b49641fbd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -56,8 +56,8 @@ package org.apache.tools.ant.taskdefs.compilers; 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.Commandline; +import org.apache.tools.ant.types.Path; /** * The implementation of the jikes compiler. diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java index f047f605c..d590990c9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java @@ -56,8 +56,8 @@ package org.apache.tools.ant.taskdefs.compilers; 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.Commandline; +import org.apache.tools.ant.types.Path; /** * The implementation of the jvc compiler from microsoft. diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java index 4f5ab394e..b035521f4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java @@ -54,16 +54,12 @@ package org.apache.tools.ant.taskdefs.compilers; +import java.lang.reflect.Method; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; - import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; - - -import java.lang.reflect.Method; - /** * The implementation of the Java compiler for KJC. * This is primarily a cut-and-paste from Jikes.java and diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/And.java b/src/main/org/apache/tools/ant/taskdefs/condition/And.java index 82a67f94a..8f98e1e08 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/And.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/And.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.condition; import java.util.Enumeration; - import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java index 79c51b062..1b2a978e7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java @@ -56,8 +56,6 @@ package org.apache.tools.ant.taskdefs.condition; import java.util.Enumeration; import java.util.Vector; - - import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.taskdefs.Available; import org.apache.tools.ant.taskdefs.Checksum; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java b/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java index 18a89ab5f..322ec0e80 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java @@ -53,10 +53,10 @@ */ package org.apache.tools.ant.taskdefs.condition; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.FileUtils; import java.io.File; import java.io.IOException; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.FileUtils; /** * Compares two files for bitwise equality based on size and diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java index 5c63f9965..122d20de3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java @@ -54,16 +54,14 @@ package org.apache.tools.ant.taskdefs.condition; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; - -import java.net.MalformedURLException; -import java.net.HttpURLConnection; -import java.net.URLConnection; -import java.net.URL; - /** * Condition to wait for a HTTP request to succeed. Its attribute(s) are: * url - the URL of the request. diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java index 3e312d0c5..aab8ca4ee 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.condition; import java.util.Enumeration; - import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java index 635c8859a..2e9aee499 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -54,9 +54,8 @@ package org.apache.tools.ant.taskdefs.condition; -import org.apache.tools.ant.BuildException; - import java.util.Locale; +import org.apache.tools.ant.BuildException; /** * Condition that tests the OS type. diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java b/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java index ed04d6590..27c658c54 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java @@ -54,12 +54,11 @@ package org.apache.tools.ant.taskdefs.condition; +import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; -import java.io.IOException; - /** * Condition to wait for a TCP/IP socket to have a listener. Its attribute(s) are: * server - the name of the server. diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java index 3c8d63cbd..140d41d73 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java @@ -53,8 +53,8 @@ */ package org.apache.tools.ant.taskdefs.cvslib; -import java.util.Vector; import java.util.Date; +import java.util.Vector; /** * CVS Entry. diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java index 292fd036d..dd9d2c9a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java @@ -66,9 +66,9 @@ 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.Task; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.FileSet; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java index 158c56916..4956ec73d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java @@ -53,12 +53,6 @@ */ package org.apache.tools.ant.taskdefs.cvslib; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.Cvs; -import org.apache.tools.ant.util.FileUtils; - import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -68,6 +62,11 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; 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.Cvs; +import org.apache.tools.ant.util.FileUtils; /** * Examines the output of cvs rdiff between two tags. diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java index 26acf9112..78939c8c0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java @@ -53,10 +53,10 @@ */ package org.apache.tools.ant.taskdefs.cvslib; -import java.io.IOException; import java.io.ByteArrayOutputStream; -import org.apache.tools.ant.taskdefs.PumpStreamHandler; +import java.io.IOException; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.PumpStreamHandler; /** * A dummy stream handler that just passes stuff to the parser. diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java index 0bc3dc8ce..967705b9f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/Message.java @@ -53,13 +53,12 @@ */ package org.apache.tools.ant.taskdefs.email; -import org.apache.tools.ant.ProjectComponent; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.PrintStream; +import org.apache.tools.ant.ProjectComponent; /** * Class representing an email message. diff --git a/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java index 02dc2a34a..d42360d64 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java @@ -59,7 +59,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.PrintStream; import java.util.Enumeration; - import org.apache.tools.ant.BuildException; import org.apache.tools.mail.MailMessage; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 2812635e7..54168fbbc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -59,7 +59,6 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; import java.net.URL; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index 11ca0de2a..d7bb2166c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -61,12 +61,11 @@ import java.io.OutputStream; import java.io.PrintWriter; 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.taskdefs.Execute; import org.apache.tools.ant.taskdefs.ExecTask; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.StreamPumper; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java index db125e6b9..4bdab888d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java @@ -53,23 +53,6 @@ */ package org.apache.tools.ant.taskdefs.optional; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.DOMElementWriter; -import org.apache.tools.ant.util.CollectionUtils; -import org.apache.tools.ant.types.EnumeratedAttribute; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import java.util.Enumeration; -import java.util.Hashtable; - -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Properties; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -79,9 +62,19 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; - +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +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 org.apache.tools.ant.util.CollectionUtils; +import org.apache.tools.ant.util.DOMElementWriter; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * Displays all the current properties in the build. The output can be sent to diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java index 327d4e507..630c86d53 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -72,7 +72,6 @@ import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.Mkdir; import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter; - import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index ac23d05ac..030ed432e 100755 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java @@ -54,22 +54,18 @@ package org.apache.tools.ant.taskdefs.optional; +import java.io.File; +import java.util.Enumeration; +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; - +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.types.Commandline; - import org.apache.tools.ant.util.JavaEnvUtils; -import java.io.File; -import java.util.Vector; -import java.util.StringTokenizer; -import java.util.Enumeration; - /** * Generates JNI header files using javah. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java index 26aaa05db..801e7429b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -54,6 +54,7 @@ package org.apache.tools.ant.taskdefs.optional; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -64,8 +65,6 @@ import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.IdentityMapper; import org.apache.tools.ant.util.SourceFileScanner; -import java.io.File; - /** * Converts files from native encodings to ASCII. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index d6a96a484..f1cb2c957 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -53,18 +53,17 @@ */ package org.apache.tools.ant.taskdefs.optional; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.StringWriter; import java.io.PrintWriter; import java.io.StringReader; -import java.io.BufferedReader; - -import java.util.Vector; -import java.util.Hashtable; +import java.io.StringWriter; import java.util.Enumeration; +import java.util.Hashtable; import java.util.Properties; import java.util.StringTokenizer; +import java.util.Vector; import netrexx.lang.Rexx; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java index bdb014e1e..6ee94ef61 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java @@ -54,28 +54,28 @@ package org.apache.tools.ant.taskdefs.optional; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.EnumeratedAttribute; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.BufferedInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.io.BufferedOutputStream; import java.io.OutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Properties; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Date; -import java.util.Calendar; -import java.util.Hashtable; import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.text.ParseException; import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +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.types.EnumeratedAttribute; /** *Modifies settings in a property file. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java b/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java index 593971701..5b73ff249 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java @@ -65,7 +65,6 @@ package org.apache.tools.ant.taskdefs.optional; import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.MatchingTask; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java index a02cfc940..0bd67b380 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java @@ -53,15 +53,6 @@ */ package org.apache.tools.ant.taskdefs.optional; -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.regexp.Regexp; -import org.apache.tools.ant.types.RegularExpression; -import org.apache.tools.ant.types.Substitution; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.util.FileUtils; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -70,8 +61,16 @@ import java.io.FileWriter; import java.io.IOException; import java.io.LineNumberReader; import java.io.PrintWriter; - 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.Task; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.RegularExpression; +import org.apache.tools.ant.types.Substitution; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.regexp.Regexp; /** * Performs regular expression string replacements in a text diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java index 71871eb69..38adea548 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java @@ -53,20 +53,20 @@ */ package org.apache.tools.ant.taskdefs.optional; -import java.io.File; -import java.io.OutputStream; -import java.io.PrintStream; import java.io.BufferedOutputStream; +import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import org.apache.tools.ant.Task; +import java.io.OutputStream; +import java.io.PrintStream; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; -import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.taskdefs.PumpStreamHandler; -import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java index 797702f95..df719baf1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java @@ -53,15 +53,15 @@ */ package org.apache.tools.ant.taskdefs.optional; -import com.ibm.bsf.BSFManager; import com.ibm.bsf.BSFException; +import com.ibm.bsf.BSFManager; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Hashtable; import java.util.Enumeration; -import org.apache.tools.ant.Task; +import java.util.Hashtable; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; /** * Executes a script. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java index 0aa4cc35b..86fb4f8ac 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java @@ -55,8 +55,6 @@ package org.apache.tools.ant.taskdefs.optional; import java.io.File; import org.apache.tools.ant.BuildException; - - import org.apache.tools.ant.taskdefs.Java; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Test.java b/src/main/org/apache/tools/ant/taskdefs/optional/Test.java index 29bfc78d7..16168343e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Test.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Test.java @@ -53,9 +53,9 @@ */ package org.apache.tools.ant.taskdefs.optional; +import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.Java; -import java.util.Vector; /** * This is a primitive task to execute a unit test in the org.apache.testlet framework. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index c6c793073..a977acd18 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -54,40 +54,34 @@ package org.apache.tools.ant.taskdefs.optional; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.io.BufferedOutputStream; -import java.io.BufferedInputStream; -import java.io.OutputStream; import java.io.InputStream; +import java.io.OutputStream; import java.util.Vector; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.XSLTLiaison; -import org.apache.tools.ant.taskdefs.XSLTLoggerAware; -import org.apache.tools.ant.taskdefs.XSLTLogger; - -import org.xml.sax.InputSource; -import org.xml.sax.EntityResolver; -import org.xml.sax.XMLReader; - import javax.xml.parsers.SAXParserFactory; - -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.Templates; - import javax.xml.transform.ErrorListener; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; import javax.xml.transform.Source; -import javax.xml.transform.URIResolver; import javax.xml.transform.SourceLocator; - +import javax.xml.transform.Templates; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.XSLTLiaison; +import org.apache.tools.ant.taskdefs.XSLTLogger; +import org.apache.tools.ant.taskdefs.XSLTLoggerAware; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; /** * Concrete liaison for XSLT processor implementing TraX. (ie JAXP 1.1) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java index 5db08e29e..8aa3039bb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java @@ -58,29 +58,29 @@ import java.io.FileReader; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -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.AntClassLoader; 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.DTDLocation; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.XMLCatalog; -import org.apache.tools.ant.types.DTDLocation; import org.apache.tools.ant.util.JAXPUtils; -import org.xml.sax.XMLReader; import org.xml.sax.EntityResolver; -import org.xml.sax.Parser; import org.xml.sax.ErrorHandler; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXNotSupportedException; import org.xml.sax.InputSource; +import org.xml.sax.Parser; import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXParseException; +import org.xml.sax.XMLReader; import org.xml.sax.helpers.ParserAdapter; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java index 5fdff43b9..2187e7865 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XalanLiaison.java @@ -54,18 +54,15 @@ package org.apache.tools.ant.taskdefs.optional; -import org.apache.tools.ant.taskdefs.XSLTLiaison; - -import org.apache.xalan.xslt.XSLTProcessorFactory; -import org.apache.xalan.xslt.XSLTProcessor; -import org.apache.xalan.xslt.XSLTInputSource; -import org.apache.xalan.xslt.XSLTResultTarget; - - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import org.apache.tools.ant.taskdefs.XSLTLiaison; +import org.apache.xalan.xslt.XSLTInputSource; +import org.apache.xalan.xslt.XSLTProcessor; +import org.apache.xalan.xslt.XSLTProcessorFactory; +import org.apache.xalan.xslt.XSLTResultTarget; /** * Concrete liaison for Xalan 1.x API. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java index 0a8a1b27d..d9cc427e9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XslpLiaison.java @@ -57,12 +57,10 @@ package org.apache.tools.ant.taskdefs.optional; import com.kvisco.xsl.XSLProcessor; import com.kvisco.xsl.XSLReader; import com.kvisco.xsl.XSLStylesheet; -import org.apache.tools.ant.taskdefs.XSLTLiaison; -import org.apache.tools.ant.BuildException; - import java.io.File; import java.io.FileOutputStream; import java.io.OutputStreamWriter; +import org.apache.tools.ant.taskdefs.XSLTLiaison; /** * Concrete liaison for XSLP diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java index 302f0397c..ccd3577d6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.ccm; import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index 54d5d2164..c66f9e4fa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java @@ -60,7 +60,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index b517edb54..77ca7d8f1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -54,9 +54,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; -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.Execute; import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.types.Commandline; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java index 9211e1fb7..31683f201 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java @@ -55,14 +55,14 @@ package org.apache.tools.ant.taskdefs.optional.depend; import java.io.File; import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import org.apache.tools.ant.util.depend.AbstractAnalyzer; -import java.util.zip.ZipFile; import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import org.apache.tools.ant.util.depend.AbstractAnalyzer; /** * An analyzer which uses the depend task's bytecode classes to analyze diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java index 48397a95a..d4cc9d70e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java @@ -57,7 +57,6 @@ import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Vector; - import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPoolEntry; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index b4c2e5ba8..7b89ed55c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -63,7 +63,6 @@ import java.net.URL; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; - import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 947aec580..28a6fcdb1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -71,7 +71,6 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; // ==================================================================== import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index 90ba7dbe3..a115e4568 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -65,7 +65,6 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java index 43c301fa8..c558e1ed8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java @@ -53,9 +53,9 @@ */ package org.apache.tools.ant.taskdefs.optional.dotnet; -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; /** * Converts a WSDL file or URL resource into a .NET language. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 1c7b685fb..4d62c50ec 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -56,26 +56,23 @@ package org.apache.tools.ant.taskdefs.optional.ejb; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.io.OutputStream; import java.io.InputStream; -import java.io.BufferedReader; import java.io.InputStreamReader; - +import java.io.OutputStream; import java.util.Hashtable; 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.Project; +import org.apache.tools.ant.taskdefs.ExecTask; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.taskdefs.Java; -import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.taskdefs.ExecTask; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index 5ed2b296b..6a6030654 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java index 140ea7384..2ff3d6f62 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java @@ -53,15 +53,14 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import java.io.File; - /** * Builds a serialized deployment descriptor given a text file description of the * descriptor in the format supported by WebLogic. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java index 59f08b715..43e0a13b1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import java.io.FileInputStream; import java.io.ObjectInputStream; - import javax.ejb.deployment.DeploymentDescriptor; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java index d7c400b0b..d77a2b15d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java @@ -54,20 +54,18 @@ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.util.Hashtable; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; - +import java.util.Hashtable; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.xml.sax.AttributeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.xml.sax.AttributeList; - -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; /** * Inner class used by EjbJar to facilitate the parsing of deployment diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java index 3e9569f42..499505adb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java @@ -57,7 +57,6 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import javax.xml.parsers.SAXParser; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index d3b4c4814..beb4af401 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -56,24 +56,20 @@ package org.apache.tools.ant.taskdefs.optional.ejb; // Standard java imports import java.io.File; -import java.util.List; import java.util.ArrayList; import java.util.Iterator; - -// XML imports +import java.util.List; +import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.ParserConfigurationException; -import org.xml.sax.SAXException; - -// Apache/Ant imports 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.taskdefs.MatchingTask; -import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; +import org.xml.sax.SAXException; /** * Provides automated EJB JAR file creation. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java index 63e0175e4..5328bf8e9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java @@ -53,15 +53,14 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import java.io.File; - /** * Builds EJB support classes using WebLogic's ejbc tool from a directory containing * a set of deployment descriptors. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java index 15a5c2d2b..652995407 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java @@ -54,15 +54,14 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; -import java.io.IOException; import java.io.FileInputStream; -import java.io.ObjectInputStream; import java.io.FileWriter; +import java.io.IOException; +import java.io.ObjectInputStream; import java.io.PrintWriter; import java.util.Vector; - -import javax.ejb.deployment.EntityDescriptor; import javax.ejb.deployment.DeploymentDescriptor; +import javax.ejb.deployment.EntityDescriptor; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 6ef63de85..b51dd88cf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -54,33 +54,30 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; -import java.io.IOException; import java.io.FileInputStream; -import java.io.InputStream; import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Enumeration; import java.util.Hashtable; -import java.util.List; import java.util.Iterator; -import java.util.ArrayList; +import java.util.List; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; import java.util.zip.ZipEntry; -import java.util.Enumeration; - - import javax.xml.parsers.SAXParser; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -import org.apache.tools.ant.Task; +import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.depend.DependencyAnalyzer; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java index 9458cf867..7f33381e8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java @@ -57,12 +57,10 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import java.io.IOException; import java.util.Hashtable; - import javax.xml.parsers.SAXParser; -import org.xml.sax.SAXException; - -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.xml.sax.SAXException; /** * This class is used to generate iPlanet Application Server (iAS) 6.0 stubs and diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java index 502864c9c..dc0aa52f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java @@ -54,30 +54,27 @@ package org.apache.tools.ant.taskdefs.optional.ejb; +import java.io.BufferedReader; import java.io.File; -import java.io.InputStream; import java.io.FileInputStream; -import java.io.InputStreamReader; -import java.io.BufferedReader; import java.io.IOException; -import java.util.Map; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.Hashtable; -import java.util.List; -import java.util.ArrayList; import java.util.Iterator; -import java.util.StringTokenizer; +import java.util.List; +import java.util.Map; import java.util.Properties; -import java.util.Date; - - - +import java.util.StringTokenizer; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.xml.sax.AttributeList; import org.xml.sax.HandlerBase; -import org.xml.sax.SAXException; import org.xml.sax.InputSource; -import org.xml.sax.AttributeList; +import org.xml.sax.SAXException; /** * Compiles EJB stubs and skeletons for the iPlanet Application diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java index a8a18355d..3d08a2e46 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java @@ -56,15 +56,13 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import java.io.IOException; - -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.SAXParser; import javax.xml.parsers.ParserConfigurationException; -import org.xml.sax.SAXException; - +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.BuildException; +import org.xml.sax.SAXException; /** * Compiles EJB stubs and skeletons for the iPlanet Application Server. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java index 93c46197e..805804799 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java @@ -53,8 +53,8 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import java.io.FilenameFilter; import java.io.File; +import java.io.FilenameFilter; public class InnerClassFilenameFilter implements FilenameFilter { private String baseClassName; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java index 212fb81a3..2b6a30ad0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java @@ -53,19 +53,16 @@ */ package org.apache.tools.ant.taskdefs.optional.ejb; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.taskdefs.Java; -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.taskdefs.Java; - import java.io.File; import java.io.IOException; -import java.util.Hashtable; import java.util.Enumeration; - +import java.util.Hashtable; import javax.xml.parsers.SAXParser; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.types.Path; /** * The deployment tool to add the jonas specific deployment descriptors to the diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java index 5c4366498..5141ee902 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java @@ -54,14 +54,12 @@ package org.apache.tools.ant.taskdefs.optional.ejb; +import java.io.File; import org.apache.tools.ant.BuildException; - import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Path; -import java.io.File; - /** * Starts a WebLogic server. * A number of parameters are used to control the operation of the weblogic instance. Note that the task, diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java index 835a4ac97..335693ce2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Java; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index d20108c9a..6a25616cc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -54,29 +54,27 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; -import java.io.IOException; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; -import java.util.jar.JarFile; -import java.util.jar.JarOutputStream; -import java.util.jar.JarEntry; +import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; -import java.util.Enumeration; import java.util.Vector; - -import javax.xml.parsers.SAXParserFactory; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.JarOutputStream; import javax.xml.parsers.SAXParser; -import org.xml.sax.InputSource; - +import javax.xml.parsers.SAXParserFactory; +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.types.Path; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; +import org.xml.sax.InputSource; /** The weblogic element is used to control the weblogic.ejbc compiler for diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java index 87ece8cc6..5bc7b9985 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import java.util.Hashtable; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index ae47c939f..96e1461bb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -54,37 +54,23 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; - -import java.io.IOException; - import java.io.FileOutputStream; - +import java.io.IOException; import java.io.InputStream; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.jar.JarEntry; import java.util.jar.JarFile; - import java.util.jar.JarOutputStream; - -import java.util.jar.JarEntry; -import java.util.Iterator; - -import java.util.Hashtable; - -import java.util.Enumeration; - - -import org.apache.tools.ant.Project; - -import org.apache.tools.ant.BuildException; - import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.EnumeratedAttribute; - -import org.apache.tools.ant.types.Path; - import org.apache.tools.ant.types.Environment; - -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.Path; /** * Websphere deployment tool that augments the ejbjar task. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java index f21dc9b34..64d2b186b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java @@ -58,8 +58,8 @@ import java.util.Arrays; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; -import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Reference; /** * The Extension set lists a set of "Optional Packages" / diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java index f8f773c6f..d2505f5a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java @@ -61,8 +61,8 @@ import java.util.Iterator; import java.util.jar.Attributes; import java.util.jar.Manifest; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; /** * Generates a manifest that declares all the dependencies. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java index 29fe286fc..ae4c09518 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java @@ -59,9 +59,9 @@ import java.util.jar.Manifest; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.optional.extension.resolvers.AntResolver; import org.apache.tools.ant.taskdefs.optional.extension.resolvers.LocationResolver; import org.apache.tools.ant.taskdefs.optional.extension.resolvers.URLResolver; -import org.apache.tools.ant.taskdefs.optional.extension.resolvers.AntResolver; /** * Tries to locate a JAR to satisfy an extension and place diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 5f09a4293..b90d81571 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -53,23 +53,23 @@ */ package org.apache.tools.ant.taskdefs.optional.i18n; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.BufferedReader; import java.io.InputStreamReader; -import java.io.FileOutputStream; -import java.io.BufferedWriter; import java.io.OutputStreamWriter; -import java.util.Vector; import java.util.Hashtable; import java.util.Locale; +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.taskdefs.MatchingTask; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.taskdefs.MatchingTask; /** * Translates text embedded in files using Resource Bundle files. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java index dc09ca050..d97c5f1ef 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java @@ -57,7 +57,6 @@ package org.apache.tools.ant.taskdefs.optional.ide; import com.ibm.ivj.util.base.Project; import com.ibm.ivj.util.base.ToolData; - import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index d871e7fcb..7300b1e41 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -55,45 +55,43 @@ package org.apache.tools.ant.taskdefs.optional.ide; -import java.util.Vector; -import java.awt.Frame; -import java.awt.Dialog; -import java.awt.Panel; -import java.awt.MenuBar; -import java.awt.Menu; -import java.awt.MenuItem; -import java.awt.Label; -import java.awt.TextField; -import java.awt.TextArea; -import java.awt.List; -import java.awt.Choice; +import java.awt.BorderLayout; import java.awt.Button; +import java.awt.Choice; +import java.awt.Dialog; import java.awt.FileDialog; import java.awt.FlowLayout; -import java.awt.BorderLayout; -import java.awt.GridBagLayout; +import java.awt.Font; +import java.awt.Frame; import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; import java.awt.Insets; -import java.awt.Toolkit; -import java.awt.Font; +import java.awt.Label; +import java.awt.List; +import java.awt.Menu; +import java.awt.MenuBar; +import java.awt.MenuItem; +import java.awt.Panel; import java.awt.SystemColor; -import java.awt.event.ActionListener; -import java.awt.event.ItemListener; -import java.awt.event.TextListener; -import java.awt.event.WindowListener; +import java.awt.TextArea; +import java.awt.TextField; +import java.awt.Toolkit; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.awt.event.TextEvent; +import java.awt.event.TextListener; import java.awt.event.WindowEvent; - +import java.awt.event.WindowListener; import java.beans.PropertyChangeListener; - +import java.util.Vector; +import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildListener; -import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.util.DateUtils; +import org.apache.tools.ant.util.StringUtils; /** * This is a simple grafical user interface to provide the information needed diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java index 59271967e..76e657d67 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java @@ -55,19 +55,18 @@ package org.apache.tools.ant.taskdefs.optional.ide; -import java.util.Vector; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.File; import java.util.Enumeration; import java.util.StringTokenizer; -import java.io.File; -import java.beans.PropertyChangeSupport; -import java.beans.PropertyChangeListener; - +import java.util.Vector; +import org.apache.tools.ant.BuildEvent; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.Target; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.BuildListener; -import org.apache.tools.ant.BuildEvent; /** * This class wraps the Ant project information needed to diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java index f33d05a3c..28145277a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.PatternSet; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index ed0b29758..9f97fa199 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -54,15 +54,13 @@ package org.apache.tools.ant.taskdefs.optional.ide; +import java.lang.reflect.Field; 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.types.FileSet; -import java.lang.reflect.Field; - /** * Import source, class files, and resources to the Visual Age for Java * workspace. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index 1668ab9c9..c5c233ada 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -54,20 +54,18 @@ package org.apache.tools.ant.taskdefs.optional.ide; -import java.util.Vector; -import java.util.Enumeration; -import java.io.File; - -import com.ibm.ivj.util.base.Package; -import com.ibm.ivj.util.base.IvjException; -import com.ibm.ivj.util.base.Workspace; -import com.ibm.ivj.util.base.ToolEnv; import com.ibm.ivj.util.base.ExportCodeSpec; -import com.ibm.ivj.util.base.ProjectEdition; import com.ibm.ivj.util.base.ImportCodeSpec; -import com.ibm.ivj.util.base.Type; +import com.ibm.ivj.util.base.IvjException; +import com.ibm.ivj.util.base.Package; import com.ibm.ivj.util.base.Project; - +import com.ibm.ivj.util.base.ProjectEdition; +import com.ibm.ivj.util.base.ToolEnv; +import com.ibm.ivj.util.base.Type; +import com.ibm.ivj.util.base.Workspace; +import java.io.File; +import java.util.Enumeration; +import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java index bca232117..e17484f5f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java @@ -54,21 +54,18 @@ package org.apache.tools.ant.taskdefs.optional.ide; -import java.util.Vector; - +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.HttpURLConnection; -import java.util.Enumeration; import java.net.URL; - +import java.util.Enumeration; +import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.InputStream; -import java.io.File; - /** * Helper class for VAJ tasks. Holds Workspace singleton and * wraps IvjExceptions into BuildExceptions diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 0b34cb633..f492dc4a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -57,14 +57,10 @@ package org.apache.tools.ant.taskdefs.optional.ide; import java.io.IOException; - - - +import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.StringUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java index a92f2590d..c01245916 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java @@ -54,8 +54,8 @@ package org.apache.tools.ant.taskdefs.optional.ide; -import java.util.Vector; import java.io.File; +import java.util.Vector; /** * Helper interface for VAJ tasks. Encapsulates diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java index 8ca148daa..422d41246 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java @@ -55,8 +55,8 @@ package org.apache.tools.ant.taskdefs.optional.j2ee; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.taskdefs.Java; +import org.apache.tools.ant.types.Commandline; /** * A generic tool for J2EE server hot deployment. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java index b2cf2182b..456392222 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java @@ -54,7 +54,6 @@ package org.apache.tools.ant.taskdefs.optional.j2ee; import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.types.Path; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java index b501a5a59..687a8ab43 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java @@ -55,9 +55,8 @@ package org.apache.tools.ant.taskdefs.optional.j2ee; import java.io.File; -import java.util.Vector; import java.util.Enumeration; - +import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index 569a61088..c252590de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -54,6 +54,10 @@ package org.apache.tools.ant.taskdefs.optional.javacc; +import java.io.File; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; @@ -63,11 +67,6 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import java.io.File; -import java.io.IOException; -import java.util.Hashtable; -import java.util.Enumeration; - /** * Runs the JJTree compiler compiler. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 8df1b271a..7804c5885 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -54,20 +54,17 @@ package org.apache.tools.ant.taskdefs.optional.javacc; +import java.io.File; +import java.util.Enumeration; +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.taskdefs.Execute; - import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Path; -import java.io.File; - -import java.util.Hashtable; -import java.util.Enumeration; - /** * JavaCC compiler compiler task. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 051a29ad6..d7a0e5ff1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -58,8 +58,6 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; - - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.PathTokenizer; import org.apache.tools.ant.Project; @@ -69,9 +67,9 @@ import org.apache.tools.ant.taskdefs.ExecuteWatchdog; import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.types.EnumeratedAttribute; /** * Runs JDepend tests. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java index 7bc24e57a..3584a4415 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java @@ -53,10 +53,10 @@ */ package org.apache.tools.ant.taskdefs.optional.jlink; -import java.io.IOException; import java.io.DataInput; -import java.io.InputStream; import java.io.DataInputStream; +import java.io.IOException; +import java.io.InputStream; /** * Reads just enough of a class file to determine the class' full name. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java index e6fb10bf9..2b8cae885 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java @@ -53,11 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.jlink; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; -import java.io.File; /** * This class defines objects that can link together various jar and diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java index 99a534ba0..c2847233b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java @@ -61,20 +61,20 @@ */ package org.apache.tools.ant.taskdefs.optional.jlink; -import java.io.FileOutputStream; +import java.io.BufferedInputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FileInputStream; -import java.io.BufferedInputStream; import java.util.Enumeration; import java.util.Vector; -import java.util.zip.ZipOutputStream; +import java.util.zip.CRC32; import java.util.zip.Deflater; -import java.util.zip.ZipFile; import java.util.zip.ZipEntry; import java.util.zip.ZipException; -import java.util.zip.CRC32; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; public class jlink extends Object { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 7d196bc39..22223424c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -56,19 +56,15 @@ package org.apache.tools.ant.taskdefs.optional.jsp; import java.io.File; import java.util.Date; - -import java.util.Vector; import java.util.Enumeration; - +import java.util.Vector; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; - import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapter; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory; - import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index a42be7d91..fff66cfff 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -54,19 +54,16 @@ package org.apache.tools.ant.taskdefs.optional.jsp; //apache/ant imports -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.taskdefs.Java; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.Project; - - -//java imports import java.io.File; -import java.util.Vector; import java.util.Date; 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.taskdefs.Java; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.Path; /** * Precompiles JSP's using WebLogic's JSP compiler (weblogic.jspc). diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java index 34a854e06..cb2c0de29 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java @@ -54,15 +54,13 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; +import java.io.File; +import java.util.Enumeration; +import java.util.Vector; import org.apache.tools.ant.Project; - import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.types.CommandlineJava; -import java.util.Vector; -import java.util.Enumeration; -import java.io.File; - /** * This is the default implementation for the JspCompilerAdapter interface. * This is currently very light on the ground since only one compiler type is diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index c6d1ca206..e50a9e6ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java @@ -54,17 +54,15 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.optional.jsp.JspC; import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler; import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler; -import org.apache.tools.ant.taskdefs.Java; -import org.apache.tools.ant.taskdefs.ExecuteJava; - -import java.io.File; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.Path; /** * The implementation of the jasper compiler. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java index 2d85bfced..0f66b73b5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java @@ -53,24 +53,18 @@ */ package org.apache.tools.ant.taskdefs.optional.junit; -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.InputStream; import java.io.FileInputStream; -import java.io.IOException; import java.io.FileNotFoundException; - - - +import java.io.IOException; +import java.io.InputStream; import java.net.URL; - -import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilder; - +import javax.xml.parsers.DocumentBuilderFactory; +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 org.w3c.dom.Document; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index ca796160f..77a5366b4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -55,15 +55,13 @@ package org.apache.tools.ant.taskdefs.optional.junit; +import java.io.File; +import java.util.Enumeration; +import java.util.Vector; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; - -import java.util.Enumeration; -import java.util.Vector; -import java.io.File; - /** *

Create then run JUnitTest's based on the list of files given by the fileset attribute. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java index 32104aba5..00a4a6d38 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java @@ -59,10 +59,8 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; import java.text.NumberFormat; - import junit.framework.AssertionFailedError; import junit.framework.Test; - import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java index 95fd7f149..795bd0685 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java @@ -53,20 +53,18 @@ */ package org.apache.tools.ant.taskdefs.optional.junit; -import org.w3c.dom.Node; -import org.w3c.dom.Document; +import java.util.Vector; +import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Attr; - +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; import org.w3c.dom.ProcessingInstruction; import org.w3c.dom.Text; -import org.w3c.dom.NodeList; -import org.w3c.dom.DOMException; - -import java.util.Vector; /** * Some utilities that might be useful when manipulating DOM trees. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java index 3d6655e21..c550d92bd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java @@ -54,12 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.EnumeratedAttribute; - import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.types.EnumeratedAttribute; /** *

A wrapper for the implementations of JUnitResultFormatter. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java index f8a859ed3..3855b752d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java @@ -55,8 +55,8 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.OutputStream; -import org.apache.tools.ant.BuildException; import junit.framework.TestListener; +import org.apache.tools.ant.BuildException; /** * This Interface describes classes that format the results of a JUnit diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index b10ac816f..695e63ef7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -54,33 +54,30 @@ package org.apache.tools.ant.taskdefs.optional.junit; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URL; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; 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.Execute; -import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.taskdefs.ExecuteWatchdog; import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.Environment; import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.types.Environment; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; - -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Properties; -import java.util.Vector; - -import java.net.URL; - /** * Runs JUnit tests. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java index d429b8f41..ec68ca74f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java @@ -54,12 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import org.apache.tools.ant.Project; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; import java.util.Vector; +import org.apache.tools.ant.Project; /** *

Run a single JUnit test. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 5ebe65e7f..46177f352 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -54,18 +54,6 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.StringUtils; - -import junit.framework.TestListener; -import junit.framework.TestResult; -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.framework.AssertionFailedError; -import java.lang.reflect.Method; - import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; @@ -76,10 +64,20 @@ import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; +import java.lang.reflect.Method; import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; import java.util.Vector; +import junit.framework.AssertionFailedError; +import junit.framework.Test; +import junit.framework.TestListener; +import junit.framework.TestResult; +import junit.framework.TestSuite; +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.util.StringUtils; /** * Simple Testrunner for JUnit that runs all tests of a testsuite. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java index f76561b0b..db2307d7a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.lang.reflect.Method; - import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java index a87c5f473..97c5bb9b2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java @@ -54,17 +54,15 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import org.apache.tools.ant.BuildException; - +import java.io.IOException; import java.io.OutputStream; -import java.io.StringWriter; import java.io.PrintWriter; -import java.io.IOException; +import java.io.StringWriter; import java.text.NumberFormat; import java.util.Hashtable; - import junit.framework.AssertionFailedError; import junit.framework.Test; +import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java index d3da0fa23..0ae60e60c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java @@ -54,12 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.junit; -import java.text.NumberFormat; import java.io.IOException; import java.io.OutputStream; +import java.text.NumberFormat; import junit.framework.AssertionFailedError; import junit.framework.Test; - import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index 4fc0b8f28..4c89c959b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -54,27 +54,22 @@ package org.apache.tools.ant.taskdefs.optional.junit; +import java.io.IOException; import java.io.OutputStream; -import java.io.Writer; import java.io.OutputStreamWriter; -import java.io.IOException; - - - - -import java.util.Properties; +import java.io.Writer; import java.util.Enumeration; import java.util.Hashtable; +import java.util.Properties; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import junit.framework.AssertionFailedError; +import junit.framework.Test; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.DOMElementWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Text; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.DOMElementWriter; - -import junit.framework.AssertionFailedError; -import junit.framework.Test; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 68e9f17cf..4ce766771 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -54,29 +54,25 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; - -import java.io.FileOutputStream; import java.util.Enumeration; import java.util.Vector; - -import org.w3c.dom.Element; -import org.w3c.dom.Document; - - -import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +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.DirectoryScanner; -import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.FileSet; 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.xml.sax.SAXException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java index 63fb13806..eddd3e361 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java @@ -54,10 +54,9 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.OutputStream; - -import org.apache.xalan.xslt.XSLTProcessorFactory; -import org.apache.xalan.xslt.XSLTProcessor; import org.apache.xalan.xslt.XSLTInputSource; +import org.apache.xalan.xslt.XSLTProcessor; +import org.apache.xalan.xslt.XSLTProcessorFactory; import org.apache.xalan.xslt.XSLTResultTarget; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java index 9ab2c587c..8d29be137 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java @@ -54,14 +54,13 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.OutputStream; - +import javax.xml.transform.Result; +import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; -import javax.xml.transform.Source; -import javax.xml.transform.Result; import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; /** * Xalan executor via JAXP. Nothing special must exists in the classpath diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java index d793fcfd7..96dd4bd7d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java @@ -53,15 +53,13 @@ */ package org.apache.tools.ant.taskdefs.optional.junit; -import org.apache.tools.ant.BuildException; - +import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.io.ByteArrayOutputStream; -import java.io.FileOutputStream; - import java.lang.reflect.Field; +import org.apache.tools.ant.BuildException; /** * Command class that encapsulate specific behavior for each diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index e7b324037..cf938eae0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -60,7 +60,6 @@ import java.io.PrintWriter; import java.util.Enumeration; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java index ea8b2d842..a6bce7149 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java @@ -58,7 +58,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Vector; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java index aca6ff94b..5149079a0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditParser.java @@ -53,12 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.metamata; -import java.util.Vector; import java.io.File; - +import java.util.Vector; +import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.util.regexp.RegexpMatcher; import org.apache.tools.ant.util.regexp.RegexpMatcherFactory; -import org.apache.tools.ant.util.StringUtils; /** * Parser that will parse an output line of MAudit and return an diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index ca2a51f66..985b231cf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -64,17 +64,15 @@ import java.util.Hashtable; import java.util.Vector; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.taskdefs.StreamPumper; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.util.DateUtils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * This is a very bad stream handler for the MAudit task. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java index 47360bbba..a1ea2f283 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java @@ -58,7 +58,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.Vector; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index 09378f7e6..09ffd43f6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java @@ -74,16 +74,14 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; - -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.util.DateUtils; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; /** * A handy metrics handler. Most of this code was done only with the diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index 5ba96899a..8561df930 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -54,20 +54,19 @@ package org.apache.tools.ant.taskdefs.optional.metamata; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.taskdefs.LogStreamHandler; -import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import java.io.File; -import java.io.IOException; -import java.io.FileWriter; -import java.io.PrintWriter; -import java.util.Vector; - /** * Simple Metamata MParse task. * Based on the original written by diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 8eda90a80..7870260a4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -56,15 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.net; import com.oroinc.net.ftp.FTPClient; import com.oroinc.net.ftp.FTPFile; import com.oroinc.net.ftp.FTPReply; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.FileScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.util.FileUtils; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedWriter; @@ -77,6 +68,14 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Locale; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.FileScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.util.FileUtils; /** * Basic FTP client. Performs the following actions: diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java index e7b0b3381..4c53e4eeb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java @@ -54,11 +54,12 @@ package org.apache.tools.ant.taskdefs.optional.net; -import java.io.*; -import java.net.*; -import java.util.*; -import java.lang.reflect.*; -import org.apache.tools.ant.*; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Properties; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; import org.apache.tools.ant.util.JavaEnvUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index e07992521..2b8550842 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java @@ -55,16 +55,15 @@ package org.apache.tools.ant.taskdefs.optional.net; import com.oroinc.net.telnet.TelnetClient; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Calendar; import java.util.Enumeration; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; /** * Automates the telnet protocol. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java index 1801e7823..77e1c8d0a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -62,7 +62,6 @@ package org.apache.tools.ant.taskdefs.optional.perforce; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 41f80afad..b0e11d7e2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -60,7 +60,6 @@ package org.apache.tools.ant.taskdefs.optional.perforce; import java.io.IOException; - import org.apache.oro.text.perl.Perl5Util; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java index 3f97e738f..16a13764d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java @@ -60,7 +60,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.SequenceInputStream; - import org.apache.tools.ant.BuildException; public abstract class P4HandlerAdapter implements P4Handler { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java index 5f0ee9db2..c700cf90a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java @@ -61,7 +61,6 @@ package org.apache.tools.ant.taskdefs.optional.perforce; import java.text.SimpleDateFormat; import java.util.Date; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index a2a008e6e..6ab23782b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -53,26 +53,26 @@ */ package org.apache.tools.ant.taskdefs.optional.pvcs; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; import java.io.FileNotFoundException; -import java.io.BufferedReader; +import java.io.FileOutputStream; import java.io.FileReader; -import java.io.BufferedWriter; import java.io.FileWriter; -import java.util.Enumeration; -import java.util.Vector; -import java.text.ParseException; +import java.io.IOException; import java.text.MessageFormat; +import java.text.ParseException; +import java.util.Enumeration; import java.util.Random; +import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Execute; +import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.taskdefs.PumpStreamHandler; -import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.types.Commandline; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index a0be93f74..3292190f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java @@ -53,8 +53,6 @@ */ package org.apache.tools.ant.taskdefs.optional.scm; -import java.util.StringTokenizer; - import com.starbase.starteam.Folder; import com.starbase.starteam.Item; import com.starbase.starteam.Property; @@ -63,7 +61,7 @@ import com.starbase.starteam.StarTeamFinder; import com.starbase.starteam.Type; import com.starbase.starteam.View; import com.starbase.util.Platform; - +import java.util.StringTokenizer; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index fa3732c79..6830a7d3b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -60,7 +60,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Random; import java.util.Vector; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java index e2c24355f..70d0dedfd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java @@ -64,9 +64,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; - -import org.w3c.dom.Document; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; @@ -75,6 +72,7 @@ import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Path; +import org.w3c.dom.Document; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index 5ee9dc0ea..cf411b928 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -62,7 +62,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.Random; import java.util.Vector; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java index 69f5abd6b..c1f155fb9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import java.util.Vector; - import org.apache.tools.ant.util.regexp.RegexpMatcher; import org.apache.tools.ant.util.regexp.RegexpMatcherFactory; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java index 2b5642af9..ff569b76d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.sitraka; import java.util.Hashtable; import java.util.Vector; - import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java index 57e29790d..2772a84e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java @@ -61,19 +61,17 @@ import java.util.NoSuchElementException; import java.util.Vector; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; - import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile; import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader; import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo; import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.Utils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; /** * Little hack to process XML report from JProbe. It will fix diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java index 4c2ecb2f2..acdb9105c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java @@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; - import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java index 147c77a59..01914b593 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; import java.io.DataInputStream; import java.io.IOException; - import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java index 36aeccde6..c47c9fbd8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.taskdefs.optional.sitraka.bytecode; import java.util.Vector; - import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool; import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java index 12d1b7f12..5df7a77b6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java @@ -54,7 +54,6 @@ package org.apache.tools.ant.taskdefs.optional.sos; import java.io.File; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java index 1b22d6184..8aad1ba2c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java @@ -55,26 +55,21 @@ package org.apache.tools.ant.taskdefs.optional.sound; // ant includes -import org.apache.tools.ant.BuildListener; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildEvent; - -// imports for all the sound classes required -// note: comes with jmf or jdk1.3 + -// these can be obtained from http://java.sun.com/products/java-media/sound/ -import javax.sound.sampled.LineListener; -import javax.sound.sampled.Clip; +import java.io.File; +import java.io.IOException; +import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.UnsupportedAudioFileException; -import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.Clip; import javax.sound.sampled.DataLine; -import javax.sound.sampled.LineUnavailableException; -import javax.sound.sampled.LineEvent; import javax.sound.sampled.Line; - -import java.io.File; -import java.io.IOException; +import javax.sound.sampled.LineEvent; +import javax.sound.sampled.LineListener; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.UnsupportedAudioFileException; +import org.apache.tools.ant.BuildEvent; +import org.apache.tools.ant.BuildListener; +import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java index e9280854c..c8e648ae4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java @@ -54,13 +54,12 @@ package org.apache.tools.ant.taskdefs.optional.sound; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; - import java.io.File; import java.util.Random; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; /** * Plays a sound file at the end of the build, according to whether the build failed or succeeded. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java index 754cdac2d..76ac67fc9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java @@ -54,22 +54,21 @@ package org.apache.tools.ant.taskdefs.optional.splash; -import org.apache.tools.ant.BuildEvent; -import org.apache.tools.ant.BuildListener; - -import javax.swing.JWindow; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.BorderFactory; -import javax.swing.ImageIcon; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.BorderFactory; +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.JWindow; +import org.apache.tools.ant.BuildEvent; +import org.apache.tools.ant.BuildListener; class SplashScreen extends JWindow implements ActionListener, BuildListener { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java index 2e66ed0a9..64c066ad8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java @@ -54,10 +54,10 @@ package org.apache.tools.ant.taskdefs.optional.splash; -import java.io.InputStream; -import java.io.DataInputStream; import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import javax.swing.ImageIcon; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java index cf72f8a5c..c7531c2cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java @@ -53,18 +53,16 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.Enumeration; -import java.util.Hashtable; - import com.starbase.starteam.File; import com.starbase.starteam.Folder; import com.starbase.starteam.Item; import com.starbase.starteam.Status; import com.starbase.starteam.View; import com.starbase.starteam.ViewConfiguration; - +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java index 21668b502..7335e3137 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java @@ -53,17 +53,15 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import java.io.IOException; -import java.util.Enumeration; -import java.util.Hashtable; - import com.starbase.starteam.File; import com.starbase.starteam.Folder; import com.starbase.starteam.Item; import com.starbase.starteam.Status; import com.starbase.starteam.View; import com.starbase.starteam.ViewConfiguration; - +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java index 705a6e01a..f68ca013c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java @@ -53,15 +53,13 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - import com.starbase.starteam.Label; import com.starbase.starteam.View; import com.starbase.starteam.ViewConfiguration; import com.starbase.util.OLEDate; - +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java index 2ca5aa67b..a91e64968 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java @@ -53,16 +53,14 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import java.io.IOException; -import java.util.Hashtable; - import com.starbase.starteam.File; import com.starbase.starteam.Folder; import com.starbase.starteam.Item; import com.starbase.starteam.Status; import com.starbase.starteam.View; import com.starbase.starteam.ViewConfiguration; - +import java.io.IOException; +import java.util.Hashtable; import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java index 910f37a07..669e8dd3e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.java @@ -53,13 +53,11 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import java.util.StringTokenizer; - import com.starbase.starteam.Server; import com.starbase.starteam.StarTeamFinder; import com.starbase.starteam.User; import com.starbase.starteam.View; - +import java.util.StringTokenizer; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java index 620e64d03..c3d3a8b5f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java @@ -53,14 +53,12 @@ */ package org.apache.tools.ant.taskdefs.optional.starteam; -import java.util.Hashtable; -import java.util.StringTokenizer; - import com.starbase.starteam.Folder; import com.starbase.starteam.Label; import com.starbase.starteam.StarTeamFinder; import com.starbase.starteam.View; - +import java.util.Hashtable; +import java.util.StringTokenizer; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 02e4ac462..e84225e0a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -56,9 +56,9 @@ package org.apache.tools.ant.taskdefs.optional.vss; -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.Execute; import org.apache.tools.ant.taskdefs.LogStreamHandler; import org.apache.tools.ant.types.Commandline; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java index 214c236f9..14fbc0c4e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java @@ -54,12 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.vss; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import java.io.File; - /** * Performs CheckIn commands to Microsoft Visual SourceSafe. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java index f421f73eb..f4415137e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java @@ -54,12 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.vss; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import java.io.File; - /** * Performs CheckOut commands to Microsoft Visual SourceSafe. *

If you specify two or more attributes from version, date and diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java index 5692f2148..ef30925dc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java @@ -54,12 +54,11 @@ package org.apache.tools.ant.taskdefs.optional.vss; +import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import java.io.File; - /** * Perform Get commands to Microsoft Visual SourceSafe. *

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java index 0eb4407c0..119d35dc1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java @@ -54,16 +54,16 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.EnumeratedAttribute; import java.io.File; -import java.util.Date; -import java.util.Calendar; -import java.util.GregorianCalendar; import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.EnumeratedAttribute; /** * Performs History commands to Microsoft Visual SourceSafe. * diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 2f06f3850..c1f95aa39 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -54,18 +54,16 @@ package org.apache.tools.ant.taskdefs.rmic; +import java.io.File; +import java.util.Random; +import java.util.Vector; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; - import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.JavaEnvUtils; -import java.io.File; -import java.util.Random; -import java.util.Vector; - /** * This is the default implementation for the RmicAdapter interface. * Currently, this is a cut-and-paste of the original rmic task and diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java index b7d0469b4..d623113eb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java @@ -54,14 +54,12 @@ package org.apache.tools.ant.taskdefs.rmic; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; - import org.apache.tools.ant.types.Commandline; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - /** * The implementation of the rmic for Kaffe * diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java index 07df7751f..febeb0d78 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java @@ -54,16 +54,15 @@ package org.apache.tools.ant.taskdefs.rmic; +import java.io.IOException; +import java.io.OutputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.types.Commandline; -import java.io.OutputStream; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - /** * The implementation of the rmic for SUN's JDK. * diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java index 4cd2ade8f..5e3ed3ad7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java @@ -54,14 +54,12 @@ package org.apache.tools.ant.taskdefs.rmic; +import java.lang.reflect.Method; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; - import org.apache.tools.ant.types.Commandline; -import java.lang.reflect.Method; - /** * The implementation of the rmic for WebLogic * diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index b42de15f8..eaf2aaa52 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -53,17 +53,32 @@ */ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.FileScanner; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.selectors.*; - import java.io.File; +import java.util.Enumeration; +import java.util.Hashtable; import java.util.Stack; import java.util.Vector; -import java.util.Hashtable; -import java.util.Enumeration; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.FileScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.selectors.AndSelector; +import org.apache.tools.ant.types.selectors.ContainsSelector; +import org.apache.tools.ant.types.selectors.DateSelector; +import org.apache.tools.ant.types.selectors.DependSelector; +import org.apache.tools.ant.types.selectors.DepthSelector; +import org.apache.tools.ant.types.selectors.ExtendSelector; +import org.apache.tools.ant.types.selectors.FileSelector; +import org.apache.tools.ant.types.selectors.FilenameSelector; +import org.apache.tools.ant.types.selectors.MajoritySelector; +import org.apache.tools.ant.types.selectors.NoneSelector; +import org.apache.tools.ant.types.selectors.NotSelector; +import org.apache.tools.ant.types.selectors.OrSelector; +import org.apache.tools.ant.types.selectors.PresentSelector; +import org.apache.tools.ant.types.selectors.SelectSelector; +import org.apache.tools.ant.types.selectors.SelectorContainer; +import org.apache.tools.ant.types.selectors.SelectorScanner; +import org.apache.tools.ant.types.selectors.SizeSelector; /** * Class that holds an implicit patternset and supports nested diff --git a/src/main/org/apache/tools/ant/types/AntFilterReader.java b/src/main/org/apache/tools/ant/types/AntFilterReader.java index fa73a85e0..9e508aa81 100644 --- a/src/main/org/apache/tools/ant/types/AntFilterReader.java +++ b/src/main/org/apache/tools/ant/types/AntFilterReader.java @@ -53,8 +53,8 @@ */ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; import java.util.Vector; +import org.apache.tools.ant.BuildException; /** * An AntFileReader is a wrapper class that encloses the classname diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index 23eeab308..32b0cfd97 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/src/main/org/apache/tools/ant/types/Commandline.java @@ -54,11 +54,11 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.StringUtils; import java.io.File; -import java.util.Vector; import java.util.StringTokenizer; +import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.StringUtils; /** diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java index 8ea71bf7e..bc68d729a 100644 --- a/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -54,11 +54,11 @@ package org.apache.tools.ant.types; -import java.util.Properties; import java.util.Enumeration; +import java.util.Properties; import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.util.JavaEnvUtils; /** diff --git a/src/main/org/apache/tools/ant/types/Environment.java b/src/main/org/apache/tools/ant/types/Environment.java index b49266fbb..ae6bb69b4 100644 --- a/src/main/org/apache/tools/ant/types/Environment.java +++ b/src/main/org/apache/tools/ant/types/Environment.java @@ -54,8 +54,8 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; import java.util.Vector; +import org.apache.tools.ant.BuildException; /** * Wrapper for environment variables. diff --git a/src/main/org/apache/tools/ant/types/FileList.java b/src/main/org/apache/tools/ant/types/FileList.java index a79508a88..bf1a7f5d4 100644 --- a/src/main/org/apache/tools/ant/types/FileList.java +++ b/src/main/org/apache/tools/ant/types/FileList.java @@ -54,15 +54,12 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; - import java.io.File; - -import java.util.StringTokenizer; - import java.util.Stack; +import java.util.StringTokenizer; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * FileList represents an explicitly named list of files. FileLists @@ -70,12 +67,12 @@ import java.util.Vector; * whether they currently exist. By contrast, FileSet operates as a * filter, only returning the name of a matched file if it currently * exists in the file system. - * + * * @author Craeg Strong * @version $Revision$ $Date$ */ public class FileList extends DataType { - + private Vector filenames = new Vector(); private File dir; @@ -94,7 +91,7 @@ public class FileList extends DataType { * instance. * *

You must not set another attribute or nest elements inside - * this element if you make it a reference.

+ * this element if you make it a reference.

*/ public void setRefid(Reference r) throws BuildException { if ((dir != null) || (filenames.size() != 0)) { @@ -149,10 +146,10 @@ public class FileList extends DataType { filenames.copyInto(result); return result; } - + /** * Performs the check for circular references and returns the - * referenced FileList. + * referenced FileList. */ protected FileList getRef(Project p) { if (!isChecked()) { @@ -160,7 +157,7 @@ public class FileList extends DataType { stk.push(this); dieOnCircularReference(stk, p); } - + Object o = getRefid().getReferencedObject(p); if (!(o instanceof FileList)) { String msg = getRefid().getRefId() + " doesn\'t denote a filelist"; diff --git a/src/main/org/apache/tools/ant/types/FilterChain.java b/src/main/org/apache/tools/ant/types/FilterChain.java index 197a58df3..ec1f4bcb6 100644 --- a/src/main/org/apache/tools/ant/types/FilterChain.java +++ b/src/main/org/apache/tools/ant/types/FilterChain.java @@ -54,7 +54,6 @@ package org.apache.tools.ant.types; import java.util.Vector; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.filters.ClassConstants; import org.apache.tools.ant.filters.ExpandProperties; diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java index 1e2ed7998..c63b21602 100644 --- a/src/main/org/apache/tools/ant/types/FilterSet.java +++ b/src/main/org/apache/tools/ant/types/FilterSet.java @@ -57,14 +57,10 @@ package org.apache.tools.ant.types; import java.io.File; import java.io.FileInputStream; import java.io.IOException; - -// java util classes import java.util.Enumeration; import java.util.Hashtable; import java.util.Properties; import java.util.Vector; - -// ant classes import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/FilterSetCollection.java b/src/main/org/apache/tools/ant/types/FilterSetCollection.java index cbae7e094..14cc2e12e 100644 --- a/src/main/org/apache/tools/ant/types/FilterSetCollection.java +++ b/src/main/org/apache/tools/ant/types/FilterSetCollection.java @@ -60,8 +60,6 @@ package org.apache.tools.ant.types; // java util classes import java.util.Enumeration; - - import java.util.Vector; // ant classes diff --git a/src/main/org/apache/tools/ant/types/Mapper.java b/src/main/org/apache/tools/ant/types/Mapper.java index de1c9e91a..4db6843c7 100644 --- a/src/main/org/apache/tools/ant/types/Mapper.java +++ b/src/main/org/apache/tools/ant/types/Mapper.java @@ -54,14 +54,13 @@ package org.apache.tools.ant.types; +import java.util.Properties; +import java.util.Stack; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.FileNameMapper; -import java.util.Properties; -import java.util.Stack; - /** * Element to define a FileNameMapper. * diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java index b552d4ccd..9f71ab21e 100644 --- a/src/main/org/apache/tools/ant/types/Path.java +++ b/src/main/org/apache/tools/ant/types/Path.java @@ -54,18 +54,16 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.PathTokenizer; -import org.apache.tools.ant.util.JavaEnvUtils; - import java.io.File; - import java.util.Enumeration; import java.util.Locale; import java.util.Stack; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.PathTokenizer; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.util.JavaEnvUtils; diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java index 80c3a938d..d6c167a34 100644 --- a/src/main/org/apache/tools/ant/types/PatternSet.java +++ b/src/main/org/apache/tools/ant/types/PatternSet.java @@ -54,18 +54,16 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.Project; - -import org.apache.tools.ant.BuildException; - -import java.io.File; import java.io.BufferedReader; +import java.io.File; import java.io.FileReader; import java.io.IOException; import java.util.Enumeration; import java.util.Stack; import java.util.StringTokenizer; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * Named collection of include/exclude tags. diff --git a/src/main/org/apache/tools/ant/types/Reference.java b/src/main/org/apache/tools/ant/types/Reference.java index 548c130dc..06a82cd6c 100644 --- a/src/main/org/apache/tools/ant/types/Reference.java +++ b/src/main/org/apache/tools/ant/types/Reference.java @@ -54,8 +54,8 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * Class to hold a reference to another object in the project. diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index 37e6fe83f..aec564582 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java @@ -56,26 +56,24 @@ package org.apache.tools.ant.types; import java.io.File; import java.io.FileInputStream; -import java.io.InputStream; -import java.io.IOException; import java.io.FileNotFoundException; -import java.net.URL; +import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; +import java.net.URL; import java.util.Enumeration; import java.util.Stack; import java.util.Vector; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; import javax.xml.transform.sax.SAXSource; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.ParserConfigurationException; - +import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.util.FileUtils; - import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/src/main/org/apache/tools/ant/types/ZipFileSet.java b/src/main/org/apache/tools/ant/types/ZipFileSet.java index 1079a999f..260c205d8 100644 --- a/src/main/org/apache/tools/ant/types/ZipFileSet.java +++ b/src/main/org/apache/tools/ant/types/ZipFileSet.java @@ -54,11 +54,10 @@ package org.apache.tools.ant.types; import java.io.File; - +import java.util.Stack; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import java.util.Stack; /** * A ZipFileSet is a FileSet with extra attributes useful in the context of diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index 4225d48ab..8f04b8811 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -54,8 +54,8 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.DirectoryScanner; import java.io.File; +import org.apache.tools.ant.DirectoryScanner; /** * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, diff --git a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java index 0a5b319e5..226985331 100644 --- a/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java +++ b/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java @@ -53,8 +53,8 @@ */ package org.apache.tools.ant.types.optional.depend; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; diff --git a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java index 50e5cc3f7..328c744cf 100644 --- a/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java +++ b/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java @@ -54,13 +54,13 @@ package org.apache.tools.ant.types.optional.depend; import java.io.File; -import java.util.Vector; import java.util.Enumeration; import java.util.Hashtable; -import org.apache.tools.ant.util.depend.DependencyAnalyzer; -import org.apache.tools.ant.DirectoryScanner; +import java.util.Vector; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.util.depend.DependencyAnalyzer; /** diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java index a69b799ce..9d56edbbc 100644 --- a/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java @@ -55,9 +55,8 @@ package org.apache.tools.ant.types.selectors; import java.io.File; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.DataType; +import org.apache.tools.ant.types.DataType; /** * A convenience base class that you can subclass Selectors from. It diff --git a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java index a783a7999..916f2dd30 100644 --- a/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java @@ -54,14 +54,11 @@ package org.apache.tools.ant.types.selectors; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Reference; - import java.io.File; import java.util.Enumeration; -import java.util.Stack; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * This is the base class for selectors that can contain other selectors. @@ -136,7 +133,6 @@ public abstract class BaseSelectorContainer extends BaseSelector * Add a new selector into this container. * * @param selector the new selector to add - * @return the selector that was added */ public void appendSelector(FileSelector selector) { selectorsList.addElement(selector); diff --git a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java index dfe5b04b0..e84e60eff 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java @@ -54,15 +54,14 @@ package org.apache.tools.ant.types.selectors; -import java.io.File; import java.io.BufferedReader; -import java.io.InputStreamReader; +import java.io.File; import java.io.FileInputStream; import java.io.IOException; - +import java.io.InputStreamReader; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Parameter; -import org.apache.tools.ant.BuildException; /** * Selector that filters files based on whether they contain a diff --git a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java index 215253aa1..cdeada858 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java @@ -58,11 +58,10 @@ import java.io.File; import java.text.DateFormat; import java.text.ParseException; import java.util.Locale; - import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Parameter; -import org.apache.tools.ant.taskdefs.condition.Os; /** * Selector that chooses files based on their last modified date. diff --git a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java index 0bcc09633..37799c629 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DependSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DependSelector.java @@ -55,12 +55,11 @@ package org.apache.tools.ant.types.selectors; import java.io.File; - -import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.IdentityMapper; -import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.types.Mapper; +import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.IdentityMapper; /** * Selector that filters files based on whether they are newer than diff --git a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java index 0742521cf..7d8ffc237 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java @@ -56,10 +56,8 @@ package org.apache.tools.ant.types.selectors; import java.io.File; import java.util.StringTokenizer; - -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.types.Parameter; /** * Selector that filters files based on the how deep in the directory diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java index 0d7fd10bc..a37ee39fc 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ExtendFileSelector.java @@ -54,8 +54,6 @@ package org.apache.tools.ant.types.selectors; -import java.io.File; - import org.apache.tools.ant.types.Parameterizable; /** diff --git a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java index 46533c31f..b46f97ce0 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java @@ -56,12 +56,10 @@ package org.apache.tools.ant.types.selectors; import java.io.File; import java.util.Vector; - -import org.apache.tools.ant.BuildException; import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.types.DataType; -import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Parameter; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; /** diff --git a/src/main/org/apache/tools/ant/types/selectors/FileSelector.java b/src/main/org/apache/tools/ant/types/selectors/FileSelector.java index f877ff7bc..00ca347f8 100644 --- a/src/main/org/apache/tools/ant/types/selectors/FileSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/FileSelector.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.types.selectors; import java.io.File; - import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java index 3c8b2b4f5..7b9c64ea0 100644 --- a/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.types.selectors; import java.io.File; - import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Parameter; diff --git a/src/main/org/apache/tools/ant/types/selectors/NotSelector.java b/src/main/org/apache/tools/ant/types/selectors/NotSelector.java index 7a16930e0..1c5dadcd2 100644 --- a/src/main/org/apache/tools/ant/types/selectors/NotSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/NotSelector.java @@ -54,8 +54,7 @@ package org.apache.tools.ant.types.selectors; -import java.io.File; -import java.util.Enumeration; + /** * This selector has one other selectors whose meaning it inverts. It diff --git a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java index 6adc381e2..6bf7cb67d 100644 --- a/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java @@ -55,12 +55,11 @@ package org.apache.tools.ant.types.selectors; import java.io.File; - +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Mapper; -import org.apache.tools.ant.util.IdentityMapper; import org.apache.tools.ant.util.FileNameMapper; -import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.IdentityMapper; /** * Selector that filters files based on whether they appear in another diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java index 535b537e0..eff32d153 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java @@ -54,12 +54,8 @@ package org.apache.tools.ant.types.selectors; -import java.io.File; import java.util.Enumeration; - import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Reference; /** * This selector just holds one other selector and forwards all diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java index 66382d811..865b95634 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java @@ -54,14 +54,8 @@ package org.apache.tools.ant.types.selectors; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Reference; - -import java.io.File; import java.util.Enumeration; -import java.util.Stack; -import java.util.Vector; +import org.apache.tools.ant.Project; /** * This is the interface for selectors that can contain other selectors. diff --git a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java index 1c9d7daec..73d26b7f4 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java @@ -58,8 +58,6 @@ import java.io.File; import java.util.StringTokenizer; import java.util.Vector; -import org.apache.tools.ant.BuildException; - /** *

This is a utility class used by selectors and DirectoryScanner. The * functionality more properly belongs just to selectors, but unfortunately diff --git a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java index 52e883da3..a6668fc75 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java @@ -55,10 +55,8 @@ package org.apache.tools.ant.types.selectors; import java.io.File; - import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Parameter; -import org.apache.tools.ant.BuildException; /** * Selector that filters files based on their size. diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java index 217ceb61e..c2b342153 100644 --- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java +++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java @@ -55,15 +55,14 @@ package org.apache.tools.ant.util; import java.io.IOException; -import java.io.Writer; import java.io.OutputStream; import java.io.OutputStreamWriter; - +import java.io.Writer; +import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Attr; -import org.w3c.dom.NodeList; import org.w3c.dom.Node; +import org.w3c.dom.NodeList; import org.w3c.dom.Text; /** diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index 6358005a9..7592af11a 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -67,21 +67,19 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; - import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; import java.text.DecimalFormat; import java.util.Random; import java.util.Stack; import java.util.StringTokenizer; import java.util.Vector; -import java.net.URL; -import java.net.MalformedURLException; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.filters.util.ChainReaderHelper; -import org.apache.tools.ant.types.FilterSetCollection; import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.types.FilterSetCollection; /** * This class also encapsulates methods which allow Files to be diff --git a/src/main/org/apache/tools/ant/util/JAXPUtils.java b/src/main/org/apache/tools/ant/util/JAXPUtils.java index 840daa566..62527dc4f 100644 --- a/src/main/org/apache/tools/ant/util/JAXPUtils.java +++ b/src/main/org/apache/tools/ant/util/JAXPUtils.java @@ -53,17 +53,15 @@ */ package org.apache.tools.ant.util; +import javax.xml.parsers.FactoryConfigurationError; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; import org.apache.tools.ant.BuildException; - import org.xml.sax.Parser; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.FactoryConfigurationError; - /** * Collection of helper methods that retrieve a ParserFactory or * Parsers and Readers. diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java index 343208d56..0f9ade607 100644 --- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java +++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java @@ -53,9 +53,9 @@ */ package org.apache.tools.ant.util; -import org.apache.tools.ant.taskdefs.condition.Os; import java.io.File; import java.util.Vector; +import org.apache.tools.ant.taskdefs.condition.Os; /** * A set of helper methods related to locating executables or checking diff --git a/src/main/org/apache/tools/ant/util/LoaderUtils.java b/src/main/org/apache/tools/ant/util/LoaderUtils.java index 0b903c244..53b229e43 100644 --- a/src/main/org/apache/tools/ant/util/LoaderUtils.java +++ b/src/main/org/apache/tools/ant/util/LoaderUtils.java @@ -54,7 +54,6 @@ package org.apache.tools.ant.util; import java.lang.reflect.InvocationTargetException; - import java.lang.reflect.Method; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java index bf1fd158d..08fad0144 100644 --- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java +++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java @@ -54,13 +54,11 @@ package org.apache.tools.ant.util; +import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.regexp.RegexpMatcher; import org.apache.tools.ant.util.regexp.RegexpMatcherFactory; - -import java.util.Vector; - /** * Implementation of FileNameMapper that does regular expression * replacements. diff --git a/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/src/main/org/apache/tools/ant/util/SourceFileScanner.java index 1277f2760..d25a3d0ab 100644 --- a/src/main/org/apache/tools/ant/util/SourceFileScanner.java +++ b/src/main/org/apache/tools/ant/util/SourceFileScanner.java @@ -54,13 +54,12 @@ package org.apache.tools.ant.util; +import java.io.File; +import java.util.Vector; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.condition.Os; -import java.io.File; -import java.util.Vector; - /** * Utility class that collects the functionality of the various * scanDir methods that have been scattered in several tasks before. diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java index 1e4bc56fb..db49db95c 100644 --- a/src/main/org/apache/tools/ant/util/StringUtils.java +++ b/src/main/org/apache/tools/ant/util/StringUtils.java @@ -53,8 +53,8 @@ */ package org.apache.tools.ant.util; -import java.io.StringWriter; import java.io.PrintWriter; +import java.io.StringWriter; import java.util.Vector; /** diff --git a/src/main/org/apache/tools/ant/util/TaskLogger.java b/src/main/org/apache/tools/ant/util/TaskLogger.java index 6e9ecad8e..34744dfaf 100644 --- a/src/main/org/apache/tools/ant/util/TaskLogger.java +++ b/src/main/org/apache/tools/ant/util/TaskLogger.java @@ -53,8 +53,8 @@ */ package org.apache.tools.ant.util; -import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; /** * A facade that makes logging nicers to use. diff --git a/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java index 3217d8d34..4298b334f 100644 --- a/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java @@ -55,7 +55,6 @@ package org.apache.tools.ant.util.depend; import java.io.File; import java.io.IOException; import java.util.Enumeration; - import org.apache.tools.ant.types.Path; /** diff --git a/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java index 9a88487c9..b785a9ee7 100644 --- a/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java +++ b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java @@ -53,9 +53,8 @@ */ package org.apache.tools.ant.util.optional; -import org.apache.tools.ant.ExitException; - import java.security.Permission; +import org.apache.tools.ant.ExitException; /** * This is intended as a replacement for the default system manager. diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java index 2e0cc2de6..ed65514ae 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java @@ -54,15 +54,12 @@ package org.apache.tools.ant.util.regexp; -import org.apache.tools.ant.BuildException; +import java.util.Vector; import org.apache.oro.text.regex.MatchResult; import org.apache.oro.text.regex.Pattern; import org.apache.oro.text.regex.Perl5Compiler; import org.apache.oro.text.regex.Perl5Matcher; - - - -import java.util.Vector; +import org.apache.tools.ant.BuildException; /** * Implementation of RegexpMatcher for Jakarta-ORO. diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java index 893755a2b..628d18f50 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java @@ -53,10 +53,10 @@ */ package org.apache.tools.ant.util.regexp; -import org.apache.tools.ant.BuildException; import org.apache.oro.text.regex.Perl5Substitution; import org.apache.oro.text.regex.Substitution; import org.apache.oro.text.regex.Util; +import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java index 97629d1cd..60e060aec 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java @@ -54,11 +54,10 @@ package org.apache.tools.ant.util.regexp; +import java.util.Vector; import org.apache.regexp.RE; import org.apache.regexp.RESyntaxException; - import org.apache.tools.ant.BuildException; -import java.util.Vector; /** * Implementation of RegexpMatcher for Jakarta-Regexp. diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java index f33ab6c7a..fcaeb9723 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java @@ -54,9 +54,9 @@ package org.apache.tools.ant.util.regexp; -import org.apache.tools.ant.BuildException; -import org.apache.regexp.RE; import java.util.Vector; +import org.apache.regexp.RE; +import org.apache.tools.ant.BuildException; /*** * Regular expression implementation using the Jakarta Regexp package diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java index f10a02cdc..a62a014cb 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java @@ -58,7 +58,6 @@ import java.util.Vector; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; - import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java index 69b64db23..5b84c4a6f 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java @@ -54,10 +54,9 @@ package org.apache.tools.ant.util.regexp; -import org.apache.tools.ant.BuildException; - import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.tools.ant.BuildException; /*** diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java index 3dd2c0e20..d743b7370 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java @@ -54,8 +54,8 @@ package org.apache.tools.ant.util.regexp; -import org.apache.tools.ant.BuildException; import java.util.Vector; +import org.apache.tools.ant.BuildException; /** * Interface describing a regular expression matcher.