java 5-8
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b7d1e9bd Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b7d1e9bd Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b7d1e9bd Branch: refs/heads/master Commit: b7d1e9bde44cb8e5233d6e70bb96e14cbb2f3e2d Parents: af74d1f Author: Matt Benson <[email protected]> Authored: Thu Apr 13 10:15:22 2017 -0500 Committer: Matt Benson <[email protected]> Committed: Thu Apr 13 10:15:22 2017 -0500 ---------------------------------------------------------------------- .../org/apache/tools/ant/AntClassLoader.java | 15 +- .../tools/ant/ArgumentProcessorRegistry.java | 3 +- .../org/apache/tools/ant/BuildException.java | 15 +- .../org/apache/tools/ant/ComponentHelper.java | 41 +- .../apache/tools/ant/DefaultDefinitions.java | 1 - .../org/apache/tools/ant/DefaultLogger.java | 56 +- .../org/apache/tools/ant/DemuxInputStream.java | 2 + .../org/apache/tools/ant/DemuxOutputStream.java | 18 +- src/main/org/apache/tools/ant/Diagnostics.java | 39 +- .../org/apache/tools/ant/DirectoryScanner.java | 322 ++++----- .../apache/tools/ant/DynamicConfigurator.java | 1 - src/main/org/apache/tools/ant/Evaluable.java | 10 +- .../apache/tools/ant/IntrospectionHelper.java | 26 +- src/main/org/apache/tools/ant/Location.java | 8 +- src/main/org/apache/tools/ant/Main.java | 40 +- .../org/apache/tools/ant/PathTokenizer.java | 5 +- src/main/org/apache/tools/ant/Project.java | 65 +- .../org/apache/tools/ant/ProjectComponent.java | 1 + .../org/apache/tools/ant/ProjectHelper.java | 14 +- .../tools/ant/ProjectHelperRepository.java | 38 +- .../org/apache/tools/ant/PropertyHelper.java | 79 +-- .../apache/tools/ant/RuntimeConfigurable.java | 35 +- src/main/org/apache/tools/ant/Target.java | 65 +- src/main/org/apache/tools/ant/Task.java | 34 +- src/main/org/apache/tools/ant/TaskAdapter.java | 14 +- .../tools/ant/TaskConfigurationChecker.java | 5 +- .../org/apache/tools/ant/UnknownElement.java | 19 +- src/main/org/apache/tools/ant/XmlLogger.java | 55 +- .../tools/ant/attribute/BaseIfAttribute.java | 16 +- .../apache/tools/ant/dispatch/DispatchTask.java | 1 + .../tools/ant/dispatch/DispatchUtils.java | 4 +- .../ant/filters/util/ChainReaderHelper.java | 255 +++++--- .../apache/tools/ant/helper/ProjectHelper2.java | 24 +- .../ant/input/MultipleChoiceInputRequest.java | 20 +- .../org/apache/tools/ant/launch/Launcher.java | 75 +-- .../org/apache/tools/ant/launch/Locator.java | 56 +- .../tools/ant/listener/AnsiColorLogger.java | 2 +- .../ant/listener/CommonsLoggingListener.java | 14 +- .../tools/ant/listener/Log4jListener.java | 13 +- .../apache/tools/ant/listener/MailLogger.java | 43 +- .../tools/ant/listener/ProfileLogger.java | 12 +- .../ant/listener/SimpleBigProjectLogger.java | 6 +- .../tools/ant/listener/TimestampedLogger.java | 3 +- .../tools/ant/property/LocalProperties.java | 28 +- .../tools/ant/property/LocalPropertyStack.java | 3 +- .../apache/tools/ant/property/NullReturn.java | 1 + .../tools/ant/property/ParseProperties.java | 18 +- .../tools/ant/property/ResolvePropertyMap.java | 9 +- .../tools/ant/taskdefs/AbstractCvsTask.java | 88 +-- .../ant/taskdefs/AbstractJarSignerTask.java | 32 +- src/main/org/apache/tools/ant/taskdefs/Ant.java | 165 +++-- .../apache/tools/ant/taskdefs/AntStructure.java | 121 ++-- .../org/apache/tools/ant/taskdefs/Antlib.java | 19 +- .../tools/ant/taskdefs/AntlibDefinition.java | 4 +- .../apache/tools/ant/taskdefs/Available.java | 131 ++-- .../org/apache/tools/ant/taskdefs/Basename.java | 29 +- .../apache/tools/ant/taskdefs/BindTargets.java | 19 +- .../apache/tools/ant/taskdefs/BuildNumber.java | 69 +- .../org/apache/tools/ant/taskdefs/CVSPass.java | 5 +- .../org/apache/tools/ant/taskdefs/Checksum.java | 68 +- .../org/apache/tools/ant/taskdefs/Chmod.java | 11 +- .../apache/tools/ant/taskdefs/Classloader.java | 14 +- .../org/apache/tools/ant/taskdefs/Concat.java | 51 +- .../tools/ant/taskdefs/ConditionTask.java | 10 +- .../org/apache/tools/ant/taskdefs/Copy.java | 130 ++-- .../org/apache/tools/ant/taskdefs/Copydir.java | 4 +- .../org/apache/tools/ant/taskdefs/Copyfile.java | 8 +- .../tools/ant/taskdefs/DefaultExcludes.java | 22 +- .../org/apache/tools/ant/taskdefs/Definer.java | 88 ++- .../org/apache/tools/ant/taskdefs/Delete.java | 118 ++-- .../apache/tools/ant/taskdefs/DependSet.java | 14 +- .../org/apache/tools/ant/taskdefs/Dirname.java | 5 +- src/main/org/apache/tools/ant/taskdefs/Ear.java | 12 +- .../org/apache/tools/ant/taskdefs/EchoXML.java | 12 +- .../org/apache/tools/ant/taskdefs/Exec.java | 6 +- .../org/apache/tools/ant/taskdefs/ExecTask.java | 23 +- .../org/apache/tools/ant/taskdefs/Execute.java | 99 ++- .../apache/tools/ant/taskdefs/ExecuteJava.java | 23 +- .../apache/tools/ant/taskdefs/ExecuteOn.java | 91 +-- .../tools/ant/taskdefs/ExecuteWatchdog.java | 3 +- .../org/apache/tools/ant/taskdefs/Exit.java | 20 +- .../org/apache/tools/ant/taskdefs/Expand.java | 78 +-- .../org/apache/tools/ant/taskdefs/Filter.java | 7 +- .../org/apache/tools/ant/taskdefs/FixCRLF.java | 33 +- .../org/apache/tools/ant/taskdefs/GUnzip.java | 20 +- .../org/apache/tools/ant/taskdefs/GZip.java | 11 +- .../apache/tools/ant/taskdefs/GenerateKey.java | 70 +- src/main/org/apache/tools/ant/taskdefs/Get.java | 39 +- .../org/apache/tools/ant/taskdefs/HostInfo.java | 57 +- .../apache/tools/ant/taskdefs/ImportTask.java | 63 +- .../org/apache/tools/ant/taskdefs/Input.java | 37 +- .../org/apache/tools/ant/taskdefs/JDBCTask.java | 37 +- src/main/org/apache/tools/ant/taskdefs/Jar.java | 257 ++++---- .../org/apache/tools/ant/taskdefs/Java.java | 120 ++-- .../org/apache/tools/ant/taskdefs/Javac.java | 122 ++-- .../org/apache/tools/ant/taskdefs/Javadoc.java | 538 +++++++-------- .../org/apache/tools/ant/taskdefs/Length.java | 66 +- .../tools/ant/taskdefs/LoadProperties.java | 43 +- .../apache/tools/ant/taskdefs/LoadResource.java | 91 ++- .../tools/ant/taskdefs/LogStreamHandler.java | 4 +- .../org/apache/tools/ant/taskdefs/MacroDef.java | 99 ++- .../tools/ant/taskdefs/MacroInstance.java | 122 ++-- .../org/apache/tools/ant/taskdefs/MakeUrl.java | 66 +- .../org/apache/tools/ant/taskdefs/Manifest.java | 129 ++-- .../tools/ant/taskdefs/ManifestClassPath.java | 22 +- .../apache/tools/ant/taskdefs/ManifestTask.java | 39 +- .../apache/tools/ant/taskdefs/MatchingTask.java | 31 +- .../org/apache/tools/ant/taskdefs/Mkdir.java | 20 +- .../org/apache/tools/ant/taskdefs/Move.java | 79 ++- .../org/apache/tools/ant/taskdefs/Nice.java | 5 +- .../org/apache/tools/ant/taskdefs/Pack.java | 22 +- .../org/apache/tools/ant/taskdefs/Parallel.java | 47 +- .../org/apache/tools/ant/taskdefs/Patch.java | 20 +- .../apache/tools/ant/taskdefs/PathConvert.java | 63 +- .../apache/tools/ant/taskdefs/PreSetDef.java | 27 +- .../tools/ant/taskdefs/ProcessDestroyer.java | 32 +- .../tools/ant/taskdefs/ProjectHelperTask.java | 10 +- .../org/apache/tools/ant/taskdefs/Property.java | 77 +-- .../tools/ant/taskdefs/PropertyHelperTask.java | 15 +- .../org/apache/tools/ant/taskdefs/Replace.java | 169 ++--- .../tools/ant/taskdefs/ResourceCount.java | 10 +- .../org/apache/tools/ant/taskdefs/Retry.java | 9 +- .../org/apache/tools/ant/taskdefs/Rmic.java | 100 ++- .../org/apache/tools/ant/taskdefs/SQLExec.java | 128 ++-- .../apache/tools/ant/taskdefs/Sequential.java | 13 +- .../tools/ant/taskdefs/SetPermissions.java | 31 +- .../org/apache/tools/ant/taskdefs/SignJar.java | 72 +- .../org/apache/tools/ant/taskdefs/Sleep.java | 19 +- .../apache/tools/ant/taskdefs/StreamPumper.java | 4 +- .../org/apache/tools/ant/taskdefs/SubAnt.java | 49 +- .../org/apache/tools/ant/taskdefs/Sync.java | 68 +- src/main/org/apache/tools/ant/taskdefs/Tar.java | 100 ++- .../org/apache/tools/ant/taskdefs/Taskdef.java | 1 - .../org/apache/tools/ant/taskdefs/TempFile.java | 6 +- .../org/apache/tools/ant/taskdefs/Touch.java | 44 +- .../org/apache/tools/ant/taskdefs/Tstamp.java | 45 +- .../org/apache/tools/ant/taskdefs/Typedef.java | 2 - .../org/apache/tools/ant/taskdefs/Unpack.java | 23 +- .../org/apache/tools/ant/taskdefs/Untar.java | 61 +- .../org/apache/tools/ant/taskdefs/UpToDate.java | 49 +- .../apache/tools/ant/taskdefs/VerifyJar.java | 17 +- .../org/apache/tools/ant/taskdefs/WaitFor.java | 34 +- src/main/org/apache/tools/ant/taskdefs/War.java | 32 +- .../tools/ant/taskdefs/WhichResource.java | 11 +- .../apache/tools/ant/taskdefs/XSLTProcess.java | 171 +++-- .../apache/tools/ant/taskdefs/XmlProperty.java | 72 +- src/main/org/apache/tools/ant/taskdefs/Zip.java | 384 +++++------ .../compilers/CompilerAdapterFactory.java | 112 ++-- .../compilers/DefaultCompilerAdapter.java | 143 ++-- .../tools/ant/taskdefs/compilers/Gcj.java | 17 +- .../tools/ant/taskdefs/compilers/Javac13.java | 20 +- .../ant/taskdefs/compilers/JavacExternal.java | 4 +- .../tools/ant/taskdefs/compilers/Jikes.java | 15 +- .../tools/ant/taskdefs/compilers/Jvc.java | 3 +- .../tools/ant/taskdefs/compilers/Kjc.java | 5 +- .../apache/tools/ant/taskdefs/compilers/Sj.java | 3 +- .../tools/ant/taskdefs/condition/And.java | 6 +- .../ant/taskdefs/condition/AntVersion.java | 12 +- .../tools/ant/taskdefs/condition/Condition.java | 1 - .../ant/taskdefs/condition/ConditionBase.java | 44 +- .../tools/ant/taskdefs/condition/Contains.java | 5 +- .../ant/taskdefs/condition/FilesMatch.java | 8 +- .../ant/taskdefs/condition/HasFreeSpace.java | 7 +- .../tools/ant/taskdefs/condition/HasMethod.java | 39 +- .../tools/ant/taskdefs/condition/Http.java | 8 +- .../ant/taskdefs/condition/IsLastModified.java | 16 +- .../ant/taskdefs/condition/IsReachable.java | 29 +- .../ant/taskdefs/condition/IsReference.java | 35 +- .../tools/ant/taskdefs/condition/IsSet.java | 4 +- .../tools/ant/taskdefs/condition/IsSigned.java | 13 +- .../tools/ant/taskdefs/condition/IsTrue.java | 2 +- .../tools/ant/taskdefs/condition/Not.java | 7 +- .../apache/tools/ant/taskdefs/condition/Or.java | 5 +- .../apache/tools/ant/taskdefs/condition/Os.java | 34 +- .../ant/taskdefs/condition/ParserSupports.java | 8 +- .../taskdefs/condition/ResourceContains.java | 16 +- .../ant/taskdefs/condition/ResourcesMatch.java | 7 +- .../tools/ant/taskdefs/condition/Socket.java | 13 +- .../tools/ant/taskdefs/condition/TypeFound.java | 2 +- .../tools/ant/taskdefs/condition/Xor.java | 5 +- .../tools/ant/taskdefs/cvslib/CVSEntry.java | 9 +- .../ant/taskdefs/cvslib/ChangeLogParser.java | 54 +- .../ant/taskdefs/cvslib/ChangeLogTask.java | 97 +-- .../ant/taskdefs/cvslib/ChangeLogWriter.java | 18 +- .../tools/ant/taskdefs/cvslib/CvsTagDiff.java | 77 +-- .../tools/ant/taskdefs/cvslib/CvsTagEntry.java | 3 +- .../tools/ant/taskdefs/cvslib/CvsUser.java | 17 +- .../tools/ant/taskdefs/cvslib/CvsVersion.java | 16 +- .../tools/ant/taskdefs/cvslib/RCSFile.java | 3 - .../cvslib/RedirectingOutputStream.java | 2 +- .../cvslib/RedirectingStreamHandler.java | 6 +- .../tools/ant/taskdefs/email/EmailAddress.java | 12 +- .../tools/ant/taskdefs/email/EmailTask.java | 83 +-- .../apache/tools/ant/taskdefs/email/Mailer.java | 1 - .../tools/ant/taskdefs/email/Message.java | 12 +- .../tools/ant/taskdefs/email/MimeMailer.java | 84 ++- .../tools/ant/taskdefs/email/PlainMailer.java | 56 +- .../tools/ant/taskdefs/email/UUMailer.java | 15 +- .../ant/taskdefs/launcher/CommandLauncher.java | 40 +- .../launcher/PerlScriptCommandLauncher.java | 9 +- .../launcher/ScriptCommandLauncher.java | 9 +- .../taskdefs/launcher/VmsCommandLauncher.java | 18 +- .../tools/ant/taskdefs/optional/ANTLR.java | 25 +- .../apache/tools/ant/taskdefs/optional/Cab.java | 112 ++-- .../ant/taskdefs/optional/EchoProperties.java | 199 +++--- .../tools/ant/taskdefs/optional/Javah.java | 103 ++- .../ant/taskdefs/optional/Native2Ascii.java | 29 +- .../tools/ant/taskdefs/optional/NetRexxC.java | 246 +++---- .../ant/taskdefs/optional/PropertyFile.java | 68 +- .../ant/taskdefs/optional/ReplaceRegExp.java | 46 +- .../apache/tools/ant/taskdefs/optional/Rpm.java | 15 +- .../ant/taskdefs/optional/SchemaValidate.java | 96 ++- .../ant/taskdefs/optional/ccm/CCMCheck.java | 50 +- .../ant/taskdefs/optional/ccm/CCMCheckin.java | 1 - .../optional/ccm/CCMCheckinDefault.java | 7 +- .../ant/taskdefs/optional/ccm/CCMCheckout.java | 1 - .../taskdefs/optional/ccm/CCMCreateTask.java | 114 ++-- .../taskdefs/optional/ccm/CCMReconfigure.java | 45 +- .../ant/taskdefs/optional/ccm/Continuus.java | 62 +- .../taskdefs/optional/clearcase/CCCheckin.java | 74 ++- .../taskdefs/optional/clearcase/CCCheckout.java | 140 ++-- .../ant/taskdefs/optional/clearcase/CCLock.java | 120 ++-- .../taskdefs/optional/clearcase/CCMkattr.java | 70 +- .../ant/taskdefs/optional/clearcase/CCMkbl.java | 86 ++- .../taskdefs/optional/clearcase/CCMkdir.java | 53 +- .../taskdefs/optional/clearcase/CCMkelem.java | 94 ++- .../taskdefs/optional/clearcase/CCMklabel.java | 75 +-- .../taskdefs/optional/clearcase/CCMklbtype.java | 102 ++- .../taskdefs/optional/clearcase/CCRmtype.java | 74 +-- .../optional/clearcase/CCUnCheckout.java | 29 +- .../taskdefs/optional/clearcase/CCUnlock.java | 71 +- .../taskdefs/optional/clearcase/CCUpdate.java | 103 ++- .../taskdefs/optional/clearcase/ClearCase.java | 136 ++-- .../taskdefs/optional/depend/AntAnalyzer.java | 57 +- .../ant/taskdefs/optional/depend/ClassFile.java | 8 +- .../optional/depend/ClassFileIterator.java | 35 +- .../optional/depend/ClassFileUtils.java | 1 - .../ant/taskdefs/optional/depend/Depend.java | 367 +++++------ .../optional/depend/DirectoryIterator.java | 63 +- .../optional/depend/JarFileIterator.java | 5 +- .../depend/constantpool/ClassCPInfo.java | 4 +- .../depend/constantpool/ConstantCPInfo.java | 1 - .../depend/constantpool/ConstantPool.java | 15 +- .../depend/constantpool/ConstantPoolEntry.java | 18 +- .../depend/constantpool/DoubleCPInfo.java | 5 +- .../depend/constantpool/FieldRefCPInfo.java | 17 +- .../depend/constantpool/FloatCPInfo.java | 5 +- .../depend/constantpool/IntegerCPInfo.java | 5 +- .../constantpool/InterfaceMethodRefCPInfo.java | 16 +- .../constantpool/InvokeDynamicCPInfo.java | 17 +- .../depend/constantpool/LongCPInfo.java | 5 +- .../depend/constantpool/MethodHandleCPInfo.java | 44 +- .../depend/constantpool/MethodRefCPInfo.java | 17 +- .../depend/constantpool/MethodTypeCPInfo.java | 9 +- .../depend/constantpool/NameAndTypeCPInfo.java | 43 +- .../depend/constantpool/StringCPInfo.java | 8 +- .../depend/constantpool/Utf8CPInfo.java | 3 +- .../optional/ejb/BorlandDeploymentTool.java | 121 ++-- .../optional/ejb/BorlandGenerateClient.java | 39 +- .../optional/ejb/DescriptorHandler.java | 60 +- .../optional/ejb/EJBDeploymentTool.java | 3 - .../tools/ant/taskdefs/optional/ejb/EjbJar.java | 70 +- .../optional/ejb/GenericDeploymentTool.java | 262 +++----- .../optional/ejb/IPlanetDeploymentTool.java | 43 +- .../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 227 +++---- .../taskdefs/optional/ejb/IPlanetEjbcTask.java | 72 +- .../optional/ejb/InnerClassFilenameFilter.java | 8 +- .../optional/ejb/JbossDeploymentTool.java | 16 +- .../optional/ejb/JonasDeploymentTool.java | 99 +-- .../optional/ejb/WeblogicDeploymentTool.java | 178 ++--- .../ejb/WeblogicTOPLinkDeploymentTool.java | 23 +- .../optional/ejb/WebsphereDeploymentTool.java | 147 ++--- .../optional/extension/Compatability.java | 1 + .../optional/extension/Compatibility.java | 1 + .../taskdefs/optional/extension/Extension.java | 65 +- .../optional/extension/ExtensionAdapter.java | 7 +- .../optional/extension/ExtensionSet.java | 21 +- .../optional/extension/ExtensionUtil.java | 64 +- .../optional/extension/ExtraAttribute.java | 10 +- .../optional/extension/JarLibAvailableTask.java | 70 +- .../optional/extension/JarLibDisplayTask.java | 46 +- .../optional/extension/JarLibManifestTask.java | 69 +- .../optional/extension/JarLibResolveTask.java | 48 +- .../taskdefs/optional/extension/LibFileSet.java | 3 +- .../optional/extension/LibraryDisplayer.java | 23 +- .../optional/extension/Specification.java | 105 ++- .../extension/resolvers/AntResolver.java | 2 + .../extension/resolvers/LocationResolver.java | 6 +- .../extension/resolvers/URLResolver.java | 17 +- .../ant/taskdefs/optional/i18n/Translate.java | 76 +-- .../ant/taskdefs/optional/image/Image.java | 86 +-- .../j2ee/AbstractHotDeploymentTool.java | 11 +- .../optional/j2ee/GenericHotDeploymentTool.java | 6 +- .../optional/j2ee/JonasHotDeploymentTool.java | 36 +- .../taskdefs/optional/j2ee/ServerDeploy.java | 15 +- .../j2ee/WebLogicHotDeploymentTool.java | 43 +- .../ant/taskdefs/optional/javacc/JJDoc.java | 24 +- .../ant/taskdefs/optional/javacc/JJTree.java | 53 +- .../ant/taskdefs/optional/javacc/JavaCC.java | 40 +- .../optional/javah/JavahAdapterFactory.java | 18 +- .../ant/taskdefs/optional/javah/SunJavah.java | 3 +- .../taskdefs/optional/jdepend/JDependTask.java | 165 ++--- .../optional/jlink/ClassNameReader.java | 17 +- .../ant/taskdefs/optional/jlink/JlinkTask.java | 50 +- .../ant/taskdefs/optional/jlink/jlink.java | 160 ++--- .../taskdefs/optional/jsp/Jasper41Mangler.java | 7 +- .../tools/ant/taskdefs/optional/jsp/JspC.java | 80 +-- .../taskdefs/optional/jsp/JspNameMangler.java | 11 +- .../tools/ant/taskdefs/optional/jsp/WLJspc.java | 82 +-- .../compilers/DefaultJspCompilerAdapter.java | 33 +- .../optional/jsp/compilers/JasperC.java | 18 +- .../compilers/JspCompilerAdapterFactory.java | 9 +- .../optional/junit/AggregateTransformer.java | 40 +- .../ant/taskdefs/optional/junit/BaseTest.java | 2 +- .../ant/taskdefs/optional/junit/BatchTest.java | 40 +- .../junit/BriefJUnitResultFormatter.java | 23 +- .../junit/CustomJUnit4TestAdapterCache.java | 3 +- .../ant/taskdefs/optional/junit/DOMUtil.java | 8 +- .../taskdefs/optional/junit/Enumerations.java | 162 ++--- .../optional/junit/FailureRecorder.java | 61 +- .../optional/junit/FormatterElement.java | 94 +-- .../optional/junit/IgnoredTestResult.java | 9 +- .../optional/junit/JUnit4TestMethodAdapter.java | 36 +- .../ant/taskdefs/optional/junit/JUnitTask.java | 282 ++++---- .../optional/junit/JUnitTaskMirrorImpl.java | 8 + .../ant/taskdefs/optional/junit/JUnitTest.java | 17 +- .../optional/junit/JUnitTestRunner.java | 301 +++++---- .../optional/junit/JUnitVersionHelper.java | 31 +- .../junit/PlainJUnitResultFormatter.java | 27 +- .../junit/SummaryJUnitResultFormatter.java | 20 +- .../optional/junit/TearDownOnVmCrash.java | 21 +- .../optional/junit/TestListenerWrapper.java | 11 +- .../optional/junit/XMLJUnitResultFormatter.java | 70 +- .../optional/junit/XMLResultAggregator.java | 52 +- .../native2ascii/BuiltinNative2Ascii.java | 24 +- .../native2ascii/DefaultNative2Ascii.java | 1 + .../native2ascii/KaffeNative2Ascii.java | 10 +- .../optional/native2ascii/SunNative2Ascii.java | 22 +- .../tools/ant/taskdefs/optional/net/FTP.java | 650 ++++++++++--------- .../ant/taskdefs/optional/net/FTPTask.java | 110 ++-- .../optional/net/FTPTaskMirrorImpl.java | 545 ++++++++-------- .../ant/taskdefs/optional/net/MimeMail.java | 2 + .../ant/taskdefs/optional/net/RExecTask.java | 62 +- .../ant/taskdefs/optional/net/SetProxy.java | 3 +- .../ant/taskdefs/optional/net/TelnetTask.java | 22 +- .../tools/ant/taskdefs/optional/pvcs/Pvcs.java | 119 ++-- .../ant/taskdefs/optional/pvcs/PvcsProject.java | 5 - .../ant/taskdefs/optional/script/ScriptDef.java | 101 ++- .../taskdefs/optional/script/ScriptDefBase.java | 26 +- .../tools/ant/taskdefs/optional/sos/SOS.java | 1 + .../ant/taskdefs/optional/sos/SOSCheckin.java | 1 + .../ant/taskdefs/optional/sos/SOSCheckout.java | 1 + .../tools/ant/taskdefs/optional/sos/SOSGet.java | 1 + .../ant/taskdefs/optional/sos/SOSLabel.java | 1 + .../taskdefs/optional/sound/AntSoundPlayer.java | 13 +- .../taskdefs/optional/splash/SplashScreen.java | 19 +- .../taskdefs/optional/splash/SplashTask.java | 16 +- .../optional/ssh/AbstractSshMessage.java | 20 +- .../ant/taskdefs/optional/ssh/Directory.java | 16 +- .../ant/taskdefs/optional/ssh/SSHBase.java | 20 +- .../ant/taskdefs/optional/ssh/SSHExec.java | 54 +- .../ant/taskdefs/optional/ssh/SSHSession.java | 84 +-- .../ant/taskdefs/optional/ssh/SSHUserInfo.java | 14 +- .../tools/ant/taskdefs/optional/ssh/Scp.java | 120 ++-- .../taskdefs/optional/ssh/ScpFromMessage.java | 19 +- .../optional/ssh/ScpFromMessageBySftp.java | 18 +- .../ant/taskdefs/optional/ssh/ScpToMessage.java | 36 +- .../optional/ssh/ScpToMessageBySftp.java | 35 +- .../ant/taskdefs/optional/testing/BlockFor.java | 1 + .../ant/taskdefs/optional/testing/Funtest.java | 36 +- .../optional/unix/AbstractAccessTask.java | 4 + .../tools/ant/taskdefs/optional/unix/Chgrp.java | 2 + .../tools/ant/taskdefs/optional/unix/Chown.java | 2 + .../ant/taskdefs/optional/unix/Symlink.java | 121 ++-- .../ant/taskdefs/optional/windows/Attrib.java | 9 +- .../tools/ant/taskdefs/optional/xz/Unxz.java | 19 +- .../tools/ant/taskdefs/optional/xz/Xz.java | 12 +- .../ant/taskdefs/rmic/DefaultRmicAdapter.java | 66 +- .../tools/ant/taskdefs/rmic/ForkingSunRmic.java | 1 + .../tools/ant/taskdefs/rmic/KaffeRmic.java | 14 +- .../ant/taskdefs/rmic/RmicAdapterFactory.java | 14 +- .../apache/tools/ant/taskdefs/rmic/SunRmic.java | 40 +- .../apache/tools/ant/taskdefs/rmic/WLRmic.java | 15 +- .../tools/ant/taskdefs/rmic/XNewRmic.java | 5 +- .../apache/tools/ant/types/AbstractFileSet.java | 105 +-- .../apache/tools/ant/types/AntFilterReader.java | 11 +- .../apache/tools/ant/types/ArchiveFileSet.java | 35 +- .../apache/tools/ant/types/ArchiveScanner.java | 3 +- .../org/apache/tools/ant/types/Assertions.java | 21 +- .../org/apache/tools/ant/types/Commandline.java | 41 +- .../apache/tools/ant/types/CommandlineJava.java | 26 +- .../org/apache/tools/ant/types/DataType.java | 2 + .../org/apache/tools/ant/types/Description.java | 18 +- src/main/org/apache/tools/ant/types/DirSet.java | 23 +- .../tools/ant/types/EnumeratedAttribute.java | 3 +- .../org/apache/tools/ant/types/Environment.java | 19 +- .../org/apache/tools/ant/types/FileList.java | 14 +- .../org/apache/tools/ant/types/FileSet.java | 9 +- .../org/apache/tools/ant/types/FilterSet.java | 74 +-- .../tools/ant/types/FilterSetCollection.java | 9 +- .../org/apache/tools/ant/types/FlexInteger.java | 1 + .../org/apache/tools/ant/types/LogLevel.java | 1 + src/main/org/apache/tools/ant/types/Mapper.java | 2 + .../apache/tools/ant/types/Parameterizable.java | 2 +- src/main/org/apache/tools/ant/types/Path.java | 37 +- .../org/apache/tools/ant/types/PatternSet.java | 77 +-- .../org/apache/tools/ant/types/Permissions.java | 16 +- .../org/apache/tools/ant/types/PropertySet.java | 57 +- .../org/apache/tools/ant/types/Quantifier.java | 126 ++-- .../tools/ant/types/RedirectorElement.java | 16 +- .../tools/ant/types/RegularExpression.java | 6 - .../org/apache/tools/ant/types/Resource.java | 79 ++- .../tools/ant/types/ResourceCollection.java | 81 ++- .../org/apache/tools/ant/types/TarFileSet.java | 18 +- .../org/apache/tools/ant/types/TarScanner.java | 44 +- .../org/apache/tools/ant/types/XMLCatalog.java | 48 +- .../org/apache/tools/ant/types/ZipFileSet.java | 32 +- .../org/apache/tools/ant/types/ZipScanner.java | 31 +- .../tools/ant/types/mappers/CutDirsMapper.java | 5 +- .../tools/ant/types/mappers/FilterMapper.java | 10 +- .../types/optional/AbstractScriptComponent.java | 1 + .../ant/types/optional/ScriptCondition.java | 1 + .../tools/ant/types/optional/ScriptFilter.java | 2 + .../tools/ant/types/optional/ScriptMapper.java | 12 +- .../ant/types/optional/ScriptSelector.java | 2 + .../ant/types/optional/depend/ClassfileSet.java | 31 +- .../types/optional/depend/DependScanner.java | 62 +- .../tools/ant/types/optional/image/Arc.java | 20 +- .../ant/types/optional/image/ColorMapper.java | 41 +- .../tools/ant/types/optional/image/Draw.java | 14 +- .../tools/ant/types/optional/image/Ellipse.java | 14 +- .../types/optional/image/ImageOperation.java | 2 +- .../ant/types/optional/image/Rectangle.java | 26 +- .../tools/ant/types/optional/image/Rotate.java | 23 +- .../tools/ant/types/optional/image/Scale.java | 43 +- .../tools/ant/types/optional/image/Text.java | 22 +- .../optional/image/TransformOperation.java | 1 + .../tools/ant/types/optional/xz/XzResource.java | 9 +- .../tools/ant/types/resolver/ApacheCatalog.java | 2 + .../types/resolver/ApacheCatalogResolver.java | 7 +- .../resources/AbstractClasspathResource.java | 44 +- .../AbstractResourceCollectionWrapper.java | 18 +- .../tools/ant/types/resources/AllButFirst.java | 22 +- .../tools/ant/types/resources/AllButLast.java | 20 +- .../ant/types/resources/ArchiveResource.java | 42 +- .../tools/ant/types/resources/Archives.java | 45 +- .../tools/ant/types/resources/BCFileSet.java | 2 + .../ant/types/resources/BZip2Resource.java | 3 + .../BaseResourceCollectionContainer.java | 55 +- .../BaseResourceCollectionWrapper.java | 2 + .../ant/types/resources/CompressedResource.java | 1 + .../resources/ContentTransformingResource.java | 30 +- .../tools/ant/types/resources/Difference.java | 11 +- .../tools/ant/types/resources/FailFast.java | 12 +- .../tools/ant/types/resources/FileResource.java | 49 +- .../types/resources/FileResourceIterator.java | 3 + .../apache/tools/ant/types/resources/Files.java | 54 +- .../apache/tools/ant/types/resources/First.java | 14 +- .../tools/ant/types/resources/GZipResource.java | 9 +- .../tools/ant/types/resources/Intersect.java | 27 +- .../types/resources/JavaConstantResource.java | 1 + .../tools/ant/types/resources/JavaResource.java | 21 +- .../apache/tools/ant/types/resources/Last.java | 29 +- .../LazyResourceCollectionWrapper.java | 34 +- .../ant/types/resources/LogOutputResource.java | 2 + .../resources/MappedResourceCollection.java | 69 +- .../ant/types/resources/MultiRootFileSet.java | 17 +- .../ant/types/resources/PropertyResource.java | 19 +- .../ant/types/resources/ResourceDecorator.java | 13 +- .../tools/ant/types/resources/ResourceList.java | 77 ++- .../tools/ant/types/resources/Resources.java | 47 +- .../tools/ant/types/resources/Restrict.java | 25 +- .../types/resources/SizeLimitCollection.java | 5 +- .../apache/tools/ant/types/resources/Sort.java | 18 +- .../ant/types/resources/StringResource.java | 37 +- .../tools/ant/types/resources/TarResource.java | 28 +- .../tools/ant/types/resources/Tokens.java | 37 +- .../apache/tools/ant/types/resources/Union.java | 48 +- .../types/resources/comparators/Content.java | 2 +- .../ant/types/resources/comparators/Date.java | 12 +- .../DelegatedResourceComparator.java | 32 +- .../ant/types/resources/comparators/Exists.java | 8 +- .../types/resources/comparators/FileSystem.java | 43 +- .../comparators/ResourceComparator.java | 10 +- .../types/resources/comparators/Reverse.java | 7 +- .../ant/types/resources/comparators/Size.java | 5 +- .../ant/types/resources/comparators/Type.java | 8 +- .../ant/types/resources/selectors/And.java | 11 +- .../ant/types/resources/selectors/Date.java | 12 +- .../types/resources/selectors/InstanceOf.java | 5 +- .../ant/types/resources/selectors/Majority.java | 6 +- .../ant/types/resources/selectors/Name.java | 15 +- .../ant/types/resources/selectors/None.java | 11 +- .../tools/ant/types/resources/selectors/Or.java | 11 +- .../selectors/ResourceSelectorContainer.java | 31 +- .../selectors/AbstractSelectorContainer.java | 66 +- .../tools/ant/types/selectors/AndSelector.java | 18 +- .../ant/types/selectors/BaseExtendSelector.java | 14 +- .../tools/ant/types/selectors/BaseSelector.java | 14 +- .../types/selectors/BaseSelectorContainer.java | 47 +- .../types/selectors/ContainsRegexpSelector.java | 77 +-- .../ant/types/selectors/ContainsSelector.java | 80 +-- .../tools/ant/types/selectors/DateSelector.java | 33 +- .../ant/types/selectors/DependSelector.java | 16 +- .../ant/types/selectors/DepthSelector.java | 47 +- .../ant/types/selectors/DifferentSelector.java | 20 +- .../ant/types/selectors/ExecutableSelector.java | 15 +- .../ant/types/selectors/ExtendSelector.java | 33 +- .../tools/ant/types/selectors/FileSelector.java | 15 +- .../ant/types/selectors/FilenameSelector.java | 41 +- .../ant/types/selectors/MajoritySelector.java | 9 +- .../ant/types/selectors/MappingSelector.java | 14 +- .../tools/ant/types/selectors/NoneSelector.java | 19 +- .../tools/ant/types/selectors/NotSelector.java | 4 +- .../tools/ant/types/selectors/OrSelector.java | 19 +- .../ant/types/selectors/OwnedBySelector.java | 17 +- .../ant/types/selectors/PresentSelector.java | 7 - .../ant/types/selectors/ReadableSelector.java | 14 +- .../ant/types/selectors/SelectSelector.java | 18 +- .../ant/types/selectors/SelectorUtils.java | 90 ++- .../ant/types/selectors/SignedSelector.java | 1 + .../tools/ant/types/selectors/SizeSelector.java | 11 +- .../ant/types/selectors/SymlinkSelector.java | 15 +- .../ant/types/selectors/TokenizedPath.java | 7 +- .../ant/types/selectors/TokenizedPattern.java | 25 +- .../tools/ant/types/selectors/TypeSelector.java | 21 +- .../ant/types/selectors/WritableSelector.java | 11 +- .../modifiedselector/ChecksumAlgorithm.java | 37 +- .../modifiedselector/DigestAlgorithm.java | 69 +- .../modifiedselector/ModifiedSelector.java | 198 +++--- .../modifiedselector/PropertiesfileCache.java | 33 +- .../apache/tools/ant/types/spi/Provider.java | 2 +- .../org/apache/tools/ant/types/spi/Service.java | 19 +- .../apache/tools/ant/util/ChainedMapper.java | 33 +- .../apache/tools/ant/util/ClasspathUtils.java | 29 +- .../apache/tools/ant/util/CollectionUtils.java | 63 +- .../apache/tools/ant/util/CompositeMapper.java | 26 +- .../tools/ant/util/ConcatFileInputStream.java | 2 + .../ant/util/ConcatResourceInputStream.java | 4 +- .../apache/tools/ant/util/ContainerMapper.java | 26 +- .../apache/tools/ant/util/DOMElementWriter.java | 54 +- .../org/apache/tools/ant/util/DOMUtils.java | 3 + .../org/apache/tools/ant/util/DateUtils.java | 8 +- .../org/apache/tools/ant/util/DeweyDecimal.java | 15 +- .../apache/tools/ant/util/FileTokenizer.java | 2 + .../org/apache/tools/ant/util/FileUtils.java | 77 +-- .../apache/tools/ant/util/FirstMatchMapper.java | 16 +- .../tools/ant/util/FlatFileNameMapper.java | 5 +- .../tools/ant/util/GlobPatternMapper.java | 49 +- .../apache/tools/ant/util/IdentityMapper.java | 5 +- .../apache/tools/ant/util/IdentityStack.java | 20 +- .../org/apache/tools/ant/util/JAXPUtils.java | 3 +- .../org/apache/tools/ant/util/JavaEnvUtils.java | 10 +- .../ant/util/LayoutPreservingProperties.java | 74 ++- .../tools/ant/util/LazyFileOutputStream.java | 4 + .../apache/tools/ant/util/LazyHashtable.java | 1 + .../tools/ant/util/LeadPipeInputStream.java | 1 + .../apache/tools/ant/util/LineTokenizer.java | 16 +- .../apache/tools/ant/util/LinkedHashtable.java | 25 +- .../org/apache/tools/ant/util/LoaderUtils.java | 2 +- .../apache/tools/ant/util/MergingMapper.java | 3 + .../tools/ant/util/OutputStreamFunneler.java | 5 + .../tools/ant/util/PackageNameMapper.java | 1 + .../tools/ant/util/PropertyOutputStream.java | 7 +- .../org/apache/tools/ant/util/ProxySetup.java | 2 +- .../tools/ant/util/ReaderInputStream.java | 11 +- .../org/apache/tools/ant/util/ReflectUtil.java | 56 +- .../apache/tools/ant/util/ReflectWrapper.java | 28 +- .../tools/ant/util/RegexpPatternMapper.java | 35 +- .../apache/tools/ant/util/ResourceUtils.java | 212 ++---- .../apache/tools/ant/util/ScriptFixBSFPath.java | 2 +- .../apache/tools/ant/util/ScriptRunnerBase.java | 72 +- .../tools/ant/util/SourceFileScanner.java | 38 +- .../apache/tools/ant/util/SplitClassLoader.java | 8 +- .../apache/tools/ant/util/StringTokenizer.java | 15 +- .../org/apache/tools/ant/util/StringUtils.java | 21 +- .../tools/ant/util/SymbolicLinkUtils.java | 7 +- .../apache/tools/ant/util/TeeOutputStream.java | 6 +- .../tools/ant/util/UnPackageNameMapper.java | 1 + .../org/apache/tools/ant/util/VectorSet.java | 40 +- .../org/apache/tools/ant/util/Watchdog.java | 32 +- .../apache/tools/ant/util/WeakishReference.java | 1 + .../org/apache/tools/ant/util/XMLFragment.java | 13 +- .../tools/ant/util/depend/AbstractAnalyzer.java | 20 +- .../ant/util/depend/bcel/AncestorAnalyzer.java | 53 +- .../ant/util/depend/bcel/DependencyVisitor.java | 24 +- .../ant/util/depend/bcel/FullAnalyzer.java | 43 +- .../tools/ant/util/facade/FacadeTaskHelper.java | 19 +- .../facade/ImplementationSpecificArgument.java | 8 +- .../tools/ant/util/java15/ProxyDiagnostics.java | 47 +- .../ant/util/optional/JavaxScriptRunner.java | 132 ++-- .../util/optional/NoExitSecurityManager.java | 2 + .../tools/ant/util/optional/ScriptRunner.java | 16 +- .../ant/util/optional/WeakishReference12.java | 1 + .../ant/util/regexp/JakartaOroMatcher.java | 26 +- .../tools/ant/util/regexp/JakartaOroRegexp.java | 17 +- .../ant/util/regexp/JakartaRegexpMatcher.java | 14 +- .../ant/util/regexp/JakartaRegexpRegexp.java | 14 +- .../ant/util/regexp/Jdk14RegexpMatcher.java | 24 +- .../ant/util/regexp/Jdk14RegexpRegexp.java | 24 +- .../tools/ant/util/regexp/RegexpFactory.java | 10 +- .../tools/ant/util/regexp/RegexpMatcher.java | 4 +- .../ant/util/regexp/RegexpMatcherFactory.java | 10 +- .../tools/ant/util/regexp/RegexpUtil.java | 4 +- .../apache/tools/mail/ErrorInQuitException.java | 2 + src/main/org/apache/tools/mail/MailMessage.java | 606 +++++++++-------- .../apache/tools/mail/SmtpResponseReader.java | 10 +- .../ant/taskdefs/ProtectedJarMethodsTest.java | 38 +- .../resources/LazyResourceCollectionTest.java | 368 ++++++----- 609 files changed, 11648 insertions(+), 13756 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/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 22c4b29..5f313e2 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -178,7 +178,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo * The components of the classpath that the classloader searches * for classes. */ - private final Vector<File> pathComponents = new VectorSet<File>(); + private final Vector<File> pathComponents = new VectorSet<>(); /** * The project to which this class loader belongs. @@ -196,14 +196,14 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo * loader regardless of whether the parent class loader is being searched * first or not. */ - private final Vector<String> systemPackages = new Vector<String>(); + private final Vector<String> systemPackages = new Vector<>(); /** * These are the package roots that are to be loaded by this class loader * regardless of whether the parent class loader is being searched first * or not. */ - private final Vector<String> loaderPackages = new Vector<String>(); + private final Vector<String> loaderPackages = new Vector<>(); /** * Whether or not this classloader will ignore the base @@ -221,7 +221,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo /** * A hashtable of zip files opened by the classloader (File to JarFile). */ - private Hashtable<File, JarFile> jarFiles = new Hashtable<File, JarFile>(); + private Hashtable<File, JarFile> jarFiles = new Hashtable<>(); /** Static map of jar file/time to manifest class-path entries */ private static Map<String, String> pathMap = @@ -293,8 +293,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo * classloader should be consulted before trying to * load the a class through this loader. */ - public AntClassLoader( - final ClassLoader parent, final Project project, final Path classpath, final boolean parentFirst) { + public AntClassLoader(final ClassLoader parent, final Project project, + final Path classpath, final boolean parentFirst) { this(project, classpath); if (parent != null) { setParent(parent); @@ -315,7 +315,8 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo * classloader should be consulted before trying to * load the a class through this loader. */ - public AntClassLoader(final Project project, final Path classpath, final boolean parentFirst) { + public AntClassLoader(final Project project, final Path classpath, + final boolean parentFirst) { this(null, project, classpath, parentFirst); } http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java index ed3331f..c378cd5 100644 --- a/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java +++ b/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java @@ -21,6 +21,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; @@ -151,7 +152,7 @@ public class ArgumentProcessorRegistry { try { try { isr = new InputStreamReader(is, "UTF-8"); - } catch (java.io.UnsupportedEncodingException e) { + } catch (UnsupportedEncodingException e) { isr = new InputStreamReader(is); } BufferedReader rd = new BufferedReader(isr); http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/src/main/org/apache/tools/ant/BuildException.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/BuildException.java b/src/main/org/apache/tools/ant/BuildException.java index 34c1605..6729744 100644 --- a/src/main/org/apache/tools/ant/BuildException.java +++ b/src/main/org/apache/tools/ant/BuildException.java @@ -38,13 +38,26 @@ public class BuildException extends RuntimeException { * Constructs an exception with the given descriptive message. * * @param message A description of or information about the exception. - * Should not be <code>null</code>. + * Should not be {@code null}. */ public BuildException(String message) { super(message); } /** + * Constructs an exception with the given format pattern and arguments. + * + * @param pattern A description of or information about the exception. + * Should not be {@code null}. + * @param formatArguments + * @see String#format(String, Object...) + * @since Ant 1.11 + */ + public BuildException(String pattern, Object... formatArguments) { + super(String.format(pattern, formatArguments)); + } + + /** * Constructs an exception with the given message and exception as * a root cause. * http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/src/main/org/apache/tools/ant/ComponentHelper.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java index 4942d24..c772d1b 100644 --- a/src/main/org/apache/tools/ant/ComponentHelper.java +++ b/src/main/org/apache/tools/ant/ComponentHelper.java @@ -59,31 +59,31 @@ import org.apache.tools.ant.util.FileUtils; */ public class ComponentHelper { /** Map of component name to lists of restricted definitions */ - private Map<String, List<AntTypeDefinition>> restrictedDefinitions = new HashMap<String, List<AntTypeDefinition>>(); + private Map<String, List<AntTypeDefinition>> restrictedDefinitions = new HashMap<>(); /** Map from component name to anttypedefinition */ - private final Hashtable<String, AntTypeDefinition> antTypeTable = new Hashtable<String, AntTypeDefinition>(); + private final Hashtable<String, AntTypeDefinition> antTypeTable = new Hashtable<>(); /** Map of tasks generated from antTypeTable */ - private final Hashtable<String, Class<?>> taskClassDefinitions = new Hashtable<String, Class<?>>(); + private final Hashtable<String, Class<?>> taskClassDefinitions = new Hashtable<>(); /** flag to rebuild taskClassDefinitions */ private boolean rebuildTaskClassDefinitions = true; /** Map of types generated from antTypeTable */ - private final Hashtable<String, Class<?>> typeClassDefinitions = new Hashtable<String, Class<?>>(); + private final Hashtable<String, Class<?>> typeClassDefinitions = new Hashtable<>(); /** flag to rebuild typeClassDefinitions */ private boolean rebuildTypeClassDefinitions = true; /** Set of namespaces that have been checked for antlibs */ - private final HashSet<String> checkedNamespaces = new HashSet<String>(); + private final HashSet<String> checkedNamespaces = new HashSet<>(); /** * Stack of antlib contexts used to resolve definitions while * processing antlib */ - private Stack<String> antLibStack = new Stack<String>(); + private Stack<String> antLibStack = new Stack<>(); /** current antlib uri */ private String antLibCurrentUri = null; @@ -189,7 +189,6 @@ public class ComponentHelper { */ public void setProject(Project project) { this.project = project; -// antTypeTable = new Hashtable<String, AntTypeDefinition>(project); } /** @@ -205,13 +204,13 @@ public class ComponentHelper { * @return A deep copy of the restrictredDefinition */ private Map<String, List<AntTypeDefinition>> getRestrictedDefinition() { - final Map<String, List<AntTypeDefinition>> result = new HashMap<String, List<AntTypeDefinition>>(); + final Map<String, List<AntTypeDefinition>> result = new HashMap<>(); synchronized (restrictedDefinitions) { for (Map.Entry<String, List<AntTypeDefinition>> entry : restrictedDefinitions.entrySet()) { List<AntTypeDefinition> entryVal = entry.getValue(); synchronized (entryVal) { //copy the entryVal - entryVal = new ArrayList<AntTypeDefinition> (entryVal); + entryVal = new ArrayList<>(entryVal); } result.put(entry.getKey(), entryVal); } @@ -750,7 +749,7 @@ public class ComponentHelper { */ public void exitAntLib() { antLibStack.pop(); - antLibCurrentUri = (antLibStack.size() == 0) ? null : (String) antLibStack.peek(); + antLibCurrentUri = (antLibStack.isEmpty()) ? null : (String) antLibStack.peek(); } /** @@ -759,9 +758,7 @@ public class ComponentHelper { private void initTasks() { ClassLoader classLoader = getClassLoader(null); Properties props = getDefaultDefinitions(false); - Enumeration<?> e = props.propertyNames(); - while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + for (String name : props.stringPropertyNames()) { String className = props.getProperty(name); AntTypeDefinition def = new AntTypeDefinition(); def.setName(name); @@ -902,7 +899,7 @@ public class ComponentHelper { probablyIDE = true; antHomeLib = "ANT_HOME" + File.separatorChar + "lib"; } - StringBuffer dirListingText = new StringBuffer(); + StringBuilder dirListingText = new StringBuilder(); final String tab = " -"; dirListingText.append(tab); dirListingText.append(antHomeLib); @@ -1026,14 +1023,7 @@ public class ComponentHelper { + " declarations have taken place."); if (uri.length() > 0) { final List<AntTypeDefinition> matches = findTypeMatches(uri); - if (matches.size() > 0) { - out.println(); - out.println("The definitions in the namespace " + uri + " are:"); - for (AntTypeDefinition def : matches) { - String local = ProjectHelper.extractNameFromComponentName(def.getName()); - out.println(" " + local); - } - } else { + if (matches.isEmpty()) { out.println("No types or tasks have been defined in this namespace yet"); if (isAntlib) { out.println(); @@ -1041,6 +1031,13 @@ public class ComponentHelper { out.println("Action: Check that the implementing library exists in one of:"); out.println(dirListing); } + } else { + out.println(); + out.println("The definitions in the namespace " + uri + " are:"); + for (AntTypeDefinition def : matches) { + String local = ProjectHelper.extractNameFromComponentName(def.getName()); + out.println(" " + local); + } } } } http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/src/main/org/apache/tools/ant/DefaultDefinitions.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/DefaultDefinitions.java b/src/main/org/apache/tools/ant/DefaultDefinitions.java index 062018d..19b4424 100644 --- a/src/main/org/apache/tools/ant/DefaultDefinitions.java +++ b/src/main/org/apache/tools/ant/DefaultDefinitions.java @@ -66,7 +66,6 @@ public final class DefaultDefinitions { private void componentDef(String ns, String name, String classname) { AntTypeDefinition def = new AntTypeDefinition(); - String n = ProjectHelper.genComponentName(ns, name); def.setName(ProjectHelper.genComponentName(ns, name)); def.setClassName(classname); def.setClassLoader(getClass().getClassLoader()); http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/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 e0cd651..8390a64 100644 --- a/src/main/org/apache/tools/ant/DefaultLogger.java +++ b/src/main/org/apache/tools/ant/DefaultLogger.java @@ -24,9 +24,10 @@ import java.io.PrintStream; import java.io.StringReader; import java.text.DateFormat; import java.util.Date; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.tools.ant.util.DateUtils; -import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.StringUtils; /** @@ -257,48 +258,30 @@ public class DefaultLogger implements BuildLogger { // Filter out messages based on priority if (priority <= msgOutputLevel) { - StringBuffer message = new StringBuffer(); - if (event.getTask() != null && !emacsMode) { + StringBuilder message = new StringBuilder(); + if (event.getTask() == null || emacsMode) { + //emacs mode or there is no task + message.append(event.getMessage()); + } else { // Print out the name of the task if we're in one String name = event.getTask().getTaskName(); String label = "[" + name + "] "; int size = LEFT_COLUMN_SIZE - label.length(); - StringBuffer tmp = new StringBuffer(); - for (int i = 0; i < size; i++) { - tmp.append(" "); - } - tmp.append(label); - label = tmp.toString(); - - BufferedReader r = null; - try { - r = new BufferedReader( - new StringReader(event.getMessage())); - String line = r.readLine(); - boolean first = true; - do { - if (first) { - if (line == null) { - message.append(label); - break; - } - } else { - message.append(StringUtils.LINE_SEP); - } - first = false; - message.append(label).append(line); - line = r.readLine(); - } while (line != null); + final String prefix = size > 0 ? Stream.generate(() -> " ") + .limit(size).collect(Collectors.joining()) + label : label; + + try (BufferedReader r = + new BufferedReader(new StringReader(event.getMessage()))) { + + message.append(r.lines().map(line -> prefix + line) + .collect(Collectors.joining(StringUtils.LINE_SEP))); + if (message.length() == 0) { + message.append(prefix); + } } catch (IOException e) { // shouldn't be possible message.append(label).append(event.getMessage()); - } finally { - FileUtils.close(r); } - - } else { - //emacs mode or there is no task - message.append(event.getMessage()); } Throwable ex = event.getException(); if (Project.MSG_DEBUG <= msgOutputLevel && ex != null) { @@ -361,8 +344,7 @@ public class DefaultLogger implements BuildLogger { protected String getTimestamp() { Date date = new Date(System.currentTimeMillis()); DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - String finishTime = formatter.format(date); - return finishTime; + return formatter.format(date); } /** http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/src/main/org/apache/tools/ant/DemuxInputStream.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/DemuxInputStream.java b/src/main/org/apache/tools/ant/DemuxInputStream.java index ea263ca..e8c2164 100644 --- a/src/main/org/apache/tools/ant/DemuxInputStream.java +++ b/src/main/org/apache/tools/ant/DemuxInputStream.java @@ -50,6 +50,7 @@ public class DemuxInputStream extends InputStream { * @return the next byte * @throws IOException on error */ + @Override public int read() throws IOException { byte[] buffer = new byte[1]; if (project.demuxInput(buffer, 0, 1) == -1) { @@ -67,6 +68,7 @@ public class DemuxInputStream extends InputStream { * @return the number of bytes read * @throws IOException on error */ + @Override public int read(byte[] buffer, int offset, int length) throws IOException { return project.demuxInput(buffer, offset, length); } http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/src/main/org/apache/tools/ant/DemuxOutputStream.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java index e69c3a4..7d08fa8 100644 --- a/src/main/org/apache/tools/ant/DemuxOutputStream.java +++ b/src/main/org/apache/tools/ant/DemuxOutputStream.java @@ -64,7 +64,7 @@ public class DemuxOutputStream extends OutputStream { private static final int LF = 0x0a; /** Mapping from thread to buffer (Thread to BufferInfo). */ - private WeakHashMap<Thread, BufferInfo> buffers = new WeakHashMap<Thread, BufferInfo>(); + private WeakHashMap<Thread, BufferInfo> buffers = new WeakHashMap<>(); /** * The project to send output to. @@ -98,14 +98,12 @@ public class DemuxOutputStream extends OutputStream { */ private BufferInfo getBufferInfo() { Thread current = Thread.currentThread(); - BufferInfo bufferInfo = (BufferInfo) buffers.get(current); - if (bufferInfo == null) { - bufferInfo = new BufferInfo(); + return buffers.computeIfAbsent(current, x -> { + BufferInfo bufferInfo = new BufferInfo(); bufferInfo.buffer = new ByteArrayOutputStream(INITIAL_SIZE); bufferInfo.crSeen = false; - buffers.put(current, bufferInfo); - } - return bufferInfo; + return bufferInfo; + }); } /** @@ -113,7 +111,7 @@ public class DemuxOutputStream extends OutputStream { */ private void resetBufferInfo() { Thread current = Thread.currentThread(); - BufferInfo bufferInfo = (BufferInfo) buffers.get(current); + BufferInfo bufferInfo = buffers.get(current); FileUtils.close(bufferInfo.buffer); bufferInfo.buffer = new ByteArrayOutputStream(); bufferInfo.crSeen = false; @@ -134,6 +132,7 @@ public class DemuxOutputStream extends OutputStream { * @param cc data to log (byte). * @exception IOException if the data cannot be written to the stream */ + @Override public void write(int cc) throws IOException { final byte c = (byte) cc; @@ -192,6 +191,7 @@ public class DemuxOutputStream extends OutputStream { * * @see #flush */ + @Override public void close() throws IOException { flush(); removeBuffer(); @@ -203,6 +203,7 @@ public class DemuxOutputStream extends OutputStream { * * @exception IOException if there is a problem flushing the stream. */ + @Override public void flush() throws IOException { BufferInfo bufferInfo = getBufferInfo(); if (bufferInfo.buffer.size() > 0) { @@ -219,6 +220,7 @@ public class DemuxOutputStream extends OutputStream { * * @throws IOException if the data cannot be written into the stream. */ + @Override public void write(byte[] b, int off, int len) throws IOException { // find the line breaks and pass other chars through in blocks int offset = off; http://git-wip-us.apache.org/repos/asf/ant/blob/b7d1e9bd/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 735b349..f93fd5a 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/src/main/org/apache/tools/ant/Diagnostics.java @@ -54,9 +54,6 @@ import org.xml.sax.XMLReader; */ public final class Diagnostics { - /** the version number for java 1.5 returned from JavaEnvUtils */ - private static final int JAVA_1_5_NUMBER = 15; - /** * value for which a difference between clock and temp file time triggers * a warning. @@ -113,8 +110,7 @@ public final class Diagnostics { if (home == null) { return null; } - File libDir = new File(home, "lib"); - return listJarFiles(libDir); + return listJarFiles(new File(home, "lib")); } @@ -124,13 +120,8 @@ public final class Diagnostics { * @return array of files (or null for no such directory) */ private static File[] listJarFiles(File libDir) { - FilenameFilter filter = new FilenameFilter() { - public boolean accept(File dir, String name) { - return name.endsWith(".jar"); - } - }; - File[] files = libDir.listFiles(filter); - return files; + return libDir + .listFiles((FilenameFilter) (dir, name) -> name.endsWith(".jar")); } /** @@ -173,8 +164,7 @@ public final class Diagnostics { return "Could not create an XML Parser"; } // check to what is in the classname - String saxParserName = saxParser.getClass().getName(); - return saxParserName; + return saxParser.getClass().getName(); } /** @@ -187,8 +177,7 @@ public final class Diagnostics { return "Could not create an XSLT Processor"; } // check to what is in the classname - String processorName = transformer.getClass().getName(); - return processorName; + return transformer.getClass().getName(); } /** @@ -216,17 +205,15 @@ public final class Diagnostics { */ private static Transformer getXSLTProcessor() { TransformerFactory transformerFactory = TransformerFactory.newInstance(); - if (transformerFactory == null) { - return null; - } - Transformer transformer = null; - try { - transformer = transformerFactory.newTransformer(); - } catch (Exception e) { - // ignore - ignoreThrowable(e); + if (transformerFactory != null) { + try { + return transformerFactory.newTransformer(); + } catch (Exception e) { + // ignore + ignoreThrowable(e); + } } - return transformer; + return null; } /**
