diff options
Diffstat (limited to 'src/main/org/apache/tools')
417 files changed, 1031 insertions, 826 deletions
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index a6e923146..6098dec68 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -41,6 +41,8 @@ import java.util.jar.Attributes.Name; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; + +import org.apache.tools.ant.launch.Locator; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.CollectionUtils; import org.apache.tools.ant.util.FileUtils; @@ -48,7 +50,6 @@ import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.util.LoaderUtils; import org.apache.tools.ant.util.ReflectUtil; import org.apache.tools.ant.util.VectorSet; -import org.apache.tools.ant.launch.Locator; import org.apache.tools.zip.ZipLong; /** diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java index 7eee873c3..104820f17 100644 --- a/src/main/org/apache/tools/ant/AntTypeDefinition.java +++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java @@ -18,8 +18,8 @@ package org.apache.tools.ant; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; /** diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java index 132ac49f3..dbc604864 100644 --- a/src/main/org/apache/tools/ant/DefaultLogger.java +++ b/src/main/org/apache/tools/ant/DefaultLogger.java @@ -22,12 +22,12 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.PrintStream; import java.io.StringReader; -import java.util.Date; import java.text.DateFormat; +import java.util.Date; import org.apache.tools.ant.util.DateUtils; -import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.StringUtils; /** * Writes build events to a PrintStream. Currently, it diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java index e5cac0200..6389f6eef 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/src/main/org/apache/tools/ant/Diagnostics.java @@ -17,31 +17,32 @@ */ package org.apache.tools.ant; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.JAXPUtils; -import org.apache.tools.ant.util.ProxySetup; -import org.apache.tools.ant.util.JavaEnvUtils; -import org.apache.tools.ant.launch.Launcher; -import org.xml.sax.XMLReader; - -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.SAXParser; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.Transformer; import java.io.File; -import java.io.FilenameFilter; -import java.io.PrintStream; -import java.io.InputStream; -import java.io.IOException; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.net.URL; +import java.util.Calendar; import java.util.Enumeration; import java.util.Properties; -import java.util.Calendar; import java.util.TimeZone; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; + +import org.apache.tools.ant.launch.Launcher; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.JAXPUtils; +import org.apache.tools.ant.util.JavaEnvUtils; +import org.apache.tools.ant.util.ProxySetup; +import org.xml.sax.XMLReader; /** * A little diagnostic helper that output some information that may help diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index 79bc16115..e8a41abcc 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -23,17 +23,17 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; -import java.util.Hashtable; import java.util.HashMap; +import java.util.Hashtable; import java.util.List; import java.util.Locale; import java.util.Map; +import org.apache.tools.ant.taskdefs.PreSetDef; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.taskdefs.PreSetDef; import org.apache.tools.ant.util.StringUtils; /** diff --git a/src/main/org/apache/tools/ant/Location.java b/src/main/org/apache/tools/ant/Location.java index 25318694e..8e25d1079 100644 --- a/src/main/org/apache/tools/ant/Location.java +++ b/src/main/org/apache/tools/ant/Location.java @@ -19,6 +19,7 @@ package org.apache.tools.ant; import java.io.Serializable; + import org.apache.tools.ant.util.FileUtils; import org.xml.sax.Locator; diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 6be945d2f..c2ca785ac 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -24,7 +24,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/org/apache/tools/ant/PathTokenizer.java b/src/main/org/apache/tools/ant/PathTokenizer.java index 10d3e3794..6e6bea621 100644 --- a/src/main/org/apache/tools/ant/PathTokenizer.java +++ b/src/main/org/apache/tools/ant/PathTokenizer.java @@ -20,6 +20,7 @@ package org.apache.tools.ant; import java.io.File; import java.util.NoSuchElementException; import java.util.StringTokenizer; + import org.apache.tools.ant.taskdefs.condition.Os; /** diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index 2c54d757c..52a4da9ad 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -17,29 +17,30 @@ */ package org.apache.tools.ant; +import java.io.EOFException; import java.io.File; import java.io.IOException; -import java.io.EOFException; import java.io.InputStream; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Collections; import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; import java.util.Hashtable; +import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.Stack; import java.util.Vector; -import java.util.Set; -import java.util.HashSet; -import java.util.HashMap; -import java.util.Map; import java.util.WeakHashMap; + +import org.apache.tools.ant.helper.DefaultExecutor; import org.apache.tools.ant.input.DefaultInputHandler; import org.apache.tools.ant.input.InputHandler; -import org.apache.tools.ant.helper.DefaultExecutor; +import org.apache.tools.ant.types.Description; import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; -import org.apache.tools.ant.types.Description; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceFactory; diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java index 9ed40561c..26f68dfee 100644 --- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java +++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java @@ -28,10 +28,9 @@ import java.util.List; import java.util.Map.Entry; import org.apache.tools.ant.attribute.EnableAttribute; - -import org.apache.tools.ant.util.CollectionUtils; import org.apache.tools.ant.taskdefs.MacroDef.Attribute; import org.apache.tools.ant.taskdefs.MacroInstance; +import org.apache.tools.ant.util.CollectionUtils; import org.xml.sax.AttributeList; import org.xml.sax.helpers.AttributeListImpl; diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java index 08abe6390..0d08eb0e8 100644 --- a/src/main/org/apache/tools/ant/Task.java +++ b/src/main/org/apache/tools/ant/Task.java @@ -18,10 +18,10 @@ package org.apache.tools.ant; -import org.apache.tools.ant.dispatch.DispatchUtils; - -import java.util.Enumeration; import java.io.IOException; +import java.util.Enumeration; + +import org.apache.tools.ant.dispatch.DispatchUtils; /** * Base class for all tasks. diff --git a/src/main/org/apache/tools/ant/TaskAdapter.java b/src/main/org/apache/tools/ant/TaskAdapter.java index e5d07e12c..3a3001f62 100644 --- a/src/main/org/apache/tools/ant/TaskAdapter.java +++ b/src/main/org/apache/tools/ant/TaskAdapter.java @@ -19,8 +19,9 @@ package org.apache.tools.ant; import java.lang.reflect.Method; -import org.apache.tools.ant.dispatch.Dispatchable; + import org.apache.tools.ant.dispatch.DispatchUtils; +import org.apache.tools.ant.dispatch.Dispatchable; /** * Uses introspection to "adapt" an arbitrary Bean which doesn't diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java index fd919ab66..88cd4989d 100644 --- a/src/main/org/apache/tools/ant/UnknownElement.java +++ b/src/main/org/apache/tools/ant/UnknownElement.java @@ -18,12 +18,13 @@ package org.apache.tools.ant; +import java.io.IOException; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.io.IOException; + import org.apache.tools.ant.taskdefs.PreSetDef; /** diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java index b99882186..a96e04fc3 100644 --- a/src/main/org/apache/tools/ant/XmlLogger.java +++ b/src/main/org/apache/tools/ant/XmlLogger.java @@ -23,9 +23,10 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintStream; import java.io.Writer; +import java.util.Enumeration; import java.util.Hashtable; import java.util.Stack; -import java.util.Enumeration; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java index be4b625b9..1a7c1f98a 100644 --- a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java +++ b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java @@ -17,13 +17,13 @@ */ package org.apache.tools.ant.dispatch; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.UnknownElement; -import org.apache.tools.ant.Task; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.UnknownElement; + /** * Determines and Executes the action method for the task. */ diff --git a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java index 13ece3442..3b3b02706 100644 --- a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java +++ b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java @@ -21,6 +21,7 @@ import java.io.FilterReader; import java.io.IOException; import java.io.Reader; import java.io.StringReader; + import org.apache.tools.ant.Project; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java index 288aa9a97..54bc9ff92 100644 --- a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java +++ b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.filters; import java.io.Reader; + import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.types.Parameterizable; diff --git a/src/main/org/apache/tools/ant/filters/ClassConstants.java b/src/main/org/apache/tools/ant/filters/ClassConstants.java index 0e92f4836..354430123 100644 --- a/src/main/org/apache/tools/ant/filters/ClassConstants.java +++ b/src/main/org/apache/tools/ant/filters/ClassConstants.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.Reader; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.ResourceUtils; diff --git a/src/main/org/apache/tools/ant/filters/ConcatFilter.java b/src/main/org/apache/tools/ant/filters/ConcatFilter.java index a7b080cb3..391a1ef66 100644 --- a/src/main/org/apache/tools/ant/filters/ConcatFilter.java +++ b/src/main/org/apache/tools/ant/filters/ConcatFilter.java @@ -17,11 +17,12 @@ */ package org.apache.tools.ant.filters; -import java.io.IOException; -import java.io.Reader; -import java.io.File; import java.io.BufferedReader; +import java.io.File; import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; + import org.apache.tools.ant.types.Parameter; /** diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java index 03608ec1d..055720072 100644 --- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java +++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java b/src/main/org/apache/tools/ant/filters/HeadFilter.java index 41eee039d..522fe57b5 100644 --- a/src/main/org/apache/tools/ant/filters/HeadFilter.java +++ b/src/main/org/apache/tools/ant/filters/HeadFilter.java @@ -19,8 +19,9 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; -import org.apache.tools.ant.util.LineTokenizer; + import org.apache.tools.ant.types.Parameter; +import org.apache.tools.ant.util.LineTokenizer; /** * Reads the first <code>n</code> lines of a stream. diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java index 453667bc2..c83cae283 100644 --- a/src/main/org/apache/tools/ant/filters/LineContains.java +++ b/src/main/org/apache/tools/ant/filters/LineContains.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; import java.util.Vector; + import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Parameter; diff --git a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java index a597d0b23..23a2005dd 100644 --- a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java +++ b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; import java.util.Vector; + import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.types.RegularExpression; diff --git a/src/main/org/apache/tools/ant/filters/PrefixLines.java b/src/main/org/apache/tools/ant/filters/PrefixLines.java index babb82484..324397e8b 100644 --- a/src/main/org/apache/tools/ant/filters/PrefixLines.java +++ b/src/main/org/apache/tools/ant/filters/PrefixLines.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; + import org.apache.tools.ant.types.Parameter; /** diff --git a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java index efef83b72..21ca3bc91 100644 --- a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java +++ b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.filters; import java.io.File; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.Reader; import java.util.Enumeration; import java.util.Hashtable; diff --git a/src/main/org/apache/tools/ant/filters/StripLineBreaks.java b/src/main/org/apache/tools/ant/filters/StripLineBreaks.java index 1ebda6330..9a97940a8 100644 --- a/src/main/org/apache/tools/ant/filters/StripLineBreaks.java +++ b/src/main/org/apache/tools/ant/filters/StripLineBreaks.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; + import org.apache.tools.ant.types.Parameter; /** diff --git a/src/main/org/apache/tools/ant/filters/StripLineComments.java b/src/main/org/apache/tools/ant/filters/StripLineComments.java index f2a2f6e02..e3d240bad 100644 --- a/src/main/org/apache/tools/ant/filters/StripLineComments.java +++ b/src/main/org/apache/tools/ant/filters/StripLineComments.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; import java.util.Vector; + import org.apache.tools.ant.types.Parameter; /** diff --git a/src/main/org/apache/tools/ant/filters/SuffixLines.java b/src/main/org/apache/tools/ant/filters/SuffixLines.java index d2a211178..23d9b534b 100644 --- a/src/main/org/apache/tools/ant/filters/SuffixLines.java +++ b/src/main/org/apache/tools/ant/filters/SuffixLines.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; + import org.apache.tools.ant.types.Parameter; /** diff --git a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java index ea6125136..adaaa7afe 100644 --- a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java +++ b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; + import org.apache.tools.ant.types.Parameter; /** diff --git a/src/main/org/apache/tools/ant/filters/TailFilter.java b/src/main/org/apache/tools/ant/filters/TailFilter.java index 0134f976d..fcc84d168 100644 --- a/src/main/org/apache/tools/ant/filters/TailFilter.java +++ b/src/main/org/apache/tools/ant/filters/TailFilter.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; import java.util.LinkedList; + import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.util.LineTokenizer; diff --git a/src/main/org/apache/tools/ant/filters/TokenFilter.java b/src/main/org/apache/tools/ant/filters/TokenFilter.java index cdfcd0656..ebad76027 100644 --- a/src/main/org/apache/tools/ant/filters/TokenFilter.java +++ b/src/main/org/apache/tools/ant/filters/TokenFilter.java @@ -19,15 +19,16 @@ package org.apache.tools.ant.filters; import java.io.IOException; import java.io.Reader; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.types.RegularExpression; import org.apache.tools.ant.types.Substitution; -import org.apache.tools.ant.util.Tokenizer; import org.apache.tools.ant.util.LineTokenizer; import org.apache.tools.ant.util.StringUtils; +import org.apache.tools.ant.util.Tokenizer; import org.apache.tools.ant.util.regexp.Regexp; import org.apache.tools.ant.util.regexp.RegexpUtil; 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 b8230a651..f176c331b 100644 --- a/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Vector; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; 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 1b1c64c40..1b87b9c0d 100644 --- a/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java +++ b/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java @@ -19,10 +19,10 @@ package org.apache.tools.ant.filters.util; import java.io.ByteArrayInputStream; import java.io.IOException; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.JavaClass; + +import com.sun.org.apache.bcel.internal.classfile.ClassParser; +import com.sun.org.apache.bcel.internal.classfile.ConstantValue; +import com.sun.org.apache.bcel.internal.classfile.JavaClass; // CheckStyle:HideUtilityClassConstructorCheck OFF - bc /** diff --git a/src/main/org/apache/tools/ant/helper/AntXMLContext.java b/src/main/org/apache/tools/ant/helper/AntXMLContext.java index a8c373224..99e3d1a1e 100644 --- a/src/main/org/apache/tools/ant/helper/AntXMLContext.java +++ b/src/main/org/apache/tools/ant/helper/AntXMLContext.java @@ -26,15 +26,14 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import org.xml.sax.Locator; -import org.xml.sax.Attributes; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; import org.apache.tools.ant.RuntimeConfigurable; import org.apache.tools.ant.Target; import org.apache.tools.ant.util.FileUtils; +import org.xml.sax.Attributes; +import org.xml.sax.Locator; /** * Context information for the ant processing. diff --git a/src/main/org/apache/tools/ant/helper/DefaultExecutor.java b/src/main/org/apache/tools/ant/helper/DefaultExecutor.java index d4099b4e2..cdbc587ce 100644 --- a/src/main/org/apache/tools/ant/helper/DefaultExecutor.java +++ b/src/main/org/apache/tools/ant/helper/DefaultExecutor.java @@ -18,9 +18,9 @@ package org.apache.tools.ant.helper; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Executor; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Executor; +import org.apache.tools.ant.Project; /** * Default Target executor implementation. Runs each target individually diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index 0c1f883cf..67e1decb9 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java @@ -17,6 +17,19 @@ */ package org.apache.tools.ant.helper; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.net.URLConnection; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; +import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ExtensionPoint; import org.apache.tools.ant.Location; @@ -41,19 +54,6 @@ import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.URL; -import java.net.URLConnection; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; -import java.util.Stack; - /** * Sax2 based project reader * diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java index d35fabf1c..f828d2926 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java @@ -23,6 +23,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Locale; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.IntrospectionHelper; import org.apache.tools.ant.Location; @@ -31,8 +32,8 @@ import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.RuntimeConfigurable; import org.apache.tools.ant.Target; import org.apache.tools.ant.Task; -import org.apache.tools.ant.TypeAdapter; import org.apache.tools.ant.TaskContainer; +import org.apache.tools.ant.TypeAdapter; import org.apache.tools.ant.UnknownElement; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.JAXPUtils; diff --git a/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java b/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java index 44c950357..1960ed033 100644 --- a/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java +++ b/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java @@ -19,9 +19,9 @@ package org.apache.tools.ant.helper; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Executor; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Executor; +import org.apache.tools.ant.Project; /** diff --git a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java index efbee84d6..548ebffeb 100644 --- a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java +++ b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java @@ -22,6 +22,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.KeepAliveInputStream; diff --git a/src/main/org/apache/tools/ant/input/GreedyInputHandler.java b/src/main/org/apache/tools/ant/input/GreedyInputHandler.java index c0e24c0ff..cb52f4f02 100644 --- a/src/main/org/apache/tools/ant/input/GreedyInputHandler.java +++ b/src/main/org/apache/tools/ant/input/GreedyInputHandler.java @@ -18,8 +18,9 @@ package org.apache.tools.ant.input; -import java.io.InputStream; import java.io.ByteArrayOutputStream; +import java.io.InputStream; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.StreamPumper; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java index a9797ecae..e1e3cf113 100644 --- a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java +++ b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.input; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; + import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java index bf10c1577..ab05903fd 100644 --- a/src/main/org/apache/tools/ant/launch/Launcher.java +++ b/src/main/org/apache/tools/ant/launch/Launcher.java @@ -17,13 +17,13 @@ */ package org.apache.tools.ant.launch; +import java.io.File; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import java.net.MalformedURLException; -import java.io.File; -import java.util.StringTokenizer; -import java.util.List; import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java index 2b8ea89ca..5847f5c53 100644 --- a/src/main/org/apache/tools/ant/launch/Locator.java +++ b/src/main/org/apache/tools/ant/launch/Locator.java @@ -17,12 +17,12 @@ */ package org.apache.tools.ant.launch; -import java.net.MalformedURLException; -import java.net.URL; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FilenameFilter; -import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; import java.text.CharacterIterator; import java.text.StringCharacterIterator; import java.util.Locale; diff --git a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java index f6a988caa..08c1ebddf 100644 --- a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java +++ b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; import java.util.Properties; + import org.apache.tools.ant.DefaultLogger; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/listener/BigProjectLogger.java b/src/main/org/apache/tools/ant/listener/BigProjectLogger.java index 8ee1195b2..865127d29 100644 --- a/src/main/org/apache/tools/ant/listener/BigProjectLogger.java +++ b/src/main/org/apache/tools/ant/listener/BigProjectLogger.java @@ -17,13 +17,13 @@ */ package org.apache.tools.ant.listener; +import java.io.File; + import org.apache.tools.ant.BuildEvent; -import org.apache.tools.ant.SubBuildListener; import org.apache.tools.ant.Project; +import org.apache.tools.ant.SubBuildListener; import org.apache.tools.ant.util.StringUtils; -import java.io.File; - /** * This is a special logger that is designed to make it easier to work * with big projects, those that use imports and diff --git a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java index c48087a3b..57f53a93d 100644 --- a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java +++ b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java @@ -18,18 +18,18 @@ package org.apache.tools.ant.listener; -import org.apache.commons.logging.Log; +import java.io.PrintStream; + import org.apache.commons.logging.LogConfigurationException; import org.apache.commons.logging.LogFactory; - +import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.BuildLogger; -import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.UnknownElement; -import java.io.PrintStream; +import sun.rmi.runtime.Log; /** * Jakarta Commons Logging listener. diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java index 3e9e54510..5e8acaa87 100644 --- a/src/main/org/apache/tools/ant/listener/Log4jListener.java +++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java @@ -18,7 +18,6 @@ package org.apache.tools.ant.listener; -import org.apache.log4j.Logger; import org.apache.log4j.helpers.NullEnumeration; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java index 653470808..8c0fff883 100644 --- a/src/main/org/apache/tools/ant/listener/MailLogger.java +++ b/src/main/org/apache/tools/ant/listener/MailLogger.java @@ -22,11 +22,11 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.util.Enumeration; import java.util.Hashtable; -import java.util.Vector; import java.util.Properties; -import java.util.Enumeration; import java.util.StringTokenizer; +import java.util.Vector; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildException; @@ -34,8 +34,8 @@ import org.apache.tools.ant.DefaultLogger; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.email.EmailAddress; import org.apache.tools.ant.taskdefs.email.Header; -import org.apache.tools.ant.taskdefs.email.Message; import org.apache.tools.ant.taskdefs.email.Mailer; +import org.apache.tools.ant.taskdefs.email.Message; import org.apache.tools.ant.util.ClasspathUtils; import org.apache.tools.ant.util.DateUtils; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/loader/AntClassLoader5.java b/src/main/org/apache/tools/ant/loader/AntClassLoader5.java index f41cef398..a91ed41e1 100644 --- a/src/main/org/apache/tools/ant/loader/AntClassLoader5.java +++ b/src/main/org/apache/tools/ant/loader/AntClassLoader5.java @@ -18,10 +18,10 @@ package org.apache.tools.ant.loader; -import java.util.Enumeration; import java.io.Closeable; import java.io.IOException; import java.net.URL; +import java.util.Enumeration; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/property/LocalProperties.java b/src/main/org/apache/tools/ant/property/LocalProperties.java index fb2fa9c0a..c9ce3af0c 100644 --- a/src/main/org/apache/tools/ant/property/LocalProperties.java +++ b/src/main/org/apache/tools/ant/property/LocalProperties.java @@ -17,9 +17,9 @@ */ package org.apache.tools.ant.property; -import org.apache.tools.ant.PropertyHelper; -import org.apache.tools.ant.Project; import org.apache.tools.ant.MagicNames; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.PropertyHelper; /** * Thread local class containing local properties. diff --git a/src/main/org/apache/tools/ant/property/ParseProperties.java b/src/main/org/apache/tools/ant/property/ParseProperties.java index a1f6f3cc1..f03f966e2 100644 --- a/src/main/org/apache/tools/ant/property/ParseProperties.java +++ b/src/main/org/apache/tools/ant/property/ParseProperties.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.property; import java.text.ParsePosition; import java.util.Collection; + import org.apache.tools.ant.Project; /** diff --git a/src/main/org/apache/tools/ant/property/PropertyExpander.java b/src/main/org/apache/tools/ant/property/PropertyExpander.java index 9df8f31b0..a2b4d6336 100644 --- a/src/main/org/apache/tools/ant/property/PropertyExpander.java +++ b/src/main/org/apache/tools/ant/property/PropertyExpander.java @@ -17,10 +17,10 @@ */ package org.apache.tools.ant.property; -import org.apache.tools.ant.PropertyHelper; - import java.text.ParsePosition; +import org.apache.tools.ant.PropertyHelper; + /** * Responsible for locating a property reference inside a String. * @since Ant 1.8.0 diff --git a/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java b/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java index ca53e99d4..5bdd35453 100644 --- a/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java +++ b/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java @@ -17,13 +17,13 @@ */ package org.apache.tools.ant.property; +import java.util.Collection; +import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.HashSet; -import java.util.Collection; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; /** * Class to resolve properties in a map. This class is explicitly not threadsafe. diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index 9cfaf5c10..1ce81166f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -27,13 +27,14 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Environment; -import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.StringUtils; /** * original Cvs.java 1.20 diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 1620113cd..7155f4206 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -28,6 +28,7 @@ import java.io.UnsupportedEncodingException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.IntrospectionHelper; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/Apt.java b/src/main/org/apache/tools/ant/taskdefs/Apt.java index 5b76b5843..52154a8c0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Apt.java +++ b/src/main/org/apache/tools/ant/taskdefs/Apt.java @@ -17,16 +17,16 @@ */ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.Project; +import java.io.File; +import java.util.Vector; + import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.compilers.AptExternalCompilerAdapter; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.JavaEnvUtils; -import java.util.Vector; -import java.io.File; - /** * Apt Task for running the Annotation processing tool for JDK 1.5. It derives * from the existing Javac task, and forces the compiler based on whether we're diff --git a/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java b/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java index 7ac233f49..150b7288b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java @@ -18,9 +18,9 @@ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.ProjectHelper; -import org.apache.tools.ant.ComponentHelper; import org.apache.tools.ant.AntTypeDefinition; +import org.apache.tools.ant.ComponentHelper; +import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.attribute.AttributeNamespace; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java index 2fcb2967a..816568e00 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java index 0129fea2f..323b738cf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java +++ b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java @@ -23,6 +23,7 @@ import java.io.BufferedInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.bzip2.CBZip2InputStream; diff --git a/src/main/org/apache/tools/ant/taskdefs/BZip2.java b/src/main/org/apache/tools/ant/taskdefs/BZip2.java index 59785c477..f5944df5f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BZip2.java +++ b/src/main/org/apache/tools/ant/taskdefs/BZip2.java @@ -22,6 +22,7 @@ package org.apache.tools.ant.taskdefs; import java.io.BufferedOutputStream; import java.io.FileOutputStream; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.bzip2.CBZip2OutputStream; diff --git a/src/main/org/apache/tools/ant/taskdefs/Basename.java b/src/main/org/apache/tools/ant/taskdefs/Basename.java index 9d87b2e96..0415af70f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Basename.java +++ b/src/main/org/apache/tools/ant/taskdefs/Basename.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java b/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java index 4a9b0aa71..aee071d31 100644 --- a/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java +++ b/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java @@ -22,9 +22,10 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.Properties; + import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; import org.apache.tools.ant.util.FileUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java index 25c3752b9..53f5d3e02 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java +++ b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java @@ -24,6 +24,7 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java index 524855525..d8a0e8c84 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java +++ b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java @@ -20,8 +20,8 @@ package org.apache.tools.ant.taskdefs; import java.io.IOException; -import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; import org.apache.tools.ant.types.PropertySet; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 802c1c08b..7a94ca098 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -17,23 +17,23 @@ */ package org.apache.tools.ant.taskdefs; -import java.security.DigestInputStream; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; +import java.io.BufferedReader; import java.io.File; -import java.io.FileOutputStream; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.FileReader; -import java.io.BufferedReader; import java.io.IOException; +import java.security.DigestInputStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.text.MessageFormat; +import java.text.ParseException; +import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; -import java.util.Map; import java.util.Hashtable; -import java.util.Arrays; -import java.text.MessageFormat; -import java.text.ParseException; +import java.util.Map; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -43,8 +43,8 @@ import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.FileProvider; -import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.types.resources.Restrict; +import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.types.resources.selectors.Type; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.StringUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java index 0c8ac376a..ac0c3d8d1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Chmod.java +++ b/src/main/org/apache/tools/ant/taskdefs/Chmod.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.condition.Os; diff --git a/src/main/org/apache/tools/ant/taskdefs/Classloader.java b/src/main/org/apache/tools/ant/taskdefs/Classloader.java index 8183415bc..8a5967c70 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Classloader.java +++ b/src/main/org/apache/tools/ant/taskdefs/Classloader.java @@ -18,15 +18,15 @@ package org.apache.tools.ant.taskdefs; +import java.io.File; + +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.MagicNames; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.MagicNames; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Path; - -import java.io.File; +import org.apache.tools.ant.types.Reference; /** * EXPERIMENTAL diff --git a/src/main/org/apache/tools/ant/taskdefs/CloseResources.java b/src/main/org/apache/tools/ant/taskdefs/CloseResources.java index 07b93a778..6916abcc5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CloseResources.java +++ b/src/main/org/apache/tools/ant/taskdefs/CloseResources.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.IOException; import java.net.URL; + import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index 0907fdff9..1338f2a4b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -17,40 +17,40 @@ */ package org.apache.tools.ant.taskdefs; +import java.io.BufferedReader; import java.io.File; -import java.io.Reader; -import java.io.Writer; +import java.io.FileInputStream; import java.io.FileReader; -import java.io.InputStream; import java.io.IOException; -import java.io.StringReader; -import java.io.BufferedReader; -import java.io.FileInputStream; +import java.io.InputStream; import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.io.Writer; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.Vector; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; +import org.apache.tools.ant.Task; import org.apache.tools.ant.filters.util.ChainReaderHelper; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileList; +import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterChain; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.Intersect; import org.apache.tools.ant.types.resources.LogOutputResource; -import org.apache.tools.ant.types.resources.Restrict; import org.apache.tools.ant.types.resources.Resources; +import org.apache.tools.ant.types.resources.Restrict; import org.apache.tools.ant.types.resources.StringResource; -import org.apache.tools.ant.types.resources.selectors.Not; import org.apache.tools.ant.types.resources.selectors.Exists; +import org.apache.tools.ant.types.resources.selectors.Not; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; import org.apache.tools.ant.types.selectors.SelectorUtils; import org.apache.tools.ant.util.ConcatResourceInputStream; diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index c17ea458f..e6f9cbd84 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -27,27 +27,28 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Vector; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.types.Mapper; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterChain; +import org.apache.tools.ant.types.FilterSet; import org.apache.tools.ant.types.FilterSetCollection; +import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.ResourceFactory; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.FlatFileNameMapper; import org.apache.tools.ant.util.IdentityMapper; import org.apache.tools.ant.util.LinkedHashtable; import org.apache.tools.ant.util.ResourceUtils; import org.apache.tools.ant.util.SourceFileScanner; -import org.apache.tools.ant.util.FlatFileNameMapper; /** * <p>Copies a file or directory to a new file diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java index 5670215dc..53596fd98 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java +++ b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java @@ -18,16 +18,16 @@ package org.apache.tools.ant.taskdefs; +import java.io.File; +import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; - -import java.io.File; -import java.io.IOException; +import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.FileUtils; /** * Copy the contents of a path to a destination, using the mapper of choice diff --git a/src/main/org/apache/tools/ant/taskdefs/Copyfile.java b/src/main/org/apache/tools/ant/taskdefs/Copyfile.java index e7452a69a..e9acb1d6a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copyfile.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copyfile.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java b/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java index 2e399ffb8..6b912e2fc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java +++ b/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java @@ -18,10 +18,10 @@ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; import org.apache.tools.ant.util.StringUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Definer.java b/src/main/org/apache/tools/ant/taskdefs/Definer.java index 894bc9356..8196fa515 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Definer.java +++ b/src/main/org/apache/tools/ant/taskdefs/Definer.java @@ -30,14 +30,14 @@ import java.util.Map; import java.util.Properties; import org.apache.tools.ant.AntTypeDefinition; -import org.apache.tools.ant.ComponentHelper; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ComponentHelper; import org.apache.tools.ant.Location; +import org.apache.tools.ant.MagicNames; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; -import org.apache.tools.ant.MagicNames; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.util.FileUtils; /** * Base class for Taskdef and Typedef - handles all diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index fbbd72535..6c34ccf2f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -20,44 +20,44 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.Arrays; -import java.util.Vector; -import java.util.Iterator; import java.util.Comparator; +import java.util.Iterator; +import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.PatternSet; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.FileProvider; -import org.apache.tools.ant.types.resources.Sort; -import org.apache.tools.ant.types.resources.Restrict; -import org.apache.tools.ant.types.resources.Resources; import org.apache.tools.ant.types.resources.FileResourceIterator; -import org.apache.tools.ant.types.resources.comparators.Reverse; +import org.apache.tools.ant.types.resources.Resources; +import org.apache.tools.ant.types.resources.Restrict; +import org.apache.tools.ant.types.resources.Sort; import org.apache.tools.ant.types.resources.comparators.FileSystem; import org.apache.tools.ant.types.resources.comparators.ResourceComparator; +import org.apache.tools.ant.types.resources.comparators.Reverse; import org.apache.tools.ant.types.resources.selectors.Exists; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; -import org.apache.tools.ant.types.selectors.OrSelector; import org.apache.tools.ant.types.selectors.AndSelector; -import org.apache.tools.ant.types.selectors.NotSelector; +import org.apache.tools.ant.types.selectors.ContainsRegexpSelector; +import org.apache.tools.ant.types.selectors.ContainsSelector; import org.apache.tools.ant.types.selectors.DateSelector; -import org.apache.tools.ant.types.selectors.FileSelector; -import org.apache.tools.ant.types.selectors.NoneSelector; -import org.apache.tools.ant.types.selectors.SizeSelector; -import org.apache.tools.ant.types.selectors.DepthSelector; import org.apache.tools.ant.types.selectors.DependSelector; +import org.apache.tools.ant.types.selectors.DepthSelector; import org.apache.tools.ant.types.selectors.ExtendSelector; -import org.apache.tools.ant.types.selectors.SelectSelector; -import org.apache.tools.ant.types.selectors.PresentSelector; -import org.apache.tools.ant.types.selectors.ContainsSelector; +import org.apache.tools.ant.types.selectors.FileSelector; import org.apache.tools.ant.types.selectors.FilenameSelector; import org.apache.tools.ant.types.selectors.MajoritySelector; -import org.apache.tools.ant.types.selectors.ContainsRegexpSelector; +import org.apache.tools.ant.types.selectors.NoneSelector; +import org.apache.tools.ant.types.selectors.NotSelector; +import org.apache.tools.ant.types.selectors.OrSelector; +import org.apache.tools.ant.types.selectors.PresentSelector; +import org.apache.tools.ant.types.selectors.SelectSelector; +import org.apache.tools.ant.types.selectors.SizeSelector; import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.SymbolicLinkUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/Deltree.java b/src/main/org/apache/tools/ant/taskdefs/Deltree.java index 5fb022111..098d6e5f2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Deltree.java +++ b/src/main/org/apache/tools/ant/taskdefs/Deltree.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 87f390b5e..dc42beb1a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -21,22 +21,23 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.util.Date; import java.util.Iterator; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileList; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.types.TimeComparison; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.resources.Union; -import org.apache.tools.ant.types.resources.Restrict; +import org.apache.tools.ant.types.TimeComparison; import org.apache.tools.ant.types.resources.Resources; -import org.apache.tools.ant.types.resources.selectors.Not; +import org.apache.tools.ant.types.resources.Restrict; +import org.apache.tools.ant.types.resources.Union; +import org.apache.tools.ant.types.resources.comparators.ResourceComparator; +import org.apache.tools.ant.types.resources.comparators.Reverse; import org.apache.tools.ant.types.resources.selectors.Exists; +import org.apache.tools.ant.types.resources.selectors.Not; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; -import org.apache.tools.ant.types.resources.comparators.Reverse; -import org.apache.tools.ant.types.resources.comparators.ResourceComparator; /** * Examines and removes out of date target files. If any of the target files diff --git a/src/main/org/apache/tools/ant/taskdefs/Dirname.java b/src/main/org/apache/tools/ant/taskdefs/Dirname.java index b7081bf01..9e085e7a6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Dirname.java +++ b/src/main/org/apache/tools/ant/taskdefs/Dirname.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/Echo.java b/src/main/org/apache/tools/ant/taskdefs/Echo.java index 2086b41dc..ac31ee329 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Echo.java +++ b/src/main/org/apache/tools/ant/taskdefs/Echo.java @@ -24,14 +24,14 @@ import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.util.ResourceUtils; -import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.types.LogLevel; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.LogOutputResource; import org.apache.tools.ant.types.resources.StringResource; +import org.apache.tools.ant.util.ResourceUtils; +import org.apache.tools.ant.util.StringUtils; /** * Writes a message to the Ant logging facilities. diff --git a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java index f5a210f58..3aac33abe 100644 --- a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java +++ b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java @@ -18,18 +18,17 @@ package org.apache.tools.ant.taskdefs; import java.io.File; -import java.io.OutputStream; import java.io.FileOutputStream; +import java.io.OutputStream; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.util.XMLFragment; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.util.FileUtils; - -import org.w3c.dom.Node; +import org.apache.tools.ant.util.XMLFragment; import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * Echo XML. diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java index c87335d64..dd93978fe 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.util.Locale; import java.util.Map; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java index 6f4d94922..b78b9a6a5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -24,6 +24,7 @@ import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index 20a755b5f..18cbd29de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -22,11 +22,12 @@ import java.io.File; import java.io.IOException; import java.util.HashSet; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.AbstractFileSet; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.DirSet; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileList; diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 0eca50952..f48f2484d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java @@ -18,11 +18,11 @@ package org.apache.tools.ant.taskdefs; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ExitStatusException; import org.apache.tools.ant.Project; import org.apache.tools.ant.PropertyHelper; import org.apache.tools.ant.Task; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.ExitStatusException; import org.apache.tools.ant.taskdefs.condition.Condition; import org.apache.tools.ant.taskdefs.condition.ConditionBase; diff --git a/src/main/org/apache/tools/ant/taskdefs/Filter.java b/src/main/org/apache/tools/ant/taskdefs/Filter.java index 48fd19f2d..390ba5bfd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Filter.java +++ b/src/main/org/apache/tools/ant/taskdefs/Filter.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java index 2719afd9a..465bf462b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java @@ -18,23 +18,24 @@ package org.apache.tools.ant.taskdefs; +import java.io.BufferedReader; import java.io.File; -import java.io.Reader; +import java.io.FileInputStream; import java.io.FileReader; import java.io.IOException; -import java.io.BufferedReader; -import java.io.FileInputStream; import java.io.InputStreamReader; -import java.util.Vector; +import java.io.Reader; import java.util.Enumeration; import java.util.NoSuchElementException; -import org.apache.tools.ant.Project; +import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.filters.FixCrLfFilter; +import org.apache.tools.ant.Project; import org.apache.tools.ant.filters.ChainableReader; -import org.apache.tools.ant.types.FilterChain; +import org.apache.tools.ant.filters.FixCrLfFilter; import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.types.FilterChain; import org.apache.tools.ant.util.FileUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java index 30e70cce6..13e88034c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GUnzip.java +++ b/src/main/org/apache/tools/ant/taskdefs/GUnzip.java @@ -22,6 +22,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.zip.GZIPInputStream; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/GZip.java b/src/main/org/apache/tools/ant/taskdefs/GZip.java index 5d02b20a2..029f414dc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GZip.java +++ b/src/main/org/apache/tools/ant/taskdefs/GZip.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs; import java.io.FileOutputStream; import java.io.IOException; import java.util.zip.GZIPOutputStream; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java index 9f0413c34..69e719ce7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs; import java.util.Enumeration; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Commandline; diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java index d2191e8ca..6b82a3647 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java @@ -18,9 +18,14 @@ package org.apache.tools.ant.taskdefs; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Vector; + import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.ProjectHelperRepository; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Resource; @@ -32,11 +37,6 @@ import org.apache.tools.ant.types.resources.URLResource; import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.util.FileUtils; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Vector; - /** * Task to import another build file into the current project. * <p> diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index 30c5738ff..5e065bc3d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -23,21 +23,22 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ExitException; +import org.apache.tools.ant.ExitStatusException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.ExitStatusException; +import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.types.Assertions; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.CommandlineJava; import org.apache.tools.ant.types.Environment; import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.PropertySet; -import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.types.Assertions; import org.apache.tools.ant.types.Permissions; +import org.apache.tools.ant.types.PropertySet; import org.apache.tools.ant.types.RedirectorElement; -import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.KeepAliveInputStream; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java index f6181e8b6..18bce30cf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; + import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java index cf500713e..6ff67c040 100644 --- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java +++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java @@ -26,6 +26,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.Hashtable; import java.util.StringTokenizer; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/Length.java b/src/main/org/apache/tools/ant/taskdefs/Length.java index d0894ec29..bd4da4424 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Length.java +++ b/src/main/org/apache/tools/ant/taskdefs/Length.java @@ -19,20 +19,20 @@ package org.apache.tools.ant.taskdefs; import java.io.File; -import java.io.PrintStream; import java.io.OutputStream; +import java.io.PrintStream; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.condition.Condition; +import org.apache.tools.ant.types.Comparison; +import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.types.Comparison; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.resources.Resources; import org.apache.tools.ant.types.resources.FileResource; +import org.apache.tools.ant.types.resources.Resources; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.PropertyOutputStream; diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java index 235bca405..c450a0e84 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; + import org.apache.tools.ant.types.resources.FileResource; diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java index bb5bd0dcc..4c20c7c90 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java @@ -25,15 +25,16 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.Properties; import java.util.Vector; -import org.apache.tools.ant.Project; + import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.filters.util.ChainReaderHelper; +import org.apache.tools.ant.types.FilterChain; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.FilterChain; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.JavaResource; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java index 4cd109d0e..f68b5ba4c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadResource.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadResource.java @@ -23,6 +23,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java index ac9571959..ed16cf36f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java index 7666bad68..b38e1c690 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java @@ -19,10 +19,10 @@ package org.apache.tools.ant.taskdefs; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Locale; -import java.util.HashMap; +import java.util.Map; import org.apache.tools.ant.AntTypeDefinition; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java index f347b46b9..32b1a1a25 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java @@ -19,16 +19,16 @@ package org.apache.tools.ant.taskdefs; import java.util.ArrayList; -import java.util.List; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Hashtable; import java.util.Iterator; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import java.util.HashSet; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Enumeration; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DynamicAttribute; diff --git a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java index 3dc0fe46d..2f4eec0fd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java +++ b/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java @@ -18,18 +18,18 @@ package org.apache.tools.ant.taskdefs; +import java.io.File; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; + 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.util.FileUtils; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; - -import java.io.File; -import java.util.List; -import java.util.LinkedList; -import java.util.ListIterator; +import org.apache.tools.ant.util.FileUtils; /** * <p>This task takes file and turns them into a URL, which it then assigns diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index cbe122569..984998325 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -31,6 +31,7 @@ import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.CollectionUtils; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java index 84c21c1e4..4a4f23121 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java +++ b/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java @@ -20,10 +20,10 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.UnsupportedEncodingException; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.types.Path; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; import org.apache.tools.ant.launch.Locator; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java index 3466d3b22..113ff5ebd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java index 2fb12ab60..71b6c94a0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Mkdir.java +++ b/src/main/org/apache/tools/ant/taskdefs/Mkdir.java @@ -19,9 +19,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 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 4c27bac5a..7f5d9680d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Move.java +++ b/src/main/org/apache/tools/ant/taskdefs/Move.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; import java.util.Iterator; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterSet; diff --git a/src/main/org/apache/tools/ant/taskdefs/Nice.java b/src/main/org/apache/tools/ant/taskdefs/Nice.java index 265a3e3f6..5898caee6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Nice.java +++ b/src/main/org/apache/tools/ant/taskdefs/Nice.java @@ -18,9 +18,9 @@ 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.Task; /** * A task to provide "nice-ness" to the current thread, and/or to diff --git a/src/main/org/apache/tools/ant/taskdefs/Pack.java b/src/main/org/apache/tools/ant/taskdefs/Pack.java index a52e5a989..daabd6ba6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Pack.java +++ b/src/main/org/apache/tools/ant/taskdefs/Pack.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Resource; diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java index 4e65f23b2..c4f5c9e94 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java +++ b/src/main/org/apache/tools/ant/taskdefs/Parallel.java @@ -17,10 +17,11 @@ */ package org.apache.tools.ant.taskdefs; +import java.util.ArrayList; import java.util.Enumeration; -import java.util.Vector; import java.util.List; -import java.util.ArrayList; +import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ExitStatusException; import org.apache.tools.ant.Location; diff --git a/src/main/org/apache/tools/ant/taskdefs/Patch.java b/src/main/org/apache/tools/ant/taskdefs/Patch.java index 367717cad..96ab0823b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Patch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Patch.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index 003fde1a5..0bac30409 100644 --- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java @@ -18,21 +18,22 @@ package org.apache.tools.ant.taskdefs; import java.io.File; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Vector; -import java.util.ArrayList; import java.util.StringTokenizer; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; +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.Path; +import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Mapper; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.Resources; import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.util.FileNameMapper; diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java index c2237ec7d..cc3b432ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java +++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; + import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java index e42020780..dfb8e8453 100644 --- a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java +++ b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintStream; + import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildLogger; diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java index c31ccc34a..23a847af5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java +++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java @@ -17,36 +17,36 @@ */ package org.apache.tools.ant.taskdefs; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.Reader; -import java.io.InputStream; import java.io.IOException; -import java.io.PrintStream; -import java.io.OutputStream; -import java.io.StringReader; -import java.io.BufferedReader; +import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.io.PipedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.io.Reader; +import java.io.StringReader; import java.util.Arrays; import java.util.Vector; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.Task; -import org.apache.tools.ant.BuildException; import org.apache.tools.ant.filters.util.ChainReaderHelper; import org.apache.tools.ant.types.FilterChain; +import org.apache.tools.ant.util.ConcatFileInputStream; +import org.apache.tools.ant.util.KeepAliveOutputStream; +import org.apache.tools.ant.util.LazyFileOutputStream; +import org.apache.tools.ant.util.LeadPipeInputStream; import org.apache.tools.ant.util.LineOrientedOutputStreamRedirector; +import org.apache.tools.ant.util.OutputStreamFunneler; +import org.apache.tools.ant.util.ReaderInputStream; import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.util.TeeOutputStream; -import org.apache.tools.ant.util.ReaderInputStream; -import org.apache.tools.ant.util.LeadPipeInputStream; -import org.apache.tools.ant.util.LazyFileOutputStream; -import org.apache.tools.ant.util.OutputStreamFunneler; -import org.apache.tools.ant.util.ConcatFileInputStream; -import org.apache.tools.ant.util.KeepAliveOutputStream; /** * The Redirector class manages the setup and connection of input and output diff --git a/src/main/org/apache/tools/ant/taskdefs/Rename.java b/src/main/org/apache/tools/ant/taskdefs/Rename.java index ed02ecf6a..382c2a775 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rename.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rename.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index 0e1675612..981663ef7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -33,6 +33,7 @@ import java.io.Writer; import java.util.ArrayList; import java.util.Iterator; import java.util.Properties; + 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/ResourceCount.java b/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java index 6592c0549..b29b57b6a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java +++ b/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java @@ -17,11 +17,11 @@ */ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.condition.Condition; -import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Comparison; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.ResourceCollection; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index da3130263..f17b47a16 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -21,6 +21,7 @@ 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index 3f0327471..8638bebd7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -17,45 +17,43 @@ */ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.KeepAliveOutputStream; -import org.apache.tools.ant.util.StringUtils; -import org.apache.tools.ant.types.EnumeratedAttribute; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.resources.Appendable; -import org.apache.tools.ant.types.resources.FileProvider; -import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.types.resources.Union; - -import java.io.File; -import java.io.OutputStream; -import java.io.PrintStream; import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.Reader; -import java.io.BufferedReader; -import java.io.StringReader; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Locale; -import java.util.StringTokenizer; -import java.util.Vector; - +import java.io.OutputStream; +import java.io.PrintStream; +import java.io.Reader; +import java.io.StringReader; import java.sql.Blob; 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.sql.Types; +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.Project; +import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.types.ResourceCollection; +import org.apache.tools.ant.types.resources.Appendable; +import org.apache.tools.ant.types.resources.FileProvider; +import org.apache.tools.ant.types.resources.FileResource; +import org.apache.tools.ant.types.resources.Union; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.KeepAliveOutputStream; +import org.apache.tools.ant.util.StringUtils; /** * 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 2fa9388ab..468ac148c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sequential.java +++ b/src/main/org/apache/tools/ant/taskdefs/Sequential.java @@ -19,10 +19,10 @@ package org.apache.tools.ant.taskdefs; import java.util.Iterator; 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.property.LocalProperties; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java index 2276a5599..66804de86 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java @@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; -import java.util.Iterator; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -29,9 +28,9 @@ import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; +import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.IdentityMapper; -import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.ResourceUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java index 0ffa845c8..df95eedb6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java +++ b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.apache.tools.ant.util.FileUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java index feffe8bef..34b3f21e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java +++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java @@ -19,25 +19,22 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; - -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Main; -import org.apache.tools.ant.Task; import org.apache.tools.ant.Project; -import org.apache.tools.ant.BuildException; - -import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.Ant.TargetElement; import org.apache.tools.ant.types.DirSet; -import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileList; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PropertySet; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.taskdefs.Ant.TargetElement; - /** * Calls a given target for all defined sub-builds. This is an extension diff --git a/src/main/org/apache/tools/ant/taskdefs/Sync.java b/src/main/org/apache/tools/ant/taskdefs/Sync.java index 797b964fa..e269cf493 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sync.java +++ b/src/main/org/apache/tools/ant/taskdefs/Sync.java @@ -19,7 +19,6 @@ package org.apache.tools.ant.taskdefs; import java.io.File; - import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java index c8f867f07..c5259ba99 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -30,6 +30,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Vector; import java.util.zip.GZIPOutputStream; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -41,8 +42,8 @@ import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.ArchiveResource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.types.selectors.SelectorUtils; import org.apache.tools.ant.types.resources.TarResource; +import org.apache.tools.ant.types.selectors.SelectorUtils; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.MergingMapper; import org.apache.tools.ant.util.ResourceUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java index e0ed8f3ed..0fdeeff68 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java +++ b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.IOException; import java.io.OutputStream; + import org.apache.tools.ant.Task; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/TempFile.java b/src/main/org/apache/tools/ant/taskdefs/TempFile.java index 511fc7c68..5f55a3767 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TempFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/TempFile.java @@ -18,6 +18,7 @@ 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.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 096d72773..4a4118cef 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -23,24 +23,24 @@ import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Iterator; 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.Mapper; -import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileList; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.Touchable; import org.apache.tools.ant.types.resources.Union; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.FileNameMapper; +import org.apache.tools.ant.util.FileUtils; /** * Touch a file and/or fileset(s) and/or filelist(s); diff --git a/src/main/org/apache/tools/ant/taskdefs/Truncate.java b/src/main/org/apache/tools/ant/taskdefs/Truncate.java index 26f6a5caa..6f43c0503 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Truncate.java +++ b/src/main/org/apache/tools/ant/taskdefs/Truncate.java @@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; -import java.util.Iterator; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index 8195fab1c..805427aba 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -29,6 +29,7 @@ import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.TimeZone; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/Unpack.java b/src/main/org/apache/tools/ant/taskdefs/Unpack.java index 816582d92..8640f8fba 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Unpack.java +++ b/src/main/org/apache/tools/ant/taskdefs/Unpack.java @@ -20,6 +20,7 @@ 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.types.Resource; diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 8a8daa644..e5c85ce11 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -21,15 +21,16 @@ 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.Resource; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.types.Mapper; +import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.MergingMapper; import org.apache.tools.ant.util.ResourceUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java index 92f41893b..4ab21428c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java @@ -18,20 +18,19 @@ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.Project; +import java.io.File; +import java.io.IOException; +import java.io.Reader; + import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.filters.ChainableReader; -import org.apache.tools.ant.types.RedirectorElement; import org.apache.tools.ant.types.FilterChain; import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.RedirectorElement; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; -import java.util.Iterator; -import java.io.File; -import java.io.Reader; -import java.io.IOException; - /** * JAR verification task. * For every JAR passed in, we fork jarsigner to verify diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java index ef64f6786..d23beabc3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs; import java.util.HashMap; import java.util.Locale; import java.util.Map; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.condition.Condition; diff --git a/src/main/org/apache/tools/ant/taskdefs/War.java b/src/main/org/apache/tools/ant/taskdefs/War.java index 882769bf4..0820627a1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/War.java +++ b/src/main/org/apache/tools/ant/taskdefs/War.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.ZipFileSet; diff --git a/src/main/org/apache/tools/ant/taskdefs/WhichResource.java b/src/main/org/apache/tools/ant/taskdefs/WhichResource.java index f113d88f2..3f315a8df 100644 --- a/src/main/org/apache/tools/ant/taskdefs/WhichResource.java +++ b/src/main/org/apache/tools/ant/taskdefs/WhichResource.java @@ -18,14 +18,14 @@ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.Task; +import java.net.URL; + +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 java.net.URL; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; /** * Find a class or resource on the supplied classpath, or the diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java index 5de380b70..efc3f5b3e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison4.java @@ -17,6 +17,8 @@ */ package org.apache.tools.ant.taskdefs; +import javax.xml.transform.Transformer; + /** * Extends Proxy interface for XSLT processors: adds support for XSLT parameters * of various types (not only String) diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index 94271f54e..c5d230913 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -25,6 +25,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Map; import java.util.Vector; + import javax.xml.namespace.QName; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; @@ -32,6 +33,7 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathVariableResolver; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; @@ -47,10 +49,10 @@ import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.XMLCatalog; +import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.Resources; import org.apache.tools.ant.types.resources.Union; -import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.ResourceUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java index d85f86e10..2830bdf9c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java +++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java @@ -20,9 +20,11 @@ package org.apache.tools.ant.taskdefs; import java.io.File; import java.io.IOException; import java.util.Hashtable; -import javax.xml.parsers.DocumentBuilderFactory; + 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.apache.tools.ant.types.Path; @@ -37,8 +39,8 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; import org.xml.sax.EntityResolver; +import org.xml.sax.SAXException; /** * Loads property values from a valid XML file, generating the diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java index bee4ecc8b..5ada0d7ea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java @@ -18,17 +18,17 @@ package org.apache.tools.ant.taskdefs.compilers; +import java.io.File; +import java.lang.reflect.Method; +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.taskdefs.Apt; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; -import java.io.File; -import java.lang.reflect.Method; -import java.util.Enumeration; -import java.util.Vector; - /** * <p>The implementation of the apt compiler for JDK 1.5.</p> 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 c5a139102..5b32d1096 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -25,18 +25,19 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; 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.taskdefs.condition.Os; 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.StringUtils; import org.apache.tools.ant.util.JavaEnvUtils; -import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.util.StringUtils; /** * This is the default implementation for the CompilerAdapter interface. 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 3c592ad64..3fd8ccdda 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java @@ -21,12 +21,13 @@ package org.apache.tools.ant.taskdefs.compilers; 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.util.JavaEnvUtils; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.taskdefs.LogOutputStream; import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.JavaEnvUtils; /** * The implementation of the javac compiler for JDK 1.2 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 300de8758..acb6a7f06 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java @@ -19,6 +19,7 @@ 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java index ddc349e1b..ab2845442 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java @@ -18,15 +18,15 @@ package org.apache.tools.ant.taskdefs.compilers; -import java.io.IOException; 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.Commandline; import org.apache.tools.ant.taskdefs.condition.Os; -import org.apache.tools.ant.util.JavaEnvUtils; +import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.JavaEnvUtils; /** * Performs a compile using javac externally. 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 aef3ecf1f..91b34c821 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/And.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/And.java @@ -19,6 +19,7 @@ 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 78adf47e9..d057b46d1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java @@ -20,6 +20,7 @@ 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 57faf7d35..5e99398fe 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java b/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java index 889a9f876..002af7a7b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java @@ -17,14 +17,14 @@ */ package org.apache.tools.ant.taskdefs.condition; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Reference; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; - -import java.lang.reflect.Method; -import java.lang.reflect.Field; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; /** * test for a method 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 abdc7c439..1dc94204c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java @@ -18,11 +18,12 @@ package org.apache.tools.ant.taskdefs.condition; -import java.util.Locale; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.util.Locale; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsFileSelected.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsFileSelected.java index cbf7021ef..efdb66486 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsFileSelected.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsFileSelected.java @@ -16,11 +16,12 @@ * */ 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 org.apache.tools.ant.types.selectors.FileSelector; + +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.selectors.AbstractSelectorContainer; +import org.apache.tools.ant.types.selectors.FileSelector; +import org.apache.tools.ant.util.FileUtils; /** * This is a condition that checks to see if a file passes an embedded selector. diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java index d2abd047c..d7206c391 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java @@ -18,10 +18,6 @@ package org.apache.tools.ant.taskdefs.condition; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.ProjectComponent; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.InetAddress; @@ -29,6 +25,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectComponent; + /** * <p>Test for a host being reachable using ICMP "ping" packets & echo operations. * Ping packets are very reliable for assessing reachability in a LAN or WAN, 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 5566eb2ac..aedfe74f9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java @@ -19,6 +19,7 @@ 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/ParserSupports.java b/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java index 5b41af31f..d2834019b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java @@ -21,7 +21,6 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.util.JAXPUtils; - import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; import org.xml.sax.XMLReader; 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 24137e0b4..d6a69ec81 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java @@ -19,6 +19,7 @@ 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java b/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java index b69b8527a..f97c7f445 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java @@ -18,12 +18,12 @@ package org.apache.tools.ant.taskdefs.condition; +import org.apache.tools.ant.AntTypeDefinition; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ComponentHelper; +import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.ProjectHelper; -import org.apache.tools.ant.AntTypeDefinition; -import org.apache.tools.ant.Project; /** * looks for a task or other Ant type that exists. Existence is defined as diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java index 9f14bdb32..a2e675cb5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java @@ -17,10 +17,10 @@ */ package org.apache.tools.ant.taskdefs.condition; -import org.apache.tools.ant.BuildException; - import java.util.Enumeration; +import org.apache.tools.ant.BuildException; + /** * The <tt>Xor</tt> condition type to exclusive or operations. * This does not shortcut stuff. diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java index fe4f4b772..dcf4fc63f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java @@ -19,8 +19,8 @@ package org.apache.tools.ant.taskdefs.cvslib; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.ArrayList; +import java.util.Date; import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; @@ -28,6 +28,7 @@ import java.util.List; import java.util.Locale; import java.util.StringTokenizer; import java.util.TimeZone; + import org.apache.tools.ant.taskdefs.AbstractCvsTask; import org.apache.tools.ant.util.CollectionUtils; 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 be387a7a6..b4b51ced2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java @@ -29,6 +29,7 @@ import java.util.Date; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java index 17ae1b4e3..2385e51ff 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java @@ -25,7 +25,6 @@ import java.util.TimeZone; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.util.DOMUtils; - import org.w3c.dom.Document; import org.w3c.dom.Element; 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 cbde78380..38606fe1c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java @@ -26,19 +26,18 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.util.ArrayList; -import java.util.List; import java.util.Iterator; +import java.util.List; 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.taskdefs.AbstractCvsTask; +import org.apache.tools.ant.util.CollectionUtils; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.util.DOMUtils; -import org.apache.tools.ant.util.CollectionUtils; import org.apache.tools.ant.util.FileUtils; - import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java index d9e20813d..618da4ece 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java @@ -17,12 +17,12 @@ */ package org.apache.tools.ant.taskdefs.cvslib; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.AbstractCvsTask; - import java.io.ByteArrayOutputStream; import java.util.StringTokenizer; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.AbstractCvsTask; + /** * this task allows to find out the client and the server version of a * CVS installation 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 309eb21a0..713de0c4b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs.cvslib; import java.io.ByteArrayOutputStream; import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.PumpStreamHandler; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java index e5c15dfc4..0a5bc6817 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java @@ -18,7 +18,6 @@ package org.apache.tools.ant.taskdefs.email; import java.io.File; -import java.util.Iterator; import java.util.StringTokenizer; import java.util.Vector; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java b/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java index ed5499ca0..4aaa9823c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs.email; import java.io.File; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.util.DateUtils; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java index c231fc8fe..4e4b86d5c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java @@ -17,15 +17,17 @@ */ package org.apache.tools.ant.taskdefs.email; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.InputStream; import java.io.IOException; -import java.io.PrintStream; +import java.io.InputStream; import java.io.OutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import java.io.UnsupportedEncodingException; - +import java.net.PasswordAuthentication; +import java.security.Provider; +import java.security.Security; import java.util.Enumeration; import java.util.Iterator; import java.util.Locale; @@ -33,29 +35,22 @@ import java.util.Properties; import java.util.StringTokenizer; import java.util.Vector; -import java.security.Provider; -import java.security.Security; - import javax.activation.DataHandler; import javax.activation.FileDataSource; - -import javax.mail.Authenticator; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.PasswordAuthentication; import javax.mail.SendFailedException; -import javax.mail.Session; -import javax.mail.Transport; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeMultipart; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import sun.rmi.transport.Transport; + +import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException; +import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeBodyPart; +import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeMultipart; + /** * Uses the JavaMail classes to send Mime format email. * 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 3c5212b17..20524ac3b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java @@ -23,6 +23,7 @@ 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.ant.Project; import org.apache.tools.mail.MailMessage; diff --git a/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java index 90f16bc5c..d6542be43 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.PrintStream; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.UUEncoder; diff --git a/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java b/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java index 8465ea505..71b7e6053 100644 --- a/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java +++ b/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java @@ -17,12 +17,12 @@ */ package org.apache.tools.ant.taskdefs.launcher; -import java.io.File; -import java.io.IOException; - import static org.apache.tools.ant.MagicNames.ANT_SHELL_LAUNCHER_REF_ID; import static org.apache.tools.ant.MagicNames.ANT_VM_LAUNCHER_REF_ID; +import java.io.File; +import java.io.IOException; + import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.Commandline; 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 008fc15f2..605b33684 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileReader; import java.io.IOException; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; @@ -34,10 +35,10 @@ import org.apache.tools.ant.taskdefs.condition.Os; 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.FileUtils; import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.util.LoaderUtils; import org.apache.tools.ant.util.TeeOutputStream; -import org.apache.tools.ant.util.FileUtils; /** * Invokes the ANTLR Translator generator on a grammar file. 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 beb25b9e9..11c091a8b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.OutputStream; 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; 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 27e3b9299..b63ef933e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java @@ -26,20 +26,22 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.Enumeration; import java.util.Hashtable; -import java.util.Properties; -import java.util.Vector; +import java.util.Iterator; import java.util.List; -import java.util.ArrayList; -import java.util.Comparator; import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.TreeSet; -import java.util.Collections; -import java.util.Iterator; +import java.util.Vector; + 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; 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 49b086acf..81a386fd2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -19,6 +19,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; 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 ee2eb8329..5ba2a760e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -28,7 +28,9 @@ 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; import org.apache.tools.ant.Project; 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 a24b0aadf..dec296ac3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java @@ -36,11 +36,12 @@ import java.util.HashMap; import java.util.Map; 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.util.LayoutPreservingProperties; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.LayoutPreservingProperties; /** * 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 2ed53d58b..c4acadb27 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/RenameExtensions.java @@ -29,6 +29,7 @@ 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 e8c38091d..726ceee80 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java @@ -22,14 +22,14 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStreamReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; -import java.util.Iterator; + 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/Rpm.java b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java index 1c6064e02..b395a16cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java @@ -23,13 +23,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; -import java.util.Enumeration; import java.util.Map; -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.util.FileUtils; import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.taskdefs.LogOutputStream; @@ -38,6 +36,7 @@ import org.apache.tools.ant.taskdefs.PumpStreamHandler; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.util.FileUtils; /** * Invokes the rpm tool to build a Linux installation file. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java index 2e08ff5bb..e57d6d226 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java @@ -17,22 +17,23 @@ */ package org.apache.tools.ant.taskdefs.optional; +import java.io.File; +import java.net.MalformedURLException; +import java.util.HashMap; +import java.util.Iterator; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.XmlConstants; -import org.xml.sax.XMLReader; +import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; -import org.xml.sax.SAXException; - -import javax.xml.parsers.SAXParserFactory; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.ParserConfigurationException; -import java.util.Iterator; -import java.util.HashMap; -import java.io.File; -import java.net.MalformedURLException; +import org.xml.sax.XMLReader; /** * Validate XML Schema documents. 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 74930f2d9..2b8d9f65d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java @@ -18,12 +18,13 @@ 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.Task; -import org.apache.tools.ant.util.ScriptRunnerHelper; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.util.ScriptRunnerHelper; /** * Executes a script. 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 edd1e9409..9f6c3d79b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -27,10 +27,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.Field; +import java.net.URL; +import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import java.util.Enumeration; -import java.net.URL; + import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.ErrorListener; @@ -38,21 +39,22 @@ import javax.xml.transform.Source; import javax.xml.transform.SourceLocator; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; 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 javax.xml.transform.TransformerConfigurationException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.XSLTLiaison4; import org.apache.tools.ant.taskdefs.XSLTLogger; import org.apache.tools.ant.taskdefs.XSLTLoggerAware; import org.apache.tools.ant.taskdefs.XSLTProcess; -import org.apache.tools.ant.types.XMLCatalog; import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.types.XMLCatalog; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.URLProvider; 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 57ad33706..28b6b5a2d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java @@ -35,7 +35,6 @@ import org.apache.tools.ant.types.XMLCatalog; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.JAXPUtils; import org.apache.tools.ant.util.XmlConstants; - import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XSLTTraceSupport.java b/src/main/org/apache/tools/ant/taskdefs/optional/XSLTTraceSupport.java index 98ca15669..8b684d835 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/XSLTTraceSupport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/XSLTTraceSupport.java @@ -18,9 +18,10 @@ package org.apache.tools.ant.taskdefs.optional; -import org.apache.tools.ant.taskdefs.XSLTProcess; import javax.xml.transform.Transformer; +import org.apache.tools.ant.taskdefs.XSLTProcess; + /** * Sets up trace support for a given transformer. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java b/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java index 0e66cc450..96804e67f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport.java @@ -20,11 +20,14 @@ package org.apache.tools.ant.taskdefs.optional; import java.io.PrintWriter; import java.util.TooManyListenersException; + import javax.xml.transform.Transformer; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.XSLTProcess; import org.apache.xalan.trace.PrintTraceListener; -import org.apache.xalan.transformer.TransformerImpl; + +import com.sun.org.apache.xalan.internal.xsltc.trax.TransformerImpl; /** * Sets up trace support for a given transformer. 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 a27983579..f6a94b527 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 @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.ccm; 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/ccm/CCMCreateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index 518bfdbee..cda13a5cb 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 @@ -24,6 +24,7 @@ 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.Execute; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java index 9bd188469..128ea16b7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java @@ -21,8 +21,8 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Execute; -import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.types.Commandline; /** * Task to perform mkattr command to ClearCase. 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 d9bed57a4..d81e505cd 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 @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; 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/depend/AntAnalyzer.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java index 3e729639b..341f67073 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 @@ -26,6 +26,7 @@ import java.util.Hashtable; import java.util.Vector; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; + import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.depend.AbstractAnalyzer; 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 209e6b394..858ce03e2 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 @@ -21,6 +21,7 @@ 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 e52304ae3..cc65129f9 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 @@ -27,6 +27,7 @@ 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/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index f09c0c70f..4eefaebfe 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 @@ -29,6 +29,7 @@ import java.io.OutputStream; import java.util.Hashtable; import java.util.Iterator; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; 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 392f17a23..dd46269d1 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 @@ -20,6 +20,7 @@ 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/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java index 202b7718c..158cba937 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 @@ -25,6 +25,7 @@ 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; 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 d6006d6c7..6ed8e34a2 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 @@ -21,6 +21,7 @@ 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 cac1db92a..e9b7ed429 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 @@ -23,9 +23,11 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; + 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/ejb/IPlanetDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java index b48abad87..7db731d5e 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 @@ -22,7 +22,9 @@ import java.io.File; import java.io.IOException; import java.util.Hashtable; import java.util.Iterator; + import javax.xml.parsers.SAXParser; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.xml.sax.SAXException; 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 dba8006ef..caf0b43c9 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 @@ -33,8 +33,11 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; + +import org.apache.tools.ant.BuildException; import org.xml.sax.AttributeList; import org.xml.sax.HandlerBase; import org.xml.sax.InputSource; 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 88cbd4352..ee5dc854b 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 @@ -20,9 +20,11 @@ package org.apache.tools.ant.taskdefs.optional.ejb; import java.io.File; import java.io.IOException; + import javax.xml.parsers.ParserConfigurationException; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java index a0286b1e5..79f4574ef 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java @@ -19,6 +19,7 @@ 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/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java index 02e6bddd3..81fe8059e 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 @@ -21,7 +21,9 @@ import java.io.File; import java.io.IOException; 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; 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 e1ce5553e..62dd64005 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 @@ -29,8 +29,10 @@ import java.util.Vector; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; 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 2ee69d0de..0752bbec7 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 @@ -20,6 +20,7 @@ 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 23208810d..232a1fb23 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 @@ -27,6 +27,7 @@ import java.util.Iterator; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java index 081506555..a73282ec4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs.optional.extension; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; 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 743edd95e..3786c66a5 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 @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java index a8fd9ea41..cebcf0d5e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java @@ -21,6 +21,7 @@ import java.io.File; import java.util.Iterator; import java.util.Vector; import java.util.jar.Manifest; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java index 945c3f4cf..da12cd020 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension; import java.io.File; import java.util.Iterator; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; 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 a2e9b6b5c..5afc57f17 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 @@ -24,6 +24,7 @@ import java.util.ArrayList; 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.MagicNames; import org.apache.tools.ant.Project; 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 e6409cf5f..40cc50b92 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 @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension; import java.io.File; import java.util.ArrayList; import java.util.jar.Manifest; + 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/extension/LibraryDisplayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java index c8f9e86d3..b0ee4f819 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.extension; import java.io.File; import java.text.ParseException; import java.util.jar.Manifest; + import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java index e3c9070bf..6284679fc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs.optional.extension.resolvers; 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.Ant; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java index ee6974bf6..e2fec0229 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs.optional.extension.resolvers; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.optional.extension.Extension; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java index cfdd39852..d693b8995 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs.optional.extension.resolvers; import java.io.File; import java.net.URL; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Get; 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 2cc690bd9..5cca45c00 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 @@ -28,6 +28,7 @@ import java.io.OutputStreamWriter; import java.util.Hashtable; 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java index 1567c6760..162e37560 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java @@ -17,7 +17,15 @@ */ package org.apache.tools.ant.taskdefs.optional.image; -import com.sun.media.jai.codec.FileSeekableStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Locale; +import java.util.Vector; + +import javax.media.jai.JAI; +import javax.media.jai.PlanarImage; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -33,15 +41,7 @@ import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.IdentityMapper; -import javax.media.jai.JAI; -import javax.media.jai.PlanarImage; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Locale; -import java.util.Vector; +import com.sun.media.jai.codec.FileSeekableStream; /** * A MatchingTask which relies on <a 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 a2b265c58..c7a33a191 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 @@ -18,6 +18,7 @@ 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 b2bb093eb..8965b8e88 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 @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.j2ee; import java.io.File; 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/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index d790792ba..21f03fe7d 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 @@ -26,6 +26,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.Map; 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/jlink/JlinkTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java index 7f9f40058..f5767e671 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 @@ -18,6 +18,7 @@ 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; 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 99458175f..499cca277 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 @@ -22,8 +22,6 @@ */ package org.apache.tools.ant.taskdefs.optional.jlink; -import org.apache.tools.ant.util.FileUtils; - import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -39,6 +37,8 @@ import java.util.zip.ZipException; import java.util.zip.ZipFile; import java.util.zip.ZipOutputStream; +import org.apache.tools.ant.util.FileUtils; + // CheckStyle:TypeNameCheck OFF - bc /** * jlink links together multiple .jar files. 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 b227d7d2d..4274bf0db 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 @@ -22,6 +22,7 @@ import java.io.File; import java.util.Date; 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; 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 50b6ed140..45a427ad5 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 @@ -22,6 +22,7 @@ import java.io.File; 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; 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 35f8c6c22..5c4d0e3b5 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 @@ -21,6 +21,7 @@ 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; 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 b6f8c58d6..f0becacb4 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 @@ -19,6 +19,7 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import java.io.File; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java index 896a7a8d8..2876ba0c3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java @@ -20,8 +20,8 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler; import org.apache.tools.ant.taskdefs.optional.jsp.Jasper41Mangler; +import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler; /** 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 240e0489a..46c440674 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 @@ -22,9 +22,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; - import java.net.URL; - import java.util.Iterator; import java.util.List; import java.util.Vector; @@ -35,16 +33,15 @@ 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.taskdefs.XSLTProcess; import org.apache.tools.ant.taskdefs.Delete; import org.apache.tools.ant.taskdefs.TempFile; -import org.apache.tools.ant.util.JAXPUtils; -import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.taskdefs.XSLTProcess; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.types.resources.URLResource; import org.apache.tools.ant.types.resources.FileResource; - +import org.apache.tools.ant.types.resources.URLResource; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.JAXPUtils; 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 e0e38b760..f41b96f13 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 @@ -21,8 +21,8 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.File; import java.util.Enumeration; -import java.util.Iterator; import java.util.Vector; + import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Resource; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java index ffa51225c..8ad40dd61 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.junit; import junit.framework.JUnit4TestAdapter; import junit.framework.JUnit4TestAdapterCache; import junit.framework.TestResult; + import org.junit.runner.Description; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunListener; 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 1b5b0240f..325f44cfb 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 @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.util.Vector; + import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; 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 94b68d025..f9fbcb0ae 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 @@ -18,11 +18,11 @@ package org.apache.tools.ant.taskdefs.optional.junit; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.io.BufferedOutputStream; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java index 5339a93ee..4b52689ca 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java @@ -20,8 +20,10 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.util.Iterator; import java.util.List; + import junit.framework.Test; import junit.framework.TestResult; + import org.junit.runner.Description; import org.junit.runner.Request; import org.junit.runner.Runner; 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 ebfd4559c..2119fc946 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 @@ -19,7 +19,9 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.OutputStream; + import junit.framework.TestListener; + import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java index 84c62c96a..694e1d8cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.IOException; import java.io.OutputStream; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.types.Permissions; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java index 36ceae086..c7dae2589 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java @@ -19,9 +19,11 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.OutputStream; + import junit.framework.AssertionFailedError; import junit.framework.TestCase; import junit.framework.TestResult; + import org.apache.tools.ant.AntClassLoader; /** 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 8a298a777..b96a1a7db 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 @@ -22,6 +22,7 @@ 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.Project; import org.apache.tools.ant.PropertyHelper; 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 9628ac92b..042b05de0 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 @@ -36,6 +36,7 @@ import java.util.Hashtable; import java.util.Properties; import java.util.StringTokenizer; import java.util.Vector; + import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestCase; @@ -43,6 +44,7 @@ import junit.framework.TestFailure; import junit.framework.TestListener; import junit.framework.TestResult; import junit.framework.TestSuite; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Permissions; 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 5448c7b98..0b09fa203 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 @@ -21,8 +21,10 @@ package org.apache.tools.ant.taskdefs.optional.junit; 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/TearDownOnVmCrash.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java index 6ef84a260..c32870db8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.junit; import java.io.OutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + 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 c9c07f62b..4f76c9687 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 @@ -26,8 +26,10 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.Enumeration; import java.util.Vector; + 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java index ed9f8f35b..3cd52afe5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs.optional.native2ascii; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.taskdefs.optional.Native2Ascii; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java index a4c86688d..af414004a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs.optional.native2ascii; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.optional.Native2Ascii; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java index 101db7cce..fac94b18c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs.optional.native2ascii; import java.lang.reflect.Method; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.taskdefs.optional.Native2Ascii; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java index 3b3277417..01cb4ba9a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java @@ -18,14 +18,14 @@ package org.apache.tools.ant.taskdefs.optional.net; -import org.apache.commons.net.bsd.RExecClient; - 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.commons.net.bsd.RExecClient; 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/net/SetProxy.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java index 4838936fd..1e1f65910 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 @@ -20,6 +20,7 @@ package org.apache.tools.ant.taskdefs.optional.net; import java.net.Authenticator; import java.net.PasswordAuthentication; import java.util.Properties; + 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/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index f296b8410..82625fa70 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 @@ -18,13 +18,14 @@ package org.apache.tools.ant.taskdefs.optional.net; -import org.apache.commons.net.telnet.TelnetClient; 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.commons.net.telnet.TelnetClient; 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/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index c128fd632..9bdae6a3f 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 @@ -30,6 +30,7 @@ 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; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java index afa0fcda7..ac9eb88ec 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java @@ -17,25 +17,24 @@ */ package org.apache.tools.ant.taskdefs.optional.script; -import org.apache.tools.ant.AntTypeDefinition; -import org.apache.tools.ant.ComponentHelper; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.MagicNames; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.ProjectHelper; -import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.taskdefs.DefBase; - -import java.util.Map; +import java.io.File; +import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.ArrayList; -import java.util.Iterator; +import java.util.Map; import java.util.Set; -import java.util.HashSet; -import java.io.File; +import org.apache.tools.ant.AntTypeDefinition; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ComponentHelper; +import org.apache.tools.ant.MagicNames; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectHelper; +import org.apache.tools.ant.taskdefs.DefBase; +import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.util.ClasspathUtils; import org.apache.tools.ant.util.ScriptRunnerBase; import org.apache.tools.ant.util.ScriptRunnerHelper; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java index f98e10d65..95d15aa6b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java @@ -17,14 +17,15 @@ */ package org.apache.tools.ant.taskdefs.optional.script; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.MagicNames; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DynamicConfigurator; -import java.util.Map; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; +import java.util.Map; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DynamicConfigurator; +import org.apache.tools.ant.MagicNames; +import org.apache.tools.ant.Task; /** * The script execution class. This class finds the defining script task 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 80bb1041d..03031d5ed 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 @@ -18,6 +18,7 @@ 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 399e71754..3f090644c 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 @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.sound; // ant includes import java.io.File; import java.io.IOException; + import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; @@ -31,6 +32,7 @@ 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 f2ebae83e..dfb6e69ac 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 @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.sound; 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; 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 ff1cb5c1b..5de84cca9 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 @@ -34,6 +34,7 @@ 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; 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 2a87854e5..042155ed1 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 @@ -24,12 +24,14 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; + import javax.swing.ImageIcon; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.util.Base64Converter; import org.apache.tools.ant.taskdefs.optional.net.SetProxy; +import org.apache.tools.ant.util.Base64Converter; /** * Creates a splash screen. The splash screen is displayed diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java index 04dbb8852..c925fc652 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java @@ -18,20 +18,18 @@ package org.apache.tools.ant.taskdefs.optional.ssh; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelExec; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.SftpProgressMonitor; - import java.io.IOException; -import java.io.OutputStream; import java.io.InputStream; +import java.io.OutputStream; import java.text.NumberFormat; import org.apache.tools.ant.BuildException; +import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.ChannelSftp; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.SftpProgressMonitor; + /** * Abstract class for ssh upload and download */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java index f25ec7d95..f5455916d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java @@ -18,12 +18,12 @@ package org.apache.tools.ant.taskdefs.optional.ssh; +import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Set; import java.util.StringTokenizer; -import java.io.File; /** * A helper object for Scp representing a directory in a file system. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java index 5e14d8729..f36b1343b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java @@ -18,13 +18,12 @@ package org.apache.tools.ant.taskdefs.optional.ssh; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; -import com.jcraft.jsch.JSch; - -import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; + +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; /** * Base class for Ant tasks using jsch. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java index c62b0e00e..1a8517bb7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java @@ -35,13 +35,12 @@ import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.KeepAliveOutputStream; import org.apache.tools.ant.util.KeepAliveInputStream; +import org.apache.tools.ant.util.KeepAliveOutputStream; import org.apache.tools.ant.util.TeeOutputStream; import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; /** * Executes a command on a remote machine via ssh. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java index 2679d4e5d..c70813f6b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java @@ -31,7 +31,6 @@ import org.apache.tools.ant.Task; import org.apache.tools.ant.TaskContainer; import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; /** * Establishes an ssh session with a remote machine, optionally diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java index ba69f1866..54e702932 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java @@ -18,8 +18,9 @@ package org.apache.tools.ant.taskdefs.optional.ssh; -import com.jcraft.jsch.UserInfo; import com.jcraft.jsch.UIKeyboardInteractive; +import com.jcraft.jsch.UserInfo; + /** * Class containing information on an SSH user. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java index a67dc56dc..62b4245ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java @@ -18,22 +18,20 @@ package org.apache.tools.ant.taskdefs.optional.ssh; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; - -import java.io.IOException; import java.io.File; - -import java.util.List; -import java.util.LinkedList; -import java.util.Iterator; +import java.io.IOException; import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; 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 com.jcraft.jsch.JSchException; + /** * Ant task for sending files to remote machine over ssh/scp. * diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java index 969ef9f0b..c6130f36f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java @@ -18,20 +18,20 @@ package org.apache.tools.ant.taskdefs.optional.ssh; +import java.io.ByteArrayOutputStream; +import java.io.EOFException; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.EOFException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileOutputStream; -import java.io.ByteArrayOutputStream; + +import org.apache.tools.ant.util.FileUtils; + +import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; import com.jcraft.jsch.SftpATTRS; import com.jcraft.jsch.SftpException; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelSftp; -import org.apache.tools.ant.util.FileUtils; /** * A helper object representing an scp download. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java index cd733d13d..8366db227 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java @@ -21,15 +21,14 @@ package org.apache.tools.ant.taskdefs.optional.ssh; import java.io.File; import java.io.IOException; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; +import org.apache.tools.ant.util.FileUtils; + import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.SftpException; +import com.jcraft.jsch.JSchException; import com.jcraft.jsch.SftpATTRS; +import com.jcraft.jsch.SftpException; import com.jcraft.jsch.SftpProgressMonitor; -import org.apache.tools.ant.util.FileUtils; - /** * A helper object representing an scp download. */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java index 79ac8433b..0ff6bc8aa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java @@ -18,16 +18,15 @@ package org.apache.tools.ant.taskdefs.optional.ssh; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.Session; -import com.jcraft.jsch.JSchException; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.FileInputStream; import java.io.OutputStream; -import java.util.List; import java.util.Iterator; +import java.util.List; + +import com.jcraft.jsch.JSchException; /** * Utility class to carry out an upload scp transfer. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java index c94415978..e78c27680 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java @@ -18,17 +18,16 @@ package org.apache.tools.ant.taskdefs.optional.ssh; -import com.jcraft.jsch.Session; +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.List; + import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.SftpException; import com.jcraft.jsch.SftpProgressMonitor; -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.Iterator; - /** * Utility class to carry out an upload by sftp. */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java index 7560cd4f5..9b3c93c8a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java @@ -18,16 +18,16 @@ package org.apache.tools.ant.taskdefs.optional.testing; -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.TaskAdapter; -import org.apache.tools.ant.util.WorkerAnt; -import org.apache.tools.ant.taskdefs.condition.Condition; -import org.apache.tools.ant.taskdefs.condition.ConditionBase; import org.apache.tools.ant.taskdefs.Parallel; import org.apache.tools.ant.taskdefs.Sequential; import org.apache.tools.ant.taskdefs.WaitFor; +import org.apache.tools.ant.taskdefs.condition.Condition; +import org.apache.tools.ant.taskdefs.condition.ConditionBase; +import org.apache.tools.ant.util.WorkerAnt; /** * Task to provide functional testing under Ant, with a fairly complex workflow of: diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java index 3b6fcd3b1..4369028f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java @@ -38,7 +38,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; - import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; 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 592c33aa8..f514fc629 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 @@ -18,7 +18,6 @@ package org.apache.tools.ant.taskdefs.optional.vss; -import org.apache.tools.ant.types.EnumeratedAttribute; import java.io.File; import java.io.IOException; import java.text.DateFormat; @@ -33,6 +32,7 @@ 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; +import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.util.FileUtils; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java index 68a0d35d3..e02919141 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java @@ -18,13 +18,13 @@ package org.apache.tools.ant.taskdefs.optional.windows; +import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.taskdefs.ExecuteOn; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.FileSet; -import java.io.File; - /** * Attrib equivalent for Win32 environments. * Note: Attrib parameters /S and /D are not handled. 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 07139f48b..bb2cfaabb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -19,10 +19,10 @@ package org.apache.tools.ant.taskdefs.rmic; import java.io.File; +import java.util.ArrayList; +import java.util.List; import java.util.Random; import java.util.Vector; -import java.util.List; -import java.util.ArrayList; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Rmic; diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java index dabee7057..81bd7971c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java @@ -19,15 +19,15 @@ package org.apache.tools.ant.taskdefs.rmic; +import java.io.IOException; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.JavaEnvUtils; -import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.LogStreamHandler; +import org.apache.tools.ant.taskdefs.Rmic; import org.apache.tools.ant.types.Commandline; - -import java.io.IOException; +import org.apache.tools.ant.util.JavaEnvUtils; /** * This is an extension of the sun rmic compiler, which forks rather than 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 573943860..07cbd3062 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java @@ -22,6 +22,7 @@ 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; diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 5b8da5434..8f274a09e 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -24,31 +24,31 @@ import java.util.Enumeration; import java.util.List; import java.util.Stack; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.FileScanner; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.types.selectors.OrSelector; +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.NotSelector; +import org.apache.tools.ant.types.selectors.ContainsRegexpSelector; +import org.apache.tools.ant.types.selectors.ContainsSelector; import org.apache.tools.ant.types.selectors.DateSelector; -import org.apache.tools.ant.types.selectors.FileSelector; -import org.apache.tools.ant.types.selectors.NoneSelector; -import org.apache.tools.ant.types.selectors.SizeSelector; -import org.apache.tools.ant.types.selectors.TypeSelector; -import org.apache.tools.ant.types.selectors.DepthSelector; import org.apache.tools.ant.types.selectors.DependSelector; +import org.apache.tools.ant.types.selectors.DepthSelector; +import org.apache.tools.ant.types.selectors.DifferentSelector; import org.apache.tools.ant.types.selectors.ExtendSelector; -import org.apache.tools.ant.types.selectors.SelectSelector; -import org.apache.tools.ant.types.selectors.PresentSelector; -import org.apache.tools.ant.types.selectors.SelectorScanner; -import org.apache.tools.ant.types.selectors.ContainsSelector; +import org.apache.tools.ant.types.selectors.FileSelector; import org.apache.tools.ant.types.selectors.FilenameSelector; import org.apache.tools.ant.types.selectors.MajoritySelector; -import org.apache.tools.ant.types.selectors.DifferentSelector; -import org.apache.tools.ant.types.selectors.SelectorContainer; -import org.apache.tools.ant.types.selectors.ContainsRegexpSelector; +import org.apache.tools.ant.types.selectors.NoneSelector; +import org.apache.tools.ant.types.selectors.NotSelector; +import org.apache.tools.ant.types.selectors.OrSelector; +import org.apache.tools.ant.types.selectors.PresentSelector; import org.apache.tools.ant.types.selectors.ReadableSelector; +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; +import org.apache.tools.ant.types.selectors.TypeSelector; import org.apache.tools.ant.types.selectors.WritableSelector; import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector; diff --git a/src/main/org/apache/tools/ant/types/AntFilterReader.java b/src/main/org/apache/tools/ant/types/AntFilterReader.java index 5eda25268..20c41bc70 100644 --- a/src/main/org/apache/tools/ant/types/AntFilterReader.java +++ b/src/main/org/apache/tools/ant/types/AntFilterReader.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types; import java.util.Stack; import java.util.Vector; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java index da8914bd4..2e1659a5b 100644 --- a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java +++ b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java @@ -20,11 +20,12 @@ package org.apache.tools.ant.types; import java.io.File; import java.util.Iterator; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.FileProvider; +import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.zip.UnixStat; /** diff --git a/src/main/org/apache/tools/ant/types/ArchiveScanner.java b/src/main/org/apache/tools/ant/types/ArchiveScanner.java index d587a2859..db5a8d46d 100644 --- a/src/main/org/apache/tools/ant/types/ArchiveScanner.java +++ b/src/main/org/apache/tools/ant/types/ArchiveScanner.java @@ -19,15 +19,15 @@ package org.apache.tools.ant.types; import java.io.File; +import java.util.Iterator; import java.util.Map; import java.util.TreeMap; -import java.util.Iterator; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.FileResourceIterator; -import org.apache.tools.ant.types.resources.FileProvider; /** * ArchiveScanner accesses the pattern matching algorithm in DirectoryScanner, diff --git a/src/main/org/apache/tools/ant/types/Assertions.java b/src/main/org/apache/tools/ant/types/Assertions.java index baf3ee1e2..fdb873a92 100644 --- a/src/main/org/apache/tools/ant/types/Assertions.java +++ b/src/main/org/apache/tools/ant/types/Assertions.java @@ -18,13 +18,13 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; - import java.util.ArrayList; import java.util.List; import java.util.ListIterator; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; + /** * The assertion datatype. This type describes * assertion settings for the <java> task and others. diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index d157c15ac..c273d7aa8 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/src/main/org/apache/tools/ant/types/Commandline.java @@ -19,17 +19,17 @@ package org.apache.tools.ant.types; import java.io.File; -import java.util.StringTokenizer; import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import java.util.LinkedList; -import java.util.Iterator; +import java.util.StringTokenizer; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ProjectComponent; -import org.apache.tools.ant.util.StringUtils; import org.apache.tools.ant.taskdefs.condition.Os; +import org.apache.tools.ant.util.StringUtils; /** * Commandline objects help handling command lines specifying processes to diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java index 4e1f12cc7..9da354ddf 100644 --- a/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -18,10 +18,6 @@ package org.apache.tools.ant.types; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.JavaEnvUtils; - import java.util.Enumeration; import java.util.LinkedList; import java.util.List; @@ -29,6 +25,10 @@ import java.util.ListIterator; import java.util.Properties; import java.util.Vector; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.util.JavaEnvUtils; + /** * A representation of a Java command line that is * a composite of 2 <tt>Commandline</tt>s. One is used for the diff --git a/src/main/org/apache/tools/ant/types/DataType.java b/src/main/org/apache/tools/ant/types/DataType.java index 0eb8f062f..577e69e31 100644 --- a/src/main/org/apache/tools/ant/types/DataType.java +++ b/src/main/org/apache/tools/ant/types/DataType.java @@ -20,9 +20,9 @@ package org.apache.tools.ant.types; import java.util.Stack; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ComponentHelper; +import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.util.IdentityStack; diff --git a/src/main/org/apache/tools/ant/types/Description.java b/src/main/org/apache/tools/ant/types/Description.java index 2ed49c9c2..d23f1d888 100644 --- a/src/main/org/apache/tools/ant/types/Description.java +++ b/src/main/org/apache/tools/ant/types/Description.java @@ -17,17 +17,17 @@ */ package org.apache.tools.ant.types; +import java.util.ArrayList; +import java.util.List; + import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; -import org.apache.tools.ant.helper.ProjectHelper2; +import org.apache.tools.ant.Target; import org.apache.tools.ant.Task; import org.apache.tools.ant.UnknownElement; -import org.apache.tools.ant.Target; +import org.apache.tools.ant.helper.ProjectHelper2; import org.apache.tools.ant.helper.ProjectHelperImpl; -import java.util.ArrayList; -import java.util.List; - /** * Description is used to provide a project-wide description element diff --git a/src/main/org/apache/tools/ant/types/DirSet.java b/src/main/org/apache/tools/ant/types/DirSet.java index 0c3a84725..35c023115 100644 --- a/src/main/org/apache/tools/ant/types/DirSet.java +++ b/src/main/org/apache/tools/ant/types/DirSet.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types; import java.util.Iterator; + import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.resources.FileResourceIterator; diff --git a/src/main/org/apache/tools/ant/types/Environment.java b/src/main/org/apache/tools/ant/types/Environment.java index ac231e2f0..5bc6d79e2 100644 --- a/src/main/org/apache/tools/ant/types/Environment.java +++ b/src/main/org/apache/tools/ant/types/Environment.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types; import java.util.Vector; + import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/types/FileList.java b/src/main/org/apache/tools/ant/types/FileList.java index 2c2c68f7f..42e276352 100644 --- a/src/main/org/apache/tools/ant/types/FileList.java +++ b/src/main/org/apache/tools/ant/types/FileList.java @@ -20,12 +20,12 @@ package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; -import java.util.Iterator; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.resources.FileResourceIterator; /** diff --git a/src/main/org/apache/tools/ant/types/FilterSet.java b/src/main/org/apache/tools/ant/types/FilterSet.java index 2ac6eee11..761deaad4 100644 --- a/src/main/org/apache/tools/ant/types/FilterSet.java +++ b/src/main/org/apache/tools/ant/types/FilterSet.java @@ -26,8 +26,8 @@ import java.util.Properties; import java.util.Set; 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.FileUtils; import org.apache.tools.ant.util.VectorSet; diff --git a/src/main/org/apache/tools/ant/types/Mapper.java b/src/main/org/apache/tools/ant/types/Mapper.java index 9b0a6dd46..941e8dd8c 100644 --- a/src/main/org/apache/tools/ant/types/Mapper.java +++ b/src/main/org/apache/tools/ant/types/Mapper.java @@ -19,11 +19,12 @@ package org.apache.tools.ant.types; import java.util.Properties; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.CompositeMapper; import org.apache.tools.ant.util.ContainerMapper; +import org.apache.tools.ant.util.FileNameMapper; /** * 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 57f5d0804..db6f5e9f6 100644 --- a/src/main/org/apache/tools/ant/types/Path.java +++ b/src/main/org/apache/tools/ant/types/Path.java @@ -30,8 +30,8 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.MagicNames; import org.apache.tools.ant.PathTokenizer; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.types.resources.FileResourceIterator; +import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.util.FileUtils; 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 aeb171c0d..9fb94050c 100644 --- a/src/main/org/apache/tools/ant/types/PatternSet.java +++ b/src/main/org/apache/tools/ant/types/PatternSet.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.PropertyHelper; diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java index fd4879da7..b37602c9d 100644 --- a/src/main/org/apache/tools/ant/types/PropertySet.java +++ b/src/main/org/apache/tools/ant/types/PropertySet.java @@ -21,16 +21,16 @@ package org.apache.tools.ant.types; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; +import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.HashSet; import java.util.Map.Entry; +import java.util.Properties; import java.util.Set; import java.util.Stack; import java.util.TreeMap; -import java.util.Hashtable; -import java.util.Properties; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/RedirectorElement.java b/src/main/org/apache/tools/ant/types/RedirectorElement.java index 9babead0e..d27b199c3 100644 --- a/src/main/org/apache/tools/ant/types/RedirectorElement.java +++ b/src/main/org/apache/tools/ant/types/RedirectorElement.java @@ -18,14 +18,14 @@ package org.apache.tools.ant.types; import java.io.File; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Stack; import java.util.Vector; -import java.util.ArrayList; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Redirector; /** diff --git a/src/main/org/apache/tools/ant/types/Resource.java b/src/main/org/apache/tools/ant/types/Resource.java index 7ea776fe6..426a5b9e7 100644 --- a/src/main/org/apache/tools/ant/types/Resource.java +++ b/src/main/org/apache/tools/ant/types/Resource.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.math.BigInteger; import java.util.Iterator; diff --git a/src/main/org/apache/tools/ant/types/ResourceCollection.java b/src/main/org/apache/tools/ant/types/ResourceCollection.java index a31b9e981..85a5e43f7 100644 --- a/src/main/org/apache/tools/ant/types/ResourceCollection.java +++ b/src/main/org/apache/tools/ant/types/ResourceCollection.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.types; import java.util.Iterator; + import org.apache.tools.ant.types.resources.FileProvider; /** diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index 09539ffb4..bd9be4312 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java @@ -18,23 +18,24 @@ package org.apache.tools.ant.types; -import java.lang.reflect.Method; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; 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 org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/ZipScanner.java b/src/main/org/apache/tools/ant/types/ZipScanner.java index d0f7193f8..05392226a 100644 --- a/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.zip.ZipException; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.resources.ZipResource; import org.apache.tools.ant.types.resources.FileProvider; +import org.apache.tools.ant.types.resources.ZipResource; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipFile; diff --git a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java index 4f3c9cbff..e1ab5fafa 100644 --- a/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java +++ b/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.types.mappers; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.FileNameMapper; diff --git a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java index 12b2bca57..501da5000 100644 --- a/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java +++ b/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java @@ -18,9 +18,8 @@ package org.apache.tools.ant.types.mappers; -import java.io.StringReader; import java.io.Reader; - +import java.io.StringReader; import java.util.Vector; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java b/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java index 3e896e8bb..df5a3cec3 100644 --- a/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java +++ b/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java @@ -17,6 +17,8 @@ */ package org.apache.tools.ant.types.optional; +import java.io.File; + import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.types.Path; @@ -24,9 +26,6 @@ import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.ScriptRunnerBase; import org.apache.tools.ant.util.ScriptRunnerHelper; - -import java.io.File; - /** * This is a {@link ProjectComponent} that has script support built in * Use it as a foundation for scriptable things. diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java index 113c0e4ec..3f6ec88fd 100644 --- a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java +++ b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java @@ -18,10 +18,11 @@ package org.apache.tools.ant.types.optional; -import org.apache.tools.ant.filters.TokenFilter; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.filters.TokenFilter; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.ScriptRunnerBase; diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java b/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java index 8f42216a7..38dab0bb7 100644 --- a/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java +++ b/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java @@ -17,10 +17,10 @@ */ package org.apache.tools.ant.types.optional; -import org.apache.tools.ant.util.FileNameMapper; - import java.util.ArrayList; +import org.apache.tools.ant.util.FileNameMapper; + /** * Script support at map time. * @since Ant1.7 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 f34d3f4a8..f2fe69b12 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 @@ -21,8 +21,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Stack; import java.util.Vector; -import org.apache.tools.ant.Project; + import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.StringUtils; 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 de4c7faf4..bb3cf54bf 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 @@ -21,6 +21,7 @@ import java.io.File; 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.types.Path; diff --git a/src/main/org/apache/tools/ant/types/optional/image/Arc.java b/src/main/org/apache/tools/ant/types/optional/image/Arc.java index fcbb325aa..3d8b29b2d 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Arc.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Arc.java @@ -17,12 +17,13 @@ */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.PlanarImage; import java.awt.BasicStroke; import java.awt.Graphics2D; import java.awt.geom.Arc2D; import java.awt.image.BufferedImage; +import javax.media.jai.PlanarImage; + /** * Draw an arc. */ diff --git a/src/main/org/apache/tools/ant/types/optional/image/Draw.java b/src/main/org/apache/tools/ant/types/optional/image/Draw.java index ab7533bc4..2f097d5d5 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Draw.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Draw.java @@ -17,10 +17,11 @@ */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.PlanarImage; import java.awt.Graphics2D; import java.awt.image.BufferedImage; +import javax.media.jai.PlanarImage; + /** * * @see org.apache.tools.ant.taskdefs.optional.image.Image diff --git a/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java b/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java index 7b6736ad3..4f6410ca2 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/DrawOperation.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.optional.image; import javax.media.jai.PlanarImage; + /** * Interface which represents an Operation which is "drawable", such * as a Rectangle, Circle or Text. The Operation is responsible for diff --git a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java index 23623d0f4..9924d906e 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java @@ -17,12 +17,13 @@ */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.PlanarImage; import java.awt.BasicStroke; import java.awt.Graphics2D; import java.awt.geom.Ellipse2D; import java.awt.image.BufferedImage; +import javax.media.jai.PlanarImage; + /** * Draw an ellipse. * @see org.apache.tools.ant.taskdefs.optional.image.Image diff --git a/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java b/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java index fa917342c..d72fe0490 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java @@ -17,9 +17,10 @@ */ package org.apache.tools.ant.types.optional.image; -import org.apache.tools.ant.types.DataType; import java.util.Vector; +import org.apache.tools.ant.types.DataType; + /** * * @see org.apache.tools.ant.taskdefs.optional.image.Image diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java index aa03be6b3..e2d5bb1b2 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java @@ -17,11 +17,12 @@ */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.PlanarImage; import java.awt.BasicStroke; import java.awt.Graphics2D; import java.awt.image.BufferedImage; +import javax.media.jai.PlanarImage; + /** * * @see org.apache.tools.ant.taskdefs.optional.image.Image diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java index bfe6982fe..3013bde4e 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Rotate.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Rotate.java @@ -17,11 +17,12 @@ */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.PlanarImage; +import java.awt.image.BufferedImage; +import java.awt.image.renderable.ParameterBlock; + import javax.media.jai.InterpolationNearest; import javax.media.jai.JAI; -import java.awt.image.renderable.ParameterBlock; -import java.awt.image.BufferedImage; +import javax.media.jai.PlanarImage; /** * ImageOperation to rotate an image by a certain degree diff --git a/src/main/org/apache/tools/ant/types/optional/image/Scale.java b/src/main/org/apache/tools/ant/types/optional/image/Scale.java index ea588970d..532694d6e 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Scale.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Scale.java @@ -17,12 +17,13 @@ */ package org.apache.tools.ant.types.optional.image; -import org.apache.tools.ant.types.EnumeratedAttribute; +import java.awt.image.BufferedImage; +import java.awt.image.renderable.ParameterBlock; import javax.media.jai.JAI; import javax.media.jai.PlanarImage; -import java.awt.image.BufferedImage; -import java.awt.image.renderable.ParameterBlock; + +import org.apache.tools.ant.types.EnumeratedAttribute; /** * diff --git a/src/main/org/apache/tools/ant/types/optional/image/Text.java b/src/main/org/apache/tools/ant/types/optional/image/Text.java index 27ec5f666..869fbac1a 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/Text.java +++ b/src/main/org/apache/tools/ant/types/optional/image/Text.java @@ -17,7 +17,6 @@ */ package org.apache.tools.ant.types.optional.image; -import javax.media.jai.PlanarImage; import java.awt.Color; import java.awt.Font; import java.awt.FontMetrics; @@ -25,6 +24,8 @@ import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.image.BufferedImage; +import javax.media.jai.PlanarImage; + /** * * @see org.apache.tools.ant.taskdefs.optional.image.Image diff --git a/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java b/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java index fa50a233a..896e5d108 100644 --- a/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java +++ b/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java @@ -16,6 +16,7 @@ * */ package org.apache.tools.ant.types.optional.image; + import javax.media.jai.PlanarImage; /** diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java index 129924ceb..af1f5bf99 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java @@ -18,10 +18,9 @@ package org.apache.tools.ant.types.resolver; -import org.apache.xml.resolver.Catalog; -import org.apache.xml.resolver.CatalogEntry; - -import org.apache.xml.resolver.helpers.PublicId; +import com.sun.org.apache.xml.internal.resolver.Catalog; +import com.sun.org.apache.xml.internal.resolver.CatalogEntry; +import com.sun.org.apache.xml.internal.resolver.helpers.PublicId; /** * This class extends the Catalog class provided by Norman Walsh's diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java index 79dae8997..17b1e8a2f 100644 --- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java +++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java @@ -19,19 +19,16 @@ package org.apache.tools.ant.types.resolver; import java.io.IOException; - import java.net.MalformedURLException; import java.net.URL; import org.apache.tools.ant.BuildException; - -import org.apache.tools.ant.types.XMLCatalog; import org.apache.tools.ant.types.ResourceLocation; +import org.apache.tools.ant.types.XMLCatalog; -import org.apache.xml.resolver.Catalog; -import org.apache.xml.resolver.CatalogManager; - -import org.apache.xml.resolver.tools.CatalogResolver; +import com.sun.org.apache.xml.internal.resolver.Catalog; +import com.sun.org.apache.xml.internal.resolver.CatalogManager; +import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; /** * <p>This class extends the CatalogResolver class provided by Norman diff --git a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java index 0aeaf9e31..417da9a7a 100644 --- a/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java +++ b/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java @@ -17,18 +17,18 @@ */ package org.apache.tools.ant.types.resources; +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Stack; + import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileUtils; -import java.io.FilterInputStream; -import java.io.InputStream; -import java.io.IOException; -import java.util.Stack; - /** * * A Resource representation of anything that is accessed via a Java classloader. diff --git a/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java b/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java index a6cba5b7b..308de03e0 100644 --- a/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java +++ b/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java @@ -22,9 +22,9 @@ import java.util.Stack; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.Reference; /** * A Resource representation of an entry inside an archive. diff --git a/src/main/org/apache/tools/ant/types/resources/Archives.java b/src/main/org/apache/tools/ant/types/resources/Archives.java index 3667c8d50..0f45437df 100644 --- a/src/main/org/apache/tools/ant/types/resources/Archives.java +++ b/src/main/org/apache/tools/ant/types/resources/Archives.java @@ -21,6 +21,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.ArchiveFileSet; diff --git a/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java b/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java index a00d696c3..0c2dd4be8 100644 --- a/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java +++ b/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import org.apache.tools.bzip2.CBZip2InputStream; diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java index 27af1c876..281fa0f1f 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java @@ -18,15 +18,15 @@ package org.apache.tools.ant.types.resources; import java.io.File; -import java.util.List; -import java.util.Stack; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Stack; -import org.apache.tools.ant.Project; 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.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java index c5dad48c8..78ba95eea 100644 --- a/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java +++ b/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.resources; import java.util.Collection; import java.util.Iterator; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java b/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java index d5c8c3754..4921e34aa 100644 --- a/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java +++ b/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/resources/Difference.java b/src/main/org/apache/tools/ant/types/resources/Difference.java index 7afa7bb40..3f3c983c9 100644 --- a/src/main/org/apache/tools/ant/types/resources/Difference.java +++ b/src/main/org/apache/tools/ant/types/resources/Difference.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/FailFast.java b/src/main/org/apache/tools/ant/types/resources/FailFast.java index e95bc81dc..dc962bb4f 100644 --- a/src/main/org/apache/tools/ant/types/resources/FailFast.java +++ b/src/main/org/apache/tools/ant/types/resources/FailFast.java @@ -17,12 +17,13 @@ */ package org.apache.tools.ant.types.resources; -import java.util.Set; +import java.util.ConcurrentModificationException; import java.util.HashSet; import java.util.Iterator; -import java.util.WeakHashMap; import java.util.NoSuchElementException; -import java.util.ConcurrentModificationException; +import java.util.Set; +import java.util.WeakHashMap; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/FileResource.java b/src/main/org/apache/tools/ant/types/resources/FileResource.java index e7070323f..3ed49b812 100644 --- a/src/main/org/apache/tools/ant/types/resources/FileResource.java +++ b/src/main/org/apache/tools/ant/types/resources/FileResource.java @@ -18,18 +18,18 @@ package org.apache.tools.ant.types.resources; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceFactory; +import org.apache.tools.ant.util.FileUtils; /** * A Resource representation of a File. diff --git a/src/main/org/apache/tools/ant/types/resources/Files.java b/src/main/org/apache/tools/ant/types/resources/Files.java index 4dc682b89..521bcc8d2 100644 --- a/src/main/org/apache/tools/ant/types/resources/Files.java +++ b/src/main/org/apache/tools/ant/types/resources/Files.java @@ -18,19 +18,19 @@ package org.apache.tools.ant.types.resources; import java.io.File; -import java.util.Vector; -import java.util.Iterator; import java.util.Collections; +import java.util.Iterator; +import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.PatternSet; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.selectors.FileSelector; import org.apache.tools.ant.types.selectors.AbstractSelectorContainer; +import org.apache.tools.ant.types.selectors.FileSelector; /** * ResourceCollection implementation; like AbstractFileSet with absolute paths. diff --git a/src/main/org/apache/tools/ant/types/resources/First.java b/src/main/org/apache/tools/ant/types/resources/First.java index c5f670f6e..ea9e7d0ae 100644 --- a/src/main/org/apache/tools/ant/types/resources/First.java +++ b/src/main/org/apache/tools/ant/types/resources/First.java @@ -17,10 +17,11 @@ */ package org.apache.tools.ant.types.resources; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/GZipResource.java b/src/main/org/apache/tools/ant/types/resources/GZipResource.java index 9c02f08ae..3f95a6982 100644 --- a/src/main/org/apache/tools/ant/types/resources/GZipResource.java +++ b/src/main/org/apache/tools/ant/types/resources/GZipResource.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; diff --git a/src/main/org/apache/tools/ant/types/resources/Intersect.java b/src/main/org/apache/tools/ant/types/resources/Intersect.java index 015e5da16..301df7c06 100644 --- a/src/main/org/apache/tools/ant/types/resources/Intersect.java +++ b/src/main/org/apache/tools/ant/types/resources/Intersect.java @@ -17,10 +17,10 @@ */ package org.apache.tools.ant.types.resources; -import java.util.List; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; +import java.util.List; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.Resource; diff --git a/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java b/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java index 63b617118..fe6ed6945 100644 --- a/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java +++ b/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java @@ -17,9 +17,9 @@ */ package org.apache.tools.ant.types.resources; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ByteArrayInputStream; import java.lang.reflect.Field; /** diff --git a/src/main/org/apache/tools/ant/types/resources/Last.java b/src/main/org/apache/tools/ant/types/resources/Last.java index 93910f1af..312271b23 100644 --- a/src/main/org/apache/tools/ant/types/resources/Last.java +++ b/src/main/org/apache/tools/ant/types/resources/Last.java @@ -17,9 +17,9 @@ */ package org.apache.tools.ant.types.resources; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java index 0460253af..a66098d76 100644 --- a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java +++ b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; + import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/MappedResource.java b/src/main/org/apache/tools/ant/types/resources/MappedResource.java index 6f7184d74..bffc9a8f8 100644 --- a/src/main/org/apache/tools/ant/types/resources/MappedResource.java +++ b/src/main/org/apache/tools/ant/types/resources/MappedResource.java @@ -17,9 +17,6 @@ */ package org.apache.tools.ant.types.resources; -import java.io.File; -import java.util.Iterator; - import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileNameMapper; diff --git a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java index 6452bba91..2f1a926b6 100644 --- a/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java +++ b/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; diff --git a/src/main/org/apache/tools/ant/types/resources/PropertyResource.java b/src/main/org/apache/tools/ant/types/resources/PropertyResource.java index 9517e014b..a7cecb4b8 100644 --- a/src/main/org/apache/tools/ant/types/resources/PropertyResource.java +++ b/src/main/org/apache/tools/ant/types/resources/PropertyResource.java @@ -18,10 +18,10 @@ package org.apache.tools.ant.types.resources; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.ByteArrayInputStream; import org.apache.tools.ant.Project; import org.apache.tools.ant.PropertyHelper; diff --git a/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java b/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java index 0de40524e..3806cf2ca 100644 --- a/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java +++ b/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java @@ -17,15 +17,15 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.Stack; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; /** diff --git a/src/main/org/apache/tools/ant/types/resources/Resources.java b/src/main/org/apache/tools/ant/types/resources/Resources.java index 6f2e3cf2d..1dd888d4d 100644 --- a/src/main/org/apache/tools/ant/types/resources/Resources.java +++ b/src/main/org/apache/tools/ant/types/resources/Resources.java @@ -19,17 +19,17 @@ package org.apache.tools.ant.types.resources; import java.io.File; -import java.util.List; -import java.util.Stack; -import java.util.Vector; -import java.util.Iterator; +import java.util.AbstractCollection; import java.util.Collection; import java.util.Collections; -import java.util.AbstractCollection; +import java.util.Iterator; +import java.util.List; import java.util.NoSuchElementException; +import java.util.Stack; +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.types.DataType; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/Sort.java b/src/main/org/apache/tools/ant/types/resources/Sort.java index 50f50327c..b4dc88c2e 100644 --- a/src/main/org/apache/tools/ant/types/resources/Sort.java +++ b/src/main/org/apache/tools/ant/types/resources/Sort.java @@ -17,19 +17,19 @@ */ package org.apache.tools.ant.types.resources; -import java.util.List; -import java.util.Stack; -import java.util.Iterator; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Stack; -import org.apache.tools.ant.Project; 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.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.resources.comparators.ResourceComparator; import org.apache.tools.ant.types.resources.comparators.DelegatedResourceComparator; +import org.apache.tools.ant.types.resources.comparators.ResourceComparator; import org.apache.tools.ant.util.CollectionUtils; /** diff --git a/src/main/org/apache/tools/ant/types/resources/StringResource.java b/src/main/org/apache/tools/ant/types/resources/StringResource.java index a550b2b0e..b12a2e14f 100644 --- a/src/main/org/apache/tools/ant/types/resources/StringResource.java +++ b/src/main/org/apache/tools/ant/types/resources/StringResource.java @@ -17,17 +17,17 @@ */ package org.apache.tools.ant.types.resources; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.FilterOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; /** * Exposes a string as a Resource. diff --git a/src/main/org/apache/tools/ant/types/resources/TarResource.java b/src/main/org/apache/tools/ant/types/resources/TarResource.java index eae9cf095..62f1f2670 100644 --- a/src/main/org/apache/tools/ant/types/resources/TarResource.java +++ b/src/main/org/apache/tools/ant/types/resources/TarResource.java @@ -18,12 +18,12 @@ package org.apache.tools.ant.types.resources; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.tar.TarEntry; diff --git a/src/main/org/apache/tools/ant/types/resources/Tokens.java b/src/main/org/apache/tools/ant/types/resources/Tokens.java index 185e4844b..0a518c3dc 100644 --- a/src/main/org/apache/tools/ant/types/resources/Tokens.java +++ b/src/main/org/apache/tools/ant/types/resources/Tokens.java @@ -17,16 +17,16 @@ */ package org.apache.tools.ant.types.resources; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; -import java.util.Stack; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Stack; -import org.apache.tools.ant.Project; 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.Resource; import org.apache.tools.ant.types.ResourceCollection; diff --git a/src/main/org/apache/tools/ant/types/resources/URLResource.java b/src/main/org/apache/tools/ant/types/resources/URLResource.java index e77827a85..3ad1bd179 100644 --- a/src/main/org/apache/tools/ant/types/resources/URLResource.java +++ b/src/main/org/apache/tools/ant/types/resources/URLResource.java @@ -23,14 +23,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import java.net.MalformedURLException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileUtils; /** diff --git a/src/main/org/apache/tools/ant/types/resources/ZipResource.java b/src/main/org/apache/tools/ant/types/resources/ZipResource.java index 9b31d61c2..37fc98ec4 100644 --- a/src/main/org/apache/tools/ant/types/resources/ZipResource.java +++ b/src/main/org/apache/tools/ant/types/resources/ZipResource.java @@ -18,20 +18,20 @@ package org.apache.tools.ant.types.resources; import java.io.File; +import java.io.FilterInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; -import java.io.FilterInputStream; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.zip.ZipFile; import org.apache.tools.zip.ZipEntry; import org.apache.tools.zip.ZipExtraField; +import org.apache.tools.zip.ZipFile; /** * A Resource representation of an entry in a zipfile. diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java index edc308ffc..aa2f55a83 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java @@ -17,10 +17,10 @@ */ package org.apache.tools.ant.types.resources.comparators; +import java.util.Iterator; import java.util.List; import java.util.Stack; import java.util.Vector; -import java.util.Iterator; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java index 8ae857839..7eafeb947 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.types.resources.comparators; import java.io.File; + import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.util.FileUtils; diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java b/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java index 70e6cd820..c787a7652 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.types.resources.comparators; import java.util.Stack; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java b/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java index 08c88ceb2..f345c278f 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Compare.java @@ -19,16 +19,16 @@ package org.apache.tools.ant.types.resources.selectors; import java.util.Stack; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Comparison; import org.apache.tools.ant.types.DataType; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Quantifier; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.Union; -import org.apache.tools.ant.types.resources.comparators.ResourceComparator; import org.apache.tools.ant.types.resources.comparators.DelegatedResourceComparator; +import org.apache.tools.ant.types.resources.comparators.ResourceComparator; /** * ResourceSelector that compares against "control" Resource(s) diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java index e12899944..c48e4bc5a 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Date.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Date.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.types.resources.selectors; import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Locale; import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java b/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java index bb663f0a3..39b310886 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java @@ -18,11 +18,11 @@ package org.apache.tools.ant.types.resources.selectors; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.ProjectHelper; +import org.apache.tools.ant.AntTypeDefinition; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.ComponentHelper; -import org.apache.tools.ant.AntTypeDefinition; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.types.Resource; /** diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java b/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java index 6fd2e0608..6b1c8002e 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java @@ -18,13 +18,13 @@ package org.apache.tools.ant.types.resources.selectors; import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Stack; -import java.util.Iterator; -import java.util.Collections; -import org.apache.tools.ant.Project; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.DataType; /** diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Size.java b/src/main/org/apache/tools/ant/types/resources/selectors/Size.java index 1309d7eae..4d6c87e2c 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Size.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Size.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.resources.selectors; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.Comparison; +import org.apache.tools.ant.types.Resource; /** * Size ResourceSelector. diff --git a/src/main/org/apache/tools/ant/types/resources/selectors/Type.java b/src/main/org/apache/tools/ant/types/resources/selectors/Type.java index 2a9c66eb4..6c8cd7a12 100644 --- a/src/main/org/apache/tools/ant/types/resources/selectors/Type.java +++ b/src/main/org/apache/tools/ant/types/resources/selectors/Type.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.types.resources.selectors; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.ant.types.Resource; /** * Type file/dir ResourceSelector. 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 e0cf072f0..aea94a8be 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DateSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DateSelector.java @@ -20,8 +20,8 @@ package org.apache.tools.ant.types.selectors; import java.io.File; import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Locale; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java index 9b979e918..c701fb845 100644 --- a/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java @@ -18,12 +18,12 @@ package org.apache.tools.ant.types.selectors; -import org.apache.tools.ant.util.FileUtils; -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.util.FileUtils; + /** * This selector selects files against a mapped set of target files, selecting * all those files which are different. 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 d55768454..af8c920f6 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java @@ -21,9 +21,9 @@ package org.apache.tools.ant.types.selectors; import java.io.File; import java.util.Vector; -import org.apache.tools.ant.Project; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; 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/MappingSelector.java b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java index 3b96f1b65..63e7a4493 100644 --- a/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java @@ -18,13 +18,13 @@ package org.apache.tools.ant.types.selectors; -import org.apache.tools.ant.types.Mapper; +import java.io.File; + import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.IdentityMapper; +import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; - -import java.io.File; +import org.apache.tools.ant.util.IdentityMapper; /** * A mapping selector is an abstract class adding mapping support to the base diff --git a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java index f4ee5bae0..b0c527c5d 100644 --- a/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.selectors; import java.io.File; + import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; 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 d0bf593a8..2089012ce 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.types.selectors; -import java.util.Enumeration; import java.io.File; +import java.util.Enumeration; import org.apache.tools.ant.Project; import org.apache.tools.ant.PropertyHelper; 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 089e132a9..47e4e4fd6 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/SelectorContainer.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.selectors; import java.util.Enumeration; + import org.apache.tools.ant.Project; import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector; diff --git a/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java b/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java index 74f8bd55c..cd5150223 100644 --- a/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java @@ -18,8 +18,9 @@ package org.apache.tools.ant.types.selectors; import java.io.File; -import org.apache.tools.ant.types.DataType; + import org.apache.tools.ant.taskdefs.condition.IsSigned; +import org.apache.tools.ant.types.DataType; /** * Selector that chooses files based on whether they are signed or not. diff --git a/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java b/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java index 219b9d32a..6ffd57193 100644 --- a/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.types.selectors; import java.io.File; + import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java index d05803a3a..210d5dc97 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java @@ -18,15 +18,16 @@ package org.apache.tools.ant.types.selectors.modifiedselector; -import java.util.Locale; -import java.util.zip.Checksum; -import java.util.zip.CRC32; -import java.util.zip.Adler32; -import java.util.zip.CheckedInputStream; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.BufferedInputStream; import java.security.NoSuchAlgorithmException; +import java.util.Locale; +import java.util.zip.Adler32; +import java.util.zip.CRC32; +import java.util.zip.CheckedInputStream; +import java.util.zip.Checksum; + import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java index a421b6f91..085b4fe75 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java @@ -21,11 +21,12 @@ package org.apache.tools.ant.types.selectors.modifiedselector; import java.io.File; import java.io.FileInputStream; -import java.util.Locale; import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; +import java.util.Locale; + import org.apache.tools.ant.BuildException; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java index 8ecd0e000..8af9d12ed 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.java @@ -18,11 +18,12 @@ package org.apache.tools.ant.types.selectors.modifiedselector; -import org.apache.tools.ant.util.FileUtils; import java.io.File; import java.io.FileReader; import java.io.Reader; +import org.apache.tools.ant.util.FileUtils; + /** * Computes a 'hashvalue' for the content of file using String.hashValue(). * Use of this algorithm doesn't require any additional nested <param>s and diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java index a934b692c..f93e406a9 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java @@ -25,12 +25,12 @@ import java.util.Comparator; import java.util.Iterator; import java.util.Vector; -// Ant -import org.apache.tools.ant.Project; -import org.apache.tools.ant.IntrospectionHelper; +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.IntrospectionHelper; +// Ant +import org.apache.tools.ant.Project; import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.Parameter; import org.apache.tools.ant.types.Path; diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java index 4a8caa263..1446e8904 100644 --- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java +++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java @@ -19,15 +19,15 @@ package org.apache.tools.ant.types.selectors.modifiedselector; -import java.util.Iterator; -import java.util.Vector; -import java.util.Enumeration; -import java.util.Properties; -import java.io.File; import java.io.BufferedInputStream; -import java.io.FileInputStream; import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Properties; +import java.util.Vector; /** diff --git a/src/main/org/apache/tools/ant/types/spi/Provider.java b/src/main/org/apache/tools/ant/types/spi/Provider.java index 2edfe78c3..f73b01911 100644 --- a/src/main/org/apache/tools/ant/types/spi/Provider.java +++ b/src/main/org/apache/tools/ant/types/spi/Provider.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.types.spi; -import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ProjectComponent; /** * ANT Jar-Task SPI extension diff --git a/src/main/org/apache/tools/ant/types/spi/Service.java b/src/main/org/apache/tools/ant/types/spi/Service.java index 7656c50eb..96c8e4e5f 100644 --- a/src/main/org/apache/tools/ant/types/spi/Service.java +++ b/src/main/org/apache/tools/ant/types/spi/Service.java @@ -26,8 +26,8 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; -import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ProjectComponent; /** * ANT Jar-Task SPI extension diff --git a/src/main/org/apache/tools/ant/util/ChainedMapper.java b/src/main/org/apache/tools/ant/util/ChainedMapper.java index 27927db5d..635a05387 100644 --- a/src/main/org/apache/tools/ant/util/ChainedMapper.java +++ b/src/main/org/apache/tools/ant/util/ChainedMapper.java @@ -18,10 +18,10 @@ package org.apache.tools.ant.util; -import java.util.List; +import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; -import java.util.ArrayList; +import java.util.List; /** * A <code>ContainerMapper</code> that chains the results of the first diff --git a/src/main/org/apache/tools/ant/util/ClasspathUtils.java b/src/main/org/apache/tools/ant/util/ClasspathUtils.java index 38db0d51b..309860e99 100644 --- a/src/main/org/apache/tools/ant/util/ClasspathUtils.java +++ b/src/main/org/apache/tools/ant/util/ClasspathUtils.java @@ -19,9 +19,9 @@ package org.apache.tools.ant.util; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.MagicNames; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; -import org.apache.tools.ant.MagicNames; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java b/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java index 7d509847a..22dcb7fb6 100644 --- a/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java +++ b/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java @@ -18,11 +18,11 @@ package org.apache.tools.ant.util; -import java.io.File; -import java.io.InputStream; import java.io.BufferedInputStream; -import java.io.IOException; +import java.io.File; import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; diff --git a/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java b/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java index ae5dd9750..7bae58e58 100644 --- a/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java +++ b/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java @@ -18,9 +18,9 @@ package org.apache.tools.ant.util; -import java.io.InputStream; import java.io.BufferedInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Iterator; import org.apache.tools.ant.Project; diff --git a/src/main/org/apache/tools/ant/util/ContainerMapper.java b/src/main/org/apache/tools/ant/util/ContainerMapper.java index c3bf08c89..990ee1488 100644 --- a/src/main/org/apache/tools/ant/util/ContainerMapper.java +++ b/src/main/org/apache/tools/ant/util/ContainerMapper.java @@ -18,10 +18,11 @@ package org.apache.tools.ant.util; -import java.util.List; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collections; +import java.util.Iterator; +import java.util.List; + import org.apache.tools.ant.types.Mapper; /** diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java index b9b22730a..ea1f7f353 100644 --- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java +++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java @@ -26,6 +26,7 @@ import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; + import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/src/main/org/apache/tools/ant/util/FileTokenizer.java b/src/main/org/apache/tools/ant/util/FileTokenizer.java index 01ee976ed..2807aa423 100644 --- a/src/main/org/apache/tools/ant/util/FileTokenizer.java +++ b/src/main/org/apache/tools/ant/util/FileTokenizer.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.util; import java.io.IOException; import java.io.Reader; + import org.apache.tools.ant.ProjectComponent; /** diff --git a/src/main/org/apache/tools/ant/util/JAXPUtils.java b/src/main/org/apache/tools/ant/util/JAXPUtils.java index ca310fb77..76460ae2c 100644 --- a/src/main/org/apache/tools/ant/util/JAXPUtils.java +++ b/src/main/org/apache/tools/ant/util/JAXPUtils.java @@ -18,12 +18,14 @@ package org.apache.tools.ant.util; import java.io.File; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; 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; diff --git a/src/main/org/apache/tools/ant/util/LazyHashtable.java b/src/main/org/apache/tools/ant/util/LazyHashtable.java index 54fe3d9cc..1df953cf3 100644 --- a/src/main/org/apache/tools/ant/util/LazyHashtable.java +++ b/src/main/org/apache/tools/ant/util/LazyHashtable.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.util; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; /** Hashtable implementation that allows delayed construction * of expensive objects diff --git a/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java b/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java index 9ebc10c2c..37650cc69 100644 --- a/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java +++ b/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.io.PipedInputStream; import java.io.PipedOutputStream; +import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.Task; -import org.apache.tools.ant.Project; /** * Special <code>PipedInputStream</code> that will not die diff --git a/src/main/org/apache/tools/ant/util/LineTokenizer.java b/src/main/org/apache/tools/ant/util/LineTokenizer.java index 11e7ebce4..778606dd3 100644 --- a/src/main/org/apache/tools/ant/util/LineTokenizer.java +++ b/src/main/org/apache/tools/ant/util/LineTokenizer.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.util; -import java.io.Reader; import java.io.IOException; +import java.io.Reader; import org.apache.tools.ant.ProjectComponent; diff --git a/src/main/org/apache/tools/ant/util/LoaderUtils.java b/src/main/org/apache/tools/ant/util/LoaderUtils.java index 6744cc72b..e0514f656 100644 --- a/src/main/org/apache/tools/ant/util/LoaderUtils.java +++ b/src/main/org/apache/tools/ant/util/LoaderUtils.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.util; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.launch.Locator; diff --git a/src/main/org/apache/tools/ant/util/ReflectUtil.java b/src/main/org/apache/tools/ant/util/ReflectUtil.java index 07baf3edd..ed8b47a95 100644 --- a/src/main/org/apache/tools/ant/util/ReflectUtil.java +++ b/src/main/org/apache/tools/ant/util/ReflectUtil.java @@ -18,10 +18,11 @@ package org.apache.tools.ant.util; import java.lang.reflect.Constructor; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + import org.apache.tools.ant.BuildException; -import java.lang.reflect.Field; /** * Utility class to handle reflection on java objects. diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java index ff6e66792..fa620d9ad 100644 --- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java +++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java @@ -19,6 +19,7 @@ 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; diff --git a/src/main/org/apache/tools/ant/util/ResourceUtils.java b/src/main/org/apache/tools/ant/util/ResourceUtils.java index 16a139a7d..50c34c253 100644 --- a/src/main/org/apache/tools/ant/util/ResourceUtils.java +++ b/src/main/org/apache/tools/ant/util/ResourceUtils.java @@ -31,25 +31,24 @@ import java.io.OutputStreamWriter; import java.io.Reader; import java.nio.channels.FileChannel; import java.util.Arrays; -import java.util.Iterator; import java.util.Vector; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.filters.util.ChainReaderHelper; +import org.apache.tools.ant.types.FilterSetCollection; import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.types.TimeComparison; -import org.apache.tools.ant.types.ResourceFactory; import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.FilterSetCollection; +import org.apache.tools.ant.types.ResourceFactory; +import org.apache.tools.ant.types.TimeComparison; import org.apache.tools.ant.types.resources.Appendable; import org.apache.tools.ant.types.resources.FileProvider; import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.types.resources.Union; -import org.apache.tools.ant.types.resources.Restrict; import org.apache.tools.ant.types.resources.Resources; +import org.apache.tools.ant.types.resources.Restrict; import org.apache.tools.ant.types.resources.StringResource; import org.apache.tools.ant.types.resources.Touchable; +import org.apache.tools.ant.types.resources.Union; import org.apache.tools.ant.types.resources.selectors.Date; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; import org.apache.tools.ant.types.selectors.SelectorUtils; diff --git a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java index 9bf9a605f..0b8bf98e3 100644 --- a/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java +++ b/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java @@ -17,11 +17,12 @@ */ package org.apache.tools.ant.util; -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.BuildException; import java.io.File; -import java.util.Map; import java.util.HashMap; +import java.util.Map; + +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java index 67bb54cfa..b8aa01a81 100644 --- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java +++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java @@ -19,23 +19,22 @@ package org.apache.tools.ant.util; import java.io.BufferedReader; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; -import java.io.Reader; -import java.io.FileNotFoundException; import java.io.InputStreamReader; +import java.io.Reader; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.Project; +import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; -import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; - /** * This is a common abstract base case for script runners. * These classes need to implement executeScript, evaluateScript diff --git a/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/src/main/org/apache/tools/ant/util/SourceFileScanner.java index e98698709..c79f03478 100644 --- a/src/main/org/apache/tools/ant/util/SourceFileScanner.java +++ b/src/main/org/apache/tools/ant/util/SourceFileScanner.java @@ -20,6 +20,7 @@ package org.apache.tools.ant.util; import java.io.File; import java.util.Vector; + import org.apache.tools.ant.Task; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceFactory; diff --git a/src/main/org/apache/tools/ant/util/StringTokenizer.java b/src/main/org/apache/tools/ant/util/StringTokenizer.java index ef91ff669..7addf3106 100644 --- a/src/main/org/apache/tools/ant/util/StringTokenizer.java +++ b/src/main/org/apache/tools/ant/util/StringTokenizer.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.util; import java.io.IOException; import java.io.Reader; + import org.apache.tools.ant.ProjectComponent; /** diff --git a/src/main/org/apache/tools/ant/util/StringUtils.java b/src/main/org/apache/tools/ant/util/StringUtils.java index 7491303e4..b11f92ae3 100644 --- a/src/main/org/apache/tools/ant/util/StringUtils.java +++ b/src/main/org/apache/tools/ant/util/StringUtils.java @@ -17,12 +17,12 @@ */ package org.apache.tools.ant.util; -import org.apache.tools.ant.BuildException; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.Vector; +import org.apache.tools.ant.BuildException; + /** * A set of helper methods related to string manipulation. * diff --git a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java index f52ea0d03..d6c7353a4 100644 --- a/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java +++ b/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java @@ -21,6 +21,8 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FilenameFilter; import java.io.IOException; + +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Execute; diff --git a/src/main/org/apache/tools/ant/util/TeeOutputStream.java b/src/main/org/apache/tools/ant/util/TeeOutputStream.java index 7daf11f8f..eb8da3fac 100644 --- a/src/main/org/apache/tools/ant/util/TeeOutputStream.java +++ b/src/main/org/apache/tools/ant/util/TeeOutputStream.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.util; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; /** * A simple T-piece to replicate an output stream into two separate streams diff --git a/src/main/org/apache/tools/ant/util/Tokenizer.java b/src/main/org/apache/tools/ant/util/Tokenizer.java index dc9407cb4..25f896504 100644 --- a/src/main/org/apache/tools/ant/util/Tokenizer.java +++ b/src/main/org/apache/tools/ant/util/Tokenizer.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.util; -import java.io.Reader; import java.io.IOException; +import java.io.Reader; /** * input stream tokenizers implement this interface diff --git a/src/main/org/apache/tools/ant/util/UUEncoder.java b/src/main/org/apache/tools/ant/util/UUEncoder.java index 1c17c6270..77e1bee1a 100644 --- a/src/main/org/apache/tools/ant/util/UUEncoder.java +++ b/src/main/org/apache/tools/ant/util/UUEncoder.java @@ -17,8 +17,8 @@ */ package org.apache.tools.ant.util; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.io.PrintStream; diff --git a/src/main/org/apache/tools/ant/util/WorkerAnt.java b/src/main/org/apache/tools/ant/util/WorkerAnt.java index 9a6b4d85b..a30427882 100644 --- a/src/main/org/apache/tools/ant/util/WorkerAnt.java +++ b/src/main/org/apache/tools/ant/util/WorkerAnt.java @@ -18,8 +18,8 @@ package org.apache.tools.ant.util; -import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; /** * A worker ant executes a single task in a background thread. diff --git a/src/main/org/apache/tools/ant/util/XMLFragment.java b/src/main/org/apache/tools/ant/util/XMLFragment.java index 1f21a3a69..36a6158e0 100644 --- a/src/main/org/apache/tools/ant/util/XMLFragment.java +++ b/src/main/org/apache/tools/ant/util/XMLFragment.java @@ -18,16 +18,15 @@ package org.apache.tools.ant.util; +import org.apache.tools.ant.DynamicConfiguratorNS; +import org.apache.tools.ant.DynamicElementNS; +import org.apache.tools.ant.ProjectComponent; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.Text; -import org.apache.tools.ant.DynamicElementNS; -import org.apache.tools.ant.ProjectComponent; -import org.apache.tools.ant.DynamicConfiguratorNS; - /** * Use this class as a nested element if you want to get a literal DOM * fragment of something nested into your task/type. diff --git a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java index c198c8dc2..5c95d75b8 100644 --- a/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Vector; import java.util.zip.ZipFile; + import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.VectorSet; 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 997ef9099..1415e2e43 100644 --- a/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/DependencyAnalyzer.java @@ -19,6 +19,7 @@ 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/depend/bcel/AncestorAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java index 2bd2a6cf6..3a9fb3e5c 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java @@ -21,11 +21,13 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.JavaClass; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.depend.AbstractAnalyzer; +import com.sun.org.apache.bcel.internal.classfile.ClassParser; +import com.sun.org.apache.bcel.internal.classfile.JavaClass; + /** * A dependency analyzer which returns superclass and superinterface * dependencies. diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java index 61dade918..f086b1f7a 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java @@ -20,13 +20,10 @@ package org.apache.tools.ant.util.depend.bcel; import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.EmptyVisitor; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.ConstantNameAndType; + +import com.sun.org.apache.bcel.internal.classfile.ConstantClass; +import com.sun.org.apache.bcel.internal.classfile.ConstantNameAndType; +import com.sun.org.apache.bcel.internal.classfile.JavaClass; /** * A BCEL visitor implementation to collect class dependency information diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java index f270fd48e..555e9b328 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java @@ -21,12 +21,14 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.DescendingVisitor; -import org.apache.bcel.classfile.JavaClass; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.depend.AbstractAnalyzer; +import com.sun.org.apache.bcel.internal.classfile.ClassParser; +import com.sun.org.apache.bcel.internal.classfile.DescendingVisitor; +import com.sun.org.apache.bcel.internal.classfile.JavaClass; + /** * An analyzer capable fo traversing all class - class relationships. * diff --git a/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java b/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java index 2de657ddc..e7412d60c 100644 --- a/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java +++ b/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java @@ -18,17 +18,17 @@ package org.apache.tools.ant.util.java15; -import org.apache.tools.ant.BuildException; - +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Proxy; import java.net.ProxySelector; +import java.net.SocketAddress; import java.net.URI; import java.net.URISyntaxException; -import java.net.Proxy; -import java.net.SocketAddress; -import java.net.InetSocketAddress; -import java.net.InetAddress; -import java.util.List; import java.util.Iterator; +import java.util.List; + +import org.apache.tools.ant.BuildException; /** * This class exists to create a string that tells diagnostics about the current diff --git a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java index e5ba85995..a24537ac8 100644 --- a/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java +++ b/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java @@ -18,11 +18,11 @@ package org.apache.tools.ant.util.optional; -import org.apache.tools.ant.BuildException; - import java.util.Iterator; -import org.apache.tools.ant.util.ScriptRunnerBase; + +import org.apache.tools.ant.BuildException; import org.apache.tools.ant.util.ReflectWrapper; +import org.apache.tools.ant.util.ScriptRunnerBase; /** * This class is used to run scripts using JSR 223. 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 eed3ad122..e704ab29e 100644 --- a/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java +++ b/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.util.optional; import java.security.Permission; + import org.apache.tools.ant.ExitException; /** diff --git a/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java b/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java index 15f6e6f4f..0f4cd1f9f 100644 --- a/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java +++ b/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java @@ -17,16 +17,14 @@ */ package org.apache.tools.ant.util.optional; -import org.apache.bsf.BSFException; -import org.apache.bsf.BSFManager; -import org.apache.bsf.BSFEngine; - -import java.util.Iterator; import java.util.Hashtable; +import java.util.Iterator; +import org.apache.bsf.BSFEngine; +import org.apache.bsf.BSFException; +import org.apache.bsf.BSFManager; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; - import org.apache.tools.ant.util.ReflectUtil; import org.apache.tools.ant.util.ScriptRunnerBase; 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 59d9e9146..643afaf20 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java @@ -19,8 +19,8 @@ package org.apache.tools.ant.util.regexp; import java.util.Vector; -import org.apache.oro.text.regex.MatchResult; -import org.apache.oro.text.regex.Pattern; +import java.util.regex.MatchResult; + import org.apache.oro.text.regex.Perl5Compiler; import org.apache.oro.text.regex.Perl5Matcher; import org.apache.tools.ant.BuildException; 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 2baf98bd8..156b4522b 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java @@ -18,8 +18,6 @@ package org.apache.tools.ant.util.regexp; 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 3e14415d7..ab7674b69 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java @@ -19,10 +19,12 @@ 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 com.sun.org.apache.regexp.internal.RE; +import com.sun.org.apache.regexp.internal.RESyntaxException; + /** * 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 865f424a1..50493a249 100644 --- a/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java @@ -18,9 +18,11 @@ package org.apache.tools.ant.util.regexp; import java.util.Vector; -import org.apache.regexp.RE; + import org.apache.tools.ant.BuildException; +import com.sun.org.apache.regexp.internal.RE; + /*** * 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 07b2b1709..8c241d4e2 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java @@ -22,6 +22,7 @@ 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 8aa0e430b..3ca807065 100644 --- a/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java +++ b/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.util.regexp; 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 edd1cfe83..7938d8beb 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java @@ -19,6 +19,7 @@ package org.apache.tools.ant.util.regexp; import java.util.Vector; + import org.apache.tools.ant.BuildException; /** diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java index 7fabe0919..ff221d10a 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java @@ -17,9 +17,9 @@ */ package org.apache.tools.ant.util.regexp; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.MagicNames; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.MagicNames; +import org.apache.tools.ant.Project; import org.apache.tools.ant.util.ClasspathUtils; /** diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index a4c8bfef7..71d0d379f 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -26,14 +26,14 @@ package org.apache.tools.mail; -import java.io.IOException; -import java.io.PrintStream; import java.io.BufferedOutputStream; +import java.io.IOException; import java.io.OutputStream; -import java.net.Socket; +import java.io.PrintStream; import java.net.InetAddress; -import java.util.Vector; +import java.net.Socket; import java.util.Enumeration; +import java.util.Vector; /** * A class to help send SMTP email. diff --git a/src/main/org/apache/tools/mail/SmtpResponseReader.java b/src/main/org/apache/tools/mail/SmtpResponseReader.java index 8d52ec89c..c1693f49e 100644 --- a/src/main/org/apache/tools/mail/SmtpResponseReader.java +++ b/src/main/org/apache/tools/mail/SmtpResponseReader.java @@ -18,9 +18,9 @@ package org.apache.tools.mail; -import java.io.InputStream; -import java.io.IOException; import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; /** diff --git a/src/main/org/apache/tools/tar/TarBuffer.java b/src/main/org/apache/tools/tar/TarBuffer.java index de2321033..b089d9bf8 100644 --- a/src/main/org/apache/tools/tar/TarBuffer.java +++ b/src/main/org/apache/tools/tar/TarBuffer.java @@ -23,9 +23,9 @@ package org.apache.tools.tar; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; import java.util.Arrays; /** diff --git a/src/main/org/apache/tools/tar/TarOutputStream.java b/src/main/org/apache/tools/tar/TarOutputStream.java index 737ae6504..e90576f38 100644 --- a/src/main/org/apache/tools/tar/TarOutputStream.java +++ b/src/main/org/apache/tools/tar/TarOutputStream.java @@ -23,7 +23,6 @@ package org.apache.tools.tar; -import java.io.File; import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -31,6 +30,7 @@ import java.io.StringWriter; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; + import org.apache.tools.zip.ZipEncoding; import org.apache.tools.zip.ZipEncodingHelper; diff --git a/src/main/org/apache/tools/tar/TarUtils.java b/src/main/org/apache/tools/tar/TarUtils.java index 264ff9921..c05744160 100644 --- a/src/main/org/apache/tools/tar/TarUtils.java +++ b/src/main/org/apache/tools/tar/TarUtils.java @@ -26,6 +26,7 @@ package org.apache.tools.tar; import java.io.IOException; import java.math.BigInteger; import java.nio.ByteBuffer; + import org.apache.tools.zip.ZipEncoding; import org.apache.tools.zip.ZipEncodingHelper; diff --git a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java index 96367fba1..16502ac6d 100644 --- a/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java +++ b/src/main/org/apache/tools/zip/Zip64ExtendedInformationExtraField.java @@ -18,11 +18,11 @@ */ package org.apache.tools.zip; -import java.util.zip.ZipException; - import static org.apache.tools.zip.ZipConstants.DWORD; import static org.apache.tools.zip.ZipConstants.WORD; +import java.util.zip.ZipException; + /** * Holds size and other extended information for entries that use Zip64 * features. diff --git a/src/main/org/apache/tools/zip/ZipEightByteInteger.java b/src/main/org/apache/tools/zip/ZipEightByteInteger.java index 55cd3c5e4..8d582dd82 100644 --- a/src/main/org/apache/tools/zip/ZipEightByteInteger.java +++ b/src/main/org/apache/tools/zip/ZipEightByteInteger.java @@ -17,10 +17,10 @@ */ package org.apache.tools.zip; -import java.math.BigInteger; - import static org.apache.tools.zip.ZipConstants.BYTE_MASK; +import java.math.BigInteger; + /** * Utility class that represents an eight byte integer with conversion * rules for the big endian byte order of ZIP files. diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java index c9a74ba54..560314d3c 100644 --- a/src/main/org/apache/tools/zip/ZipFile.java +++ b/src/main/org/apache/tools/zip/ZipFile.java @@ -18,6 +18,12 @@ package org.apache.tools.zip; +import static org.apache.tools.zip.ZipConstants.DWORD; +import static org.apache.tools.zip.ZipConstants.SHORT; +import static org.apache.tools.zip.ZipConstants.WORD; +import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC; +import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT; + import java.io.EOFException; import java.io.File; import java.io.IOException; @@ -36,12 +42,6 @@ import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; import java.util.zip.ZipException; -import static org.apache.tools.zip.ZipConstants.DWORD; -import static org.apache.tools.zip.ZipConstants.SHORT; -import static org.apache.tools.zip.ZipConstants.WORD; -import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC; -import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT; - /** * Replacement for <code>java.util.ZipFile</code>. * diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java index 4e1e6c9d6..a04eae62d 100644 --- a/src/main/org/apache/tools/zip/ZipOutputStream.java +++ b/src/main/org/apache/tools/zip/ZipOutputStream.java @@ -18,6 +18,15 @@ package org.apache.tools.zip; +import static org.apache.tools.zip.ZipConstants.DATA_DESCRIPTOR_MIN_VERSION; +import static org.apache.tools.zip.ZipConstants.DWORD; +import static org.apache.tools.zip.ZipConstants.INITIAL_VERSION; +import static org.apache.tools.zip.ZipConstants.SHORT; +import static org.apache.tools.zip.ZipConstants.WORD; +import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC; +import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT; +import static org.apache.tools.zip.ZipConstants.ZIP64_MIN_VERSION; + import java.io.File; import java.io.FileOutputStream; import java.io.FilterOutputStream; @@ -34,15 +43,6 @@ import java.util.zip.CRC32; import java.util.zip.Deflater; import java.util.zip.ZipException; -import static org.apache.tools.zip.ZipConstants.DATA_DESCRIPTOR_MIN_VERSION; -import static org.apache.tools.zip.ZipConstants.DWORD; -import static org.apache.tools.zip.ZipConstants.INITIAL_VERSION; -import static org.apache.tools.zip.ZipConstants.SHORT; -import static org.apache.tools.zip.ZipConstants.WORD; -import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC; -import static org.apache.tools.zip.ZipConstants.ZIP64_MAGIC_SHORT; -import static org.apache.tools.zip.ZipConstants.ZIP64_MIN_VERSION; - /** * Reimplementation of {@link java.util.zip.ZipOutputStream * java.util.zip.ZipOutputStream} that does handle the extended |