ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [07/17] git commit: organize imports
Date Fri, 04 Jul 2014 07:17:49 GMT
organize imports

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/bf6026a1
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/bf6026a1
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/bf6026a1

Branch: refs/heads/master
Commit: bf6026a147e879837eaad2a16348ae2162829867
Parents: 71ae871
Author: Jan Matèrne <jhm@apache.org>
Authored: Thu Jul 3 22:38:04 2014 +0200
Committer: Jan Matèrne <jhm@apache.org>
Committed: Thu Jul 3 22:38:04 2014 +0200

----------------------------------------------------------------------
 .../org/apache/tools/ant/AntClassLoader.java    |  3 +-
 .../org/apache/tools/ant/AntTypeDefinition.java |  2 +-
 .../org/apache/tools/ant/DefaultLogger.java     |  4 +-
 src/main/org/apache/tools/ant/Diagnostics.java  | 37 ++++++-------
 .../apache/tools/ant/IntrospectionHelper.java   |  4 +-
 src/main/org/apache/tools/ant/Location.java     |  1 +
 src/main/org/apache/tools/ant/Main.java         |  1 -
 .../org/apache/tools/ant/PathTokenizer.java     |  1 +
 src/main/org/apache/tools/ant/Project.java      | 15 +++---
 .../apache/tools/ant/RuntimeConfigurable.java   |  3 +-
 src/main/org/apache/tools/ant/Task.java         |  6 +--
 src/main/org/apache/tools/ant/TaskAdapter.java  |  3 +-
 .../org/apache/tools/ant/UnknownElement.java    |  3 +-
 src/main/org/apache/tools/ant/XmlLogger.java    |  3 +-
 .../tools/ant/dispatch/DispatchUtils.java       |  8 +--
 .../tools/ant/filters/BaseFilterReader.java     |  1 +
 .../ant/filters/BaseParamFilterReader.java      |  1 +
 .../tools/ant/filters/ClassConstants.java       |  1 +
 .../apache/tools/ant/filters/ConcatFilter.java  |  7 +--
 .../apache/tools/ant/filters/FixCrLfFilter.java |  1 +
 .../apache/tools/ant/filters/HeadFilter.java    |  3 +-
 .../apache/tools/ant/filters/LineContains.java  |  1 +
 .../tools/ant/filters/LineContainsRegExp.java   |  1 +
 .../apache/tools/ant/filters/PrefixLines.java   |  1 +
 .../apache/tools/ant/filters/ReplaceTokens.java |  2 +-
 .../tools/ant/filters/StripLineBreaks.java      |  1 +
 .../tools/ant/filters/StripLineComments.java    |  1 +
 .../apache/tools/ant/filters/SuffixLines.java   |  1 +
 .../apache/tools/ant/filters/TabsToSpaces.java  |  1 +
 .../apache/tools/ant/filters/TailFilter.java    |  1 +
 .../apache/tools/ant/filters/TokenFilter.java   |  5 +-
 .../ant/filters/util/ChainReaderHelper.java     |  1 +
 .../tools/ant/filters/util/JavaClassHelper.java |  8 +--
 .../apache/tools/ant/helper/AntXMLContext.java  |  5 +-
 .../tools/ant/helper/DefaultExecutor.java       |  4 +-
 .../apache/tools/ant/helper/ProjectHelper2.java | 26 ++++-----
 .../tools/ant/helper/ProjectHelperImpl.java     |  3 +-
 .../tools/ant/helper/SingleCheckExecutor.java   |  4 +-
 .../tools/ant/input/DefaultInputHandler.java    |  1 +
 .../tools/ant/input/GreedyInputHandler.java     |  3 +-
 .../ant/input/PropertyFileInputHandler.java     |  1 +
 .../org/apache/tools/ant/launch/Launcher.java   |  8 +--
 .../org/apache/tools/ant/launch/Locator.java    |  6 +--
 .../tools/ant/listener/AnsiColorLogger.java     |  1 +
 .../tools/ant/listener/BigProjectLogger.java    |  6 +--
 .../ant/listener/CommonsLoggingListener.java    |  8 +--
 .../tools/ant/listener/Log4jListener.java       |  1 -
 .../apache/tools/ant/listener/MailLogger.java   |  6 +--
 .../tools/ant/loader/AntClassLoader5.java       |  2 +-
 .../tools/ant/property/LocalProperties.java     |  4 +-
 .../tools/ant/property/ParseProperties.java     |  1 +
 .../tools/ant/property/PropertyExpander.java    |  4 +-
 .../tools/ant/property/ResolvePropertyMap.java  |  6 +--
 .../tools/ant/taskdefs/AbstractCvsTask.java     |  3 +-
 .../apache/tools/ant/taskdefs/AntStructure.java |  1 +
 src/main/org/apache/tools/ant/taskdefs/Apt.java |  8 +--
 .../ant/taskdefs/AttributeNamespaceDef.java     |  4 +-
 .../apache/tools/ant/taskdefs/Available.java    |  1 +
 .../org/apache/tools/ant/taskdefs/BUnzip2.java  |  1 +
 .../org/apache/tools/ant/taskdefs/BZip2.java    |  1 +
 .../org/apache/tools/ant/taskdefs/Basename.java |  1 +
 .../apache/tools/ant/taskdefs/BuildNumber.java  |  3 +-
 .../org/apache/tools/ant/taskdefs/CVSPass.java  |  1 +
 .../apache/tools/ant/taskdefs/CallTarget.java   |  2 +-
 .../org/apache/tools/ant/taskdefs/Checksum.java | 22 ++++----
 .../org/apache/tools/ant/taskdefs/Chmod.java    |  1 +
 .../apache/tools/ant/taskdefs/Classloader.java  | 12 ++---
 .../tools/ant/taskdefs/CloseResources.java      |  1 +
 .../org/apache/tools/ant/taskdefs/Concat.java   | 24 ++++-----
 .../org/apache/tools/ant/taskdefs/Copy.java     | 13 ++---
 .../org/apache/tools/ant/taskdefs/CopyPath.java | 10 ++--
 .../org/apache/tools/ant/taskdefs/Copyfile.java |  1 +
 .../tools/ant/taskdefs/DefaultExcludes.java     |  4 +-
 .../org/apache/tools/ant/taskdefs/Definer.java  |  6 +--
 .../org/apache/tools/ant/taskdefs/Delete.java   | 34 ++++++------
 .../org/apache/tools/ant/taskdefs/Deltree.java  |  1 +
 .../apache/tools/ant/taskdefs/DependSet.java    | 17 +++---
 .../org/apache/tools/ant/taskdefs/Dirname.java  |  1 +
 .../org/apache/tools/ant/taskdefs/Echo.java     |  4 +-
 .../org/apache/tools/ant/taskdefs/EchoXML.java  |  9 ++--
 .../org/apache/tools/ant/taskdefs/ExecTask.java |  1 +
 .../apache/tools/ant/taskdefs/ExecuteJava.java  |  1 +
 .../apache/tools/ant/taskdefs/ExecuteOn.java    |  3 +-
 .../org/apache/tools/ant/taskdefs/Exit.java     |  4 +-
 .../org/apache/tools/ant/taskdefs/Filter.java   |  1 +
 .../org/apache/tools/ant/taskdefs/FixCRLF.java  | 15 +++---
 .../org/apache/tools/ant/taskdefs/GUnzip.java   |  1 +
 .../org/apache/tools/ant/taskdefs/GZip.java     |  1 +
 .../apache/tools/ant/taskdefs/GenerateKey.java  |  1 +
 .../apache/tools/ant/taskdefs/ImportTask.java   | 12 ++---
 .../org/apache/tools/ant/taskdefs/Java.java     | 11 ++--
 .../tools/ant/taskdefs/JikesOutputParser.java   |  1 +
 .../org/apache/tools/ant/taskdefs/KeySubst.java |  1 +
 .../org/apache/tools/ant/taskdefs/Length.java   | 12 ++---
 .../org/apache/tools/ant/taskdefs/LoadFile.java |  1 +
 .../tools/ant/taskdefs/LoadProperties.java      |  5 +-
 .../apache/tools/ant/taskdefs/LoadResource.java |  1 +
 .../tools/ant/taskdefs/LogStreamHandler.java    |  1 +
 .../org/apache/tools/ant/taskdefs/MacroDef.java |  4 +-
 .../tools/ant/taskdefs/MacroInstance.java       | 10 ++--
 .../org/apache/tools/ant/taskdefs/MakeUrl.java  | 14 ++---
 .../org/apache/tools/ant/taskdefs/Manifest.java |  1 +
 .../tools/ant/taskdefs/ManifestClassPath.java   |  4 +-
 .../apache/tools/ant/taskdefs/MatchingTask.java |  1 +
 .../org/apache/tools/ant/taskdefs/Mkdir.java    |  3 +-
 .../org/apache/tools/ant/taskdefs/Move.java     |  2 +-
 .../org/apache/tools/ant/taskdefs/Nice.java     |  2 +-
 .../org/apache/tools/ant/taskdefs/Pack.java     |  1 +
 .../org/apache/tools/ant/taskdefs/Parallel.java |  5 +-
 .../org/apache/tools/ant/taskdefs/Patch.java    |  1 +
 .../apache/tools/ant/taskdefs/PathConvert.java  | 15 +++---
 .../org/apache/tools/ant/taskdefs/Recorder.java |  1 +
 .../tools/ant/taskdefs/RecorderEntry.java       |  1 +
 .../apache/tools/ant/taskdefs/Redirector.java   | 30 +++++------
 .../org/apache/tools/ant/taskdefs/Rename.java   |  1 +
 .../org/apache/tools/ant/taskdefs/Replace.java  |  1 +
 .../tools/ant/taskdefs/ResourceCount.java       |  4 +-
 .../org/apache/tools/ant/taskdefs/Rmic.java     |  1 +
 .../org/apache/tools/ant/taskdefs/SQLExec.java  | 56 ++++++++++----------
 .../apache/tools/ant/taskdefs/Sequential.java   |  2 +-
 .../org/apache/tools/ant/taskdefs/SignJar.java  |  3 +-
 .../apache/tools/ant/taskdefs/StreamPumper.java |  1 +
 .../org/apache/tools/ant/taskdefs/SubAnt.java   | 15 +++---
 .../org/apache/tools/ant/taskdefs/Sync.java     |  1 -
 src/main/org/apache/tools/ant/taskdefs/Tar.java |  3 +-
 .../tools/ant/taskdefs/TaskOutputStream.java    |  1 +
 .../org/apache/tools/ant/taskdefs/TempFile.java |  1 +
 .../org/apache/tools/ant/taskdefs/Touch.java    |  8 +--
 .../org/apache/tools/ant/taskdefs/Truncate.java |  1 -
 .../org/apache/tools/ant/taskdefs/Tstamp.java   |  1 +
 .../org/apache/tools/ant/taskdefs/Unpack.java   |  1 +
 .../org/apache/tools/ant/taskdefs/UpToDate.java |  5 +-
 .../apache/tools/ant/taskdefs/VerifyJar.java    | 13 +++--
 .../org/apache/tools/ant/taskdefs/WaitFor.java  |  1 +
 src/main/org/apache/tools/ant/taskdefs/War.java |  1 +
 .../tools/ant/taskdefs/WhichResource.java       | 12 ++---
 .../apache/tools/ant/taskdefs/XSLTLiaison4.java |  2 +
 .../apache/tools/ant/taskdefs/XSLTProcess.java  |  4 +-
 .../apache/tools/ant/taskdefs/XmlProperty.java  |  6 ++-
 .../taskdefs/compilers/AptCompilerAdapter.java  | 10 ++--
 .../compilers/DefaultCompilerAdapter.java       |  5 +-
 .../tools/ant/taskdefs/compilers/Javac12.java   |  5 +-
 .../tools/ant/taskdefs/compilers/Javac13.java   |  1 +
 .../ant/taskdefs/compilers/JavacExternal.java   |  6 +--
 .../tools/ant/taskdefs/condition/And.java       |  1 +
 .../ant/taskdefs/condition/ConditionBase.java   |  1 +
 .../ant/taskdefs/condition/FilesMatch.java      |  1 +
 .../tools/ant/taskdefs/condition/HasMethod.java | 10 ++--
 .../tools/ant/taskdefs/condition/Http.java      |  3 +-
 .../ant/taskdefs/condition/IsFileSelected.java  |  7 +--
 .../ant/taskdefs/condition/IsReachable.java     |  8 +--
 .../apache/tools/ant/taskdefs/condition/Or.java |  1 +
 .../ant/taskdefs/condition/ParserSupports.java  |  1 -
 .../tools/ant/taskdefs/condition/Socket.java    |  1 +
 .../tools/ant/taskdefs/condition/TypeFound.java |  4 +-
 .../tools/ant/taskdefs/condition/Xor.java       |  4 +-
 .../ant/taskdefs/cvslib/ChangeLogParser.java    |  3 +-
 .../ant/taskdefs/cvslib/ChangeLogTask.java      |  1 +
 .../ant/taskdefs/cvslib/ChangeLogWriter.java    |  1 -
 .../tools/ant/taskdefs/cvslib/CvsTagDiff.java   |  5 +-
 .../tools/ant/taskdefs/cvslib/CvsVersion.java   |  6 +--
 .../cvslib/RedirectingStreamHandler.java        |  1 +
 .../tools/ant/taskdefs/email/EmailTask.java     |  1 -
 .../apache/tools/ant/taskdefs/email/Mailer.java |  1 +
 .../tools/ant/taskdefs/email/MimeMailer.java    | 31 +++++------
 .../tools/ant/taskdefs/email/PlainMailer.java   |  1 +
 .../tools/ant/taskdefs/email/UUMailer.java      |  1 +
 .../ant/taskdefs/launcher/CommandLauncher.java  |  6 +--
 .../tools/ant/taskdefs/optional/ANTLR.java      |  3 +-
 .../apache/tools/ant/taskdefs/optional/Cab.java |  1 +
 .../ant/taskdefs/optional/EchoProperties.java   | 14 ++---
 .../ant/taskdefs/optional/Native2Ascii.java     |  1 +
 .../tools/ant/taskdefs/optional/NetRexxC.java   |  2 +
 .../ant/taskdefs/optional/PropertyFile.java     |  3 +-
 .../ant/taskdefs/optional/RenameExtensions.java |  1 +
 .../ant/taskdefs/optional/ReplaceRegExp.java    |  4 +-
 .../apache/tools/ant/taskdefs/optional/Rpm.java |  5 +-
 .../ant/taskdefs/optional/SchemaValidate.java   | 21 ++++----
 .../tools/ant/taskdefs/optional/Script.java     |  3 +-
 .../ant/taskdefs/optional/TraXLiaison.java      | 10 ++--
 .../ant/taskdefs/optional/XMLValidateTask.java  |  1 -
 .../ant/taskdefs/optional/XSLTTraceSupport.java |  3 +-
 .../taskdefs/optional/Xalan2TraceSupport.java   |  5 +-
 .../ant/taskdefs/optional/ccm/CCMCheck.java     |  1 +
 .../taskdefs/optional/ccm/CCMCreateTask.java    |  1 +
 .../taskdefs/optional/clearcase/CCMkattr.java   |  2 +-
 .../taskdefs/optional/clearcase/ClearCase.java  |  1 +
 .../taskdefs/optional/depend/AntAnalyzer.java   |  1 +
 .../ant/taskdefs/optional/depend/ClassFile.java |  1 +
 .../ant/taskdefs/optional/depend/Depend.java    |  1 +
 .../optional/ejb/BorlandDeploymentTool.java     |  1 +
 .../optional/ejb/BorlandGenerateClient.java     |  1 +
 .../optional/ejb/DescriptorHandler.java         |  1 +
 .../optional/ejb/EJBDeploymentTool.java         |  1 +
 .../tools/ant/taskdefs/optional/ejb/EjbJar.java |  2 +
 .../optional/ejb/IPlanetDeploymentTool.java     |  2 +
 .../ant/taskdefs/optional/ejb/IPlanetEjbc.java  |  3 ++
 .../taskdefs/optional/ejb/IPlanetEjbcTask.java  |  2 +
 .../optional/ejb/JbossDeploymentTool.java       |  1 +
 .../optional/ejb/JonasDeploymentTool.java       |  2 +
 .../optional/ejb/WeblogicDeploymentTool.java    |  2 +
 .../ejb/WeblogicTOPLinkDeploymentTool.java      |  1 +
 .../optional/ejb/WebsphereDeploymentTool.java   |  1 +
 .../optional/extension/ExtensionResolver.java   |  1 +
 .../optional/extension/ExtensionSet.java        |  1 +
 .../optional/extension/JarLibAvailableTask.java |  1 +
 .../optional/extension/JarLibDisplayTask.java   |  1 +
 .../optional/extension/JarLibManifestTask.java  |  1 +
 .../optional/extension/JarLibResolveTask.java   |  1 +
 .../optional/extension/LibraryDisplayer.java    |  1 +
 .../extension/resolvers/AntResolver.java        |  1 +
 .../extension/resolvers/LocationResolver.java   |  1 +
 .../extension/resolvers/URLResolver.java        |  1 +
 .../ant/taskdefs/optional/i18n/Translate.java   |  1 +
 .../ant/taskdefs/optional/image/Image.java      | 20 +++----
 .../optional/j2ee/JonasHotDeploymentTool.java   |  1 +
 .../taskdefs/optional/j2ee/ServerDeploy.java    |  1 +
 .../taskdefs/optional/jdepend/JDependTask.java  |  1 +
 .../ant/taskdefs/optional/jlink/JlinkTask.java  |  1 +
 .../ant/taskdefs/optional/jlink/jlink.java      |  4 +-
 .../tools/ant/taskdefs/optional/jsp/JspC.java   |  1 +
 .../tools/ant/taskdefs/optional/jsp/WLJspc.java |  1 +
 .../compilers/DefaultJspCompilerAdapter.java    |  1 +
 .../optional/jsp/compilers/JasperC.java         |  1 +
 .../compilers/JspCompilerAdapterFactory.java    |  2 +-
 .../optional/junit/AggregateTransformer.java    | 11 ++--
 .../ant/taskdefs/optional/junit/BatchTest.java  |  2 +-
 .../junit/CustomJUnit4TestAdapterCache.java     |  1 +
 .../ant/taskdefs/optional/junit/DOMUtil.java    |  1 +
 .../optional/junit/FormatterElement.java        |  2 +-
 .../optional/junit/JUnit4TestMethodAdapter.java |  2 +
 .../optional/junit/JUnitResultFormatter.java    |  2 +
 .../optional/junit/JUnitTaskMirror.java         |  1 +
 .../optional/junit/JUnitTaskMirrorImpl.java     |  2 +
 .../ant/taskdefs/optional/junit/JUnitTest.java  |  1 +
 .../optional/junit/JUnitTestRunner.java         |  2 +
 .../junit/SummaryJUnitResultFormatter.java      |  2 +
 .../optional/junit/TearDownOnVmCrash.java       |  1 +
 .../optional/junit/XMLResultAggregator.java     |  2 +
 .../native2ascii/DefaultNative2Ascii.java       |  1 +
 .../native2ascii/Native2AsciiAdapter.java       |  1 +
 .../optional/native2ascii/SunNative2Ascii.java  |  1 +
 .../ant/taskdefs/optional/net/RExecTask.java    |  4 +-
 .../ant/taskdefs/optional/net/SetProxy.java     |  1 +
 .../ant/taskdefs/optional/net/TelnetTask.java   |  3 +-
 .../tools/ant/taskdefs/optional/pvcs/Pvcs.java  |  1 +
 .../ant/taskdefs/optional/script/ScriptDef.java | 27 +++++-----
 .../taskdefs/optional/script/ScriptDefBase.java | 13 ++---
 .../tools/ant/taskdefs/optional/sos/SOS.java    |  1 +
 .../taskdefs/optional/sound/AntSoundPlayer.java |  2 +
 .../ant/taskdefs/optional/sound/SoundTask.java  |  1 +
 .../taskdefs/optional/splash/SplashScreen.java  |  1 +
 .../taskdefs/optional/splash/SplashTask.java    |  4 +-
 .../optional/ssh/AbstractSshMessage.java        | 14 +++--
 .../ant/taskdefs/optional/ssh/Directory.java    |  2 +-
 .../ant/taskdefs/optional/ssh/SSHBase.java      |  9 ++--
 .../ant/taskdefs/optional/ssh/SSHExec.java      |  3 +-
 .../ant/taskdefs/optional/ssh/SSHSession.java   |  1 -
 .../ant/taskdefs/optional/ssh/SSHUserInfo.java  |  3 +-
 .../tools/ant/taskdefs/optional/ssh/Scp.java    | 14 +++--
 .../taskdefs/optional/ssh/ScpFromMessage.java   | 14 ++---
 .../optional/ssh/ScpFromMessageBySftp.java      |  9 ++--
 .../ant/taskdefs/optional/ssh/ScpToMessage.java |  9 ++--
 .../optional/ssh/ScpToMessageBySftp.java        | 11 ++--
 .../ant/taskdefs/optional/testing/Funtest.java  | 10 ++--
 .../ant/taskdefs/optional/unix/Symlink.java     |  1 -
 .../tools/ant/taskdefs/optional/vss/MSVSS.java  |  2 +-
 .../ant/taskdefs/optional/windows/Attrib.java   |  4 +-
 .../ant/taskdefs/rmic/DefaultRmicAdapter.java   |  4 +-
 .../tools/ant/taskdefs/rmic/ForkingSunRmic.java |  8 +--
 .../apache/tools/ant/taskdefs/rmic/SunRmic.java |  1 +
 .../apache/tools/ant/types/AbstractFileSet.java | 32 +++++------
 .../apache/tools/ant/types/AntFilterReader.java |  1 +
 .../apache/tools/ant/types/ArchiveFileSet.java  |  3 +-
 .../apache/tools/ant/types/ArchiveScanner.java  |  4 +-
 .../org/apache/tools/ant/types/Assertions.java  |  6 +--
 .../org/apache/tools/ant/types/Commandline.java |  8 +--
 .../apache/tools/ant/types/CommandlineJava.java |  8 +--
 .../org/apache/tools/ant/types/DataType.java    |  2 +-
 .../org/apache/tools/ant/types/Description.java | 10 ++--
 src/main/org/apache/tools/ant/types/DirSet.java |  1 +
 .../org/apache/tools/ant/types/Environment.java |  1 +
 .../org/apache/tools/ant/types/FileList.java    |  4 +-
 .../org/apache/tools/ant/types/FilterSet.java   |  2 +-
 src/main/org/apache/tools/ant/types/Mapper.java |  3 +-
 src/main/org/apache/tools/ant/types/Path.java   |  2 +-
 .../org/apache/tools/ant/types/PatternSet.java  |  1 +
 .../org/apache/tools/ant/types/PropertySet.java |  6 +--
 .../tools/ant/types/RedirectorElement.java      |  4 +-
 .../org/apache/tools/ant/types/Resource.java    |  2 +-
 .../tools/ant/types/ResourceCollection.java     |  1 +
 .../org/apache/tools/ant/types/XMLCatalog.java  |  5 +-
 .../org/apache/tools/ant/types/ZipScanner.java  |  2 +-
 .../tools/ant/types/mappers/CutDirsMapper.java  |  1 +
 .../tools/ant/types/mappers/FilterMapper.java   |  3 +-
 .../types/optional/AbstractScriptComponent.java |  5 +-
 .../tools/ant/types/optional/ScriptFilter.java  |  3 +-
 .../tools/ant/types/optional/ScriptMapper.java  |  4 +-
 .../ant/types/optional/depend/ClassfileSet.java |  3 +-
 .../types/optional/depend/DependScanner.java    |  1 +
 .../tools/ant/types/optional/image/Arc.java     |  3 +-
 .../tools/ant/types/optional/image/Draw.java    |  3 +-
 .../ant/types/optional/image/DrawOperation.java |  1 +
 .../tools/ant/types/optional/image/Ellipse.java |  3 +-
 .../types/optional/image/ImageOperation.java    |  3 +-
 .../ant/types/optional/image/Rectangle.java     |  3 +-
 .../tools/ant/types/optional/image/Rotate.java  |  7 +--
 .../tools/ant/types/optional/image/Scale.java   |  7 +--
 .../tools/ant/types/optional/image/Text.java    |  3 +-
 .../optional/image/TransformOperation.java      |  1 +
 .../tools/ant/types/resolver/ApacheCatalog.java |  7 ++-
 .../types/resolver/ApacheCatalogResolver.java   | 11 ++--
 .../resources/AbstractClasspathResource.java    | 12 ++---
 .../ant/types/resources/ArchiveResource.java    |  2 +-
 .../tools/ant/types/resources/Archives.java     |  1 +
 .../ant/types/resources/BZip2Resource.java      |  2 +-
 .../BaseResourceCollectionContainer.java        |  8 +--
 .../BaseResourceCollectionWrapper.java          |  1 +
 .../resources/ContentTransformingResource.java  |  2 +-
 .../tools/ant/types/resources/Difference.java   |  1 +
 .../tools/ant/types/resources/FailFast.java     |  7 +--
 .../tools/ant/types/resources/FileResource.java | 10 ++--
 .../apache/tools/ant/types/resources/Files.java | 10 ++--
 .../apache/tools/ant/types/resources/First.java |  3 +-
 .../tools/ant/types/resources/GZipResource.java |  2 +-
 .../tools/ant/types/resources/Intersect.java    |  4 +-
 .../types/resources/JavaConstantResource.java   |  2 +-
 .../apache/tools/ant/types/resources/Last.java  |  2 +-
 .../LazyResourceCollectionWrapper.java          |  1 +
 .../ant/types/resources/MappedResource.java     |  3 --
 .../resources/MappedResourceCollection.java     |  1 +
 .../ant/types/resources/PropertyResource.java   |  2 +-
 .../ant/types/resources/ResourceDecorator.java  |  4 +-
 .../tools/ant/types/resources/Resources.java    | 12 ++---
 .../apache/tools/ant/types/resources/Sort.java  | 10 ++--
 .../ant/types/resources/StringResource.java     |  8 +--
 .../tools/ant/types/resources/TarResource.java  |  4 +-
 .../tools/ant/types/resources/Tokens.java       |  6 +--
 .../tools/ant/types/resources/URLResource.java  |  6 +--
 .../tools/ant/types/resources/ZipResource.java  | 10 ++--
 .../DelegatedResourceComparator.java            |  2 +-
 .../types/resources/comparators/FileSystem.java |  1 +
 .../types/resources/comparators/Reverse.java    |  1 +
 .../ant/types/resources/selectors/Compare.java  |  6 +--
 .../ant/types/resources/selectors/Date.java     |  2 +-
 .../types/resources/selectors/InstanceOf.java   |  6 +--
 .../selectors/ResourceSelectorContainer.java    |  6 +--
 .../ant/types/resources/selectors/Size.java     |  2 +-
 .../ant/types/resources/selectors/Type.java     |  2 +-
 .../tools/ant/types/selectors/DateSelector.java |  2 +-
 .../ant/types/selectors/DifferentSelector.java  |  6 +--
 .../ant/types/selectors/ExtendSelector.java     |  2 +-
 .../ant/types/selectors/MappingSelector.java    |  8 +--
 .../ant/types/selectors/ReadableSelector.java   |  1 +
 .../ant/types/selectors/SelectSelector.java     |  2 +-
 .../ant/types/selectors/SelectorContainer.java  |  1 +
 .../ant/types/selectors/SignedSelector.java     |  3 +-
 .../ant/types/selectors/WritableSelector.java   |  1 +
 .../modifiedselector/ChecksumAlgorithm.java     | 13 ++---
 .../modifiedselector/DigestAlgorithm.java       |  3 +-
 .../modifiedselector/HashvalueAlgorithm.java    |  3 +-
 .../modifiedselector/ModifiedSelector.java      |  8 +--
 .../modifiedselector/PropertiesfileCache.java   | 12 ++---
 .../apache/tools/ant/types/spi/Provider.java    |  2 +-
 .../org/apache/tools/ant/types/spi/Service.java |  2 +-
 .../apache/tools/ant/util/ChainedMapper.java    |  4 +-
 .../apache/tools/ant/util/ClasspathUtils.java   |  2 +-
 .../tools/ant/util/ConcatFileInputStream.java   |  6 +--
 .../ant/util/ConcatResourceInputStream.java     |  2 +-
 .../apache/tools/ant/util/ContainerMapper.java  |  5 +-
 .../apache/tools/ant/util/DOMElementWriter.java |  1 +
 .../apache/tools/ant/util/FileTokenizer.java    |  1 +
 .../org/apache/tools/ant/util/JAXPUtils.java    |  2 +
 .../apache/tools/ant/util/LazyHashtable.java    |  2 +-
 .../tools/ant/util/LeadPipeInputStream.java     |  2 +-
 .../apache/tools/ant/util/LineTokenizer.java    |  2 +-
 .../org/apache/tools/ant/util/LoaderUtils.java  |  1 +
 .../org/apache/tools/ant/util/ReflectUtil.java  |  3 +-
 .../tools/ant/util/RegexpPatternMapper.java     |  1 +
 .../apache/tools/ant/util/ResourceUtils.java    | 11 ++--
 .../apache/tools/ant/util/ScriptFixBSFPath.java |  7 +--
 .../apache/tools/ant/util/ScriptRunnerBase.java | 13 +++--
 .../tools/ant/util/SourceFileScanner.java       |  1 +
 .../apache/tools/ant/util/StringTokenizer.java  |  1 +
 .../org/apache/tools/ant/util/StringUtils.java  |  4 +-
 .../tools/ant/util/SymbolicLinkUtils.java       |  2 +
 .../apache/tools/ant/util/TeeOutputStream.java  |  2 +-
 .../org/apache/tools/ant/util/Tokenizer.java    |  2 +-
 .../org/apache/tools/ant/util/UUEncoder.java    |  2 +-
 .../org/apache/tools/ant/util/WorkerAnt.java    |  2 +-
 .../org/apache/tools/ant/util/XMLFragment.java  |  7 ++-
 .../tools/ant/util/depend/AbstractAnalyzer.java |  1 +
 .../ant/util/depend/DependencyAnalyzer.java     |  1 +
 .../ant/util/depend/bcel/AncestorAnalyzer.java  |  6 ++-
 .../ant/util/depend/bcel/DependencyVisitor.java | 11 ++--
 .../ant/util/depend/bcel/FullAnalyzer.java      |  8 +--
 .../tools/ant/util/java15/ProxyDiagnostics.java | 14 ++---
 .../ant/util/optional/JavaxScriptRunner.java    |  6 +--
 .../util/optional/NoExitSecurityManager.java    |  1 +
 .../tools/ant/util/optional/ScriptRunner.java   | 10 ++--
 .../ant/util/regexp/JakartaOroMatcher.java      |  4 +-
 .../tools/ant/util/regexp/JakartaOroRegexp.java |  2 -
 .../ant/util/regexp/JakartaRegexpMatcher.java   |  6 ++-
 .../ant/util/regexp/JakartaRegexpRegexp.java    |  4 +-
 .../ant/util/regexp/Jdk14RegexpMatcher.java     |  1 +
 .../ant/util/regexp/Jdk14RegexpRegexp.java      |  1 +
 .../tools/ant/util/regexp/RegexpMatcher.java    |  1 +
 .../ant/util/regexp/RegexpMatcherFactory.java   |  4 +-
 src/main/org/apache/tools/mail/MailMessage.java |  8 +--
 .../apache/tools/mail/SmtpResponseReader.java   |  4 +-
 src/main/org/apache/tools/tar/TarBuffer.java    |  2 +-
 .../org/apache/tools/tar/TarOutputStream.java   |  2 +-
 src/main/org/apache/tools/tar/TarUtils.java     |  1 +
 .../zip/Zip64ExtendedInformationExtraField.java |  4 +-
 .../apache/tools/zip/ZipEightByteInteger.java   |  4 +-
 src/main/org/apache/tools/zip/ZipFile.java      | 12 ++---
 .../org/apache/tools/zip/ZipOutputStream.java   | 18 +++----
 417 files changed, 1031 insertions(+), 826 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/AntClassLoader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index a6e9231..6098dec 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/AntTypeDefinition.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java
index 7eee873..104820f 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;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/DefaultLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/DefaultLogger.java b/src/main/org/apache/tools/ant/DefaultLogger.java
index 132ac49..dbc6048 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/Diagnostics.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index e5cac02..6389f6e 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/IntrospectionHelper.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java
index 79bc161..e8a41ab 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/Location.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Location.java b/src/main/org/apache/tools/ant/Location.java
index 2531869..8e25d10 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/Main.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index 6be945d..c2ca785 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/PathTokenizer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/PathTokenizer.java b/src/main/org/apache/tools/ant/PathTokenizer.java
index 10d3e37..6e6bea6 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 2c54d75..52a4da9 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/RuntimeConfigurable.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index 9ed4056..26f68df 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/Task.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java
index 08abe63..0d08eb0 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.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/TaskAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/TaskAdapter.java b/src/main/org/apache/tools/ant/TaskAdapter.java
index e5d07e1..3a3001f 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/UnknownElement.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java
index fd919ab..88cd498 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/XmlLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java
index b998821..a96e04f 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
index be4b625..1a7c1f9 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.
  */

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/BaseFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseFilterReader.java
index 13ece34..3b3b027 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java b/src/main/org/apache/tools/ant/filters/BaseParamFilterReader.java
index 288aa9a..54bc9ff 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/ClassConstants.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/ClassConstants.java b/src/main/org/apache/tools/ant/filters/ClassConstants.java
index 0e92f48..3544301 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/ConcatFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/ConcatFilter.java b/src/main/org/apache/tools/ant/filters/ConcatFilter.java
index a7b080c..391a1ef 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
index 03608ec..0557200 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/HeadFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/HeadFilter.java b/src/main/org/apache/tools/ant/filters/HeadFilter.java
index 41eee03..522fe57 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.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/LineContains.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/LineContains.java b/src/main/org/apache/tools/ant/filters/LineContains.java
index 453667b..c83cae2 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java b/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
index a597d0b..23a2005 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/PrefixLines.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/PrefixLines.java b/src/main/org/apache/tools/ant/filters/PrefixLines.java
index babb824..324397e 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
index efef83b..21ca3bc 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/StripLineBreaks.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/StripLineBreaks.java b/src/main/org/apache/tools/ant/filters/StripLineBreaks.java
index 1ebda63..9a97940 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/StripLineComments.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/StripLineComments.java b/src/main/org/apache/tools/ant/filters/StripLineComments.java
index f2a2f6e..e3d240b 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/SuffixLines.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/SuffixLines.java b/src/main/org/apache/tools/ant/filters/SuffixLines.java
index d2a2111..23d9b53 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
index ea61251..adaaa7a 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/TailFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/TailFilter.java b/src/main/org/apache/tools/ant/filters/TailFilter.java
index 0134f97..fcc84d1 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/TokenFilter.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/filters/TokenFilter.java b/src/main/org/apache/tools/ant/filters/TokenFilter.java
index cdfcd06..ebad760 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
----------------------------------------------------------------------
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 b8230a6..f176c33 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java
----------------------------------------------------------------------
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 1b1c64c..1b87b9c 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
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/helper/AntXMLContext.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/AntXMLContext.java b/src/main/org/apache/tools/ant/helper/AntXMLContext.java
index a8c3732..99e3d1a 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.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/helper/DefaultExecutor.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/DefaultExecutor.java b/src/main/org/apache/tools/ant/helper/DefaultExecutor.java
index d4099b4..cdbc587 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 0c1f883..67e1dec 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
  *

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
index d35fabf..f828d29 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java b/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java
index 44c9503..1960ed0 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;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/input/DefaultInputHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java
index efbee84..548ebff 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/input/GreedyInputHandler.java b/src/main/org/apache/tools/ant/input/GreedyInputHandler.java
index c0e24c0..cb52f4f 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java b/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java
index a9797ec..e1e3cf1 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/launch/Launcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index bf10c15..ab05903 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;
 
 
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/launch/Locator.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/launch/Locator.java b/src/main/org/apache/tools/ant/launch/Locator.java
index 2b8ea89..5847f5c 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java b/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
index f6a988c..08c1ebd 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/listener/BigProjectLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/BigProjectLogger.java b/src/main/org/apache/tools/ant/listener/BigProjectLogger.java
index 8ee1195..865127d 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
index c48087a..57f53a9 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.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/listener/Log4jListener.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index 3e9e545..5e8acaa 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/listener/MailLogger.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java
index 6534708..8c0fff8 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/loader/AntClassLoader5.java b/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
index f41cef3..a91ed41 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/property/LocalProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/property/LocalProperties.java b/src/main/org/apache/tools/ant/property/LocalProperties.java
index fb2fa9c..c9ce3af 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.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/property/ParseProperties.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/property/ParseProperties.java b/src/main/org/apache/tools/ant/property/ParseProperties.java
index a1f6f3c..f03f966 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/property/PropertyExpander.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/property/PropertyExpander.java b/src/main/org/apache/tools/ant/property/PropertyExpander.java
index 9df8f31..a2b4d63 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java b/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
index ca53e99..5bdd354 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.

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index 9cfaf5c..1ce8116 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index 1620113..7155f42 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Apt.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Apt.java b/src/main/org/apache/tools/ant/taskdefs/Apt.java
index 5b76b58..52154a8 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java b/src/main/org/apache/tools/ant/taskdefs/AttributeNamespaceDef.java
index 7ac233f..150b728 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Available.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 2fcb296..816568e 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
index 0129fea..323b738 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/BZip2.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/BZip2.java b/src/main/org/apache/tools/ant/taskdefs/BZip2.java
index 59785c4..f5944df 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Basename.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Basename.java b/src/main/org/apache/tools/ant/taskdefs/Basename.java
index 9d87b2e..0415af7 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;
 

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java b/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java
index 4a9b0aa..aee071d 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/CVSPass.java b/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
index 25c3752..53f5d3e 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java
index 5248555..d8a0e8c 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Checksum.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java
index 802c1c0..7a94ca0 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Chmod.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java
index 0c8ac37..ac0c3d8 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Classloader.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Classloader.java b/src/main/org/apache/tools/ant/taskdefs/Classloader.java
index 8183415..8a5967c 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/CloseResources.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/CloseResources.java b/src/main/org/apache/tools/ant/taskdefs/CloseResources.java
index 07b93a7..6916abc 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Concat.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java
index 0907fdf..1338f2a 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;

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Copy.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index c17ea45..e6f9cbd 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/CopyPath.java b/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
index 5670215..53596fd 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

http://git-wip-us.apache.org/repos/asf/ant/blob/bf6026a1/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copyfile.java b/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
index e7452a6..e9acb1d 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;


Mime
View raw message