diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index 4375445c4..482c0f20a 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -849,7 +849,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener, Clo } /** - * Used for isolated resource seaching. + * Used for isolated resource searching. * @return the root classloader of AntClassLoader. */ private ClassLoader getRootLoader() { diff --git a/src/main/org/apache/tools/ant/DemuxInputStream.java b/src/main/org/apache/tools/ant/DemuxInputStream.java index e8c2164ec..7395f240b 100644 --- a/src/main/org/apache/tools/ant/DemuxInputStream.java +++ b/src/main/org/apache/tools/ant/DemuxInputStream.java @@ -23,7 +23,7 @@ import java.io.InputStream; /** * - * Passes input requests to the project object for demuxing into + * Passes input requests to the project object for demultiplexing into * individual tasks and threads. * * @since Ant 1.6 @@ -46,7 +46,7 @@ public class DemuxInputStream extends InputStream { } /** - * Read a byte from the project's demuxed input. + * Read a byte from the project's demultiplexed input. * @return the next byte * @throws IOException on error */ @@ -61,7 +61,7 @@ public class DemuxInputStream extends InputStream { /** - * Read bytes from the project's demuxed input. + * Read bytes from the project's demultiplexed input. * @param buffer an array of bytes to read into * @param offset the offset in the array of bytes * @param length the number of bytes in the array diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index b922def5b..8a5d0faac 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -81,7 +81,7 @@ public final class IntrospectionHelper { final Class[] wrappers = {Boolean.class, Byte.class, Character.class, Short.class, Integer.class, Long.class, Float.class, Double.class}; for (int i = 0; i < primitives.length; i++) { - PRIMITIVE_TYPE_MAP.put (primitives[i], wrappers[i]); + PRIMITIVE_TYPE_MAP.put(primitives[i], wrappers[i]); } } @@ -536,15 +536,11 @@ public final class IntrospectionHelper { if (nc == null) { nc = createAddTypeCreator(project, parent, elementName); } - if (nc == null && - (parent instanceof DynamicElementNS - || parent instanceof DynamicElement) - ) { + if (nc == null + && (parent instanceof DynamicElementNS || parent instanceof DynamicElement)) { final String qName = child == null ? name : child.getQName(); - final Object nestedElement = - createDynamicElement(parent, - child == null ? "" : child.getNamespace(), - name, qName); + final Object nestedElement = createDynamicElement(parent, + child == null ? "" : child.getNamespace(), name, qName); if (nestedElement != null) { nc = new NestedCreator(null) { @Override diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java index ce31edee3..32b7f11b3 100644 --- a/src/main/org/apache/tools/ant/UnknownElement.java +++ b/src/main/org/apache/tools/ant/UnknownElement.java @@ -596,7 +596,7 @@ public class UnknownElement extends Task { /** * like contents equals, but ignores project * @param obj the object to check against - * @return true if this unknownelement has the same contents the other + * @return true if this UnknownElement has the same contents the other */ public boolean similar(Object obj) { if (obj == null) { diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index 3ea51a15d..25c687308 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java @@ -209,13 +209,11 @@ public class ProjectHelper2 extends ProjectHelper { } else if (source instanceof URL) { url = (URL) source; } else if (source instanceof Resource) { - FileProvider fp = - ((Resource) source).as(FileProvider.class); + FileProvider fp = ((Resource) source).as(FileProvider.class); if (fp != null) { buildFile = fp.getFile(); } else { - URLProvider up = - ((Resource) source).as(URLProvider.class); + URLProvider up = ((Resource) source).as(URLProvider.class); if (up != null) { url = up.getURL(); } @@ -766,7 +764,7 @@ public class ProjectHelper2 extends ProjectHelper { } break; default: - // TODO ignore attributes in a different NS ( maybe store them ? ) + // TODO ignore attributes in a different NS (maybe store them ?) throw new SAXParseException("Unexpected attribute \"" + attrs.getQName(i) + "\"", context.getLocator()); } diff --git a/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java b/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java index 1554ec305..e666e5774 100644 --- a/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java +++ b/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java @@ -91,7 +91,7 @@ public class ResolvePropertyMap implements GetProperty { String recursiveCallKey = name; if (prefix != null && !expandingLHS && !prefixValues) { - // only look up unprefixed properties inside the map + // only look up nonprefixed properties inside the map // if prefixValues is true or we are expanding the key // itself recursiveCallKey = prefix + name; diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index 7b89907f0..ca3251995 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -467,8 +467,8 @@ public class Ant extends Task { /** * Get the default build file name to use when launching the task. *

- * This function may be overriden by providers of custom ProjectHelper so they can implement easily their sub - * launcher. + * This function may be overridden by providers of custom ProjectHelper so they can easily + * implement their sublauncher. * * @return the name of the default file * @since Ant 1.8.0 diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 96327233e..fdadba419 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -154,7 +154,7 @@ public class Checksum extends MatchingTask implements Condition { private int readBufferSize = BUFFER_SIZE; /** - * Formater for the checksum file. + * Formatter for the checksum file. */ private MessageFormat format = FormatElement.getDefault().getFormat(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java index f97d4ee69..c9db7b9b5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Chmod.java +++ b/src/main/org/apache/tools/ant/taskdefs/Chmod.java @@ -190,7 +190,7 @@ public class Chmod extends ExecuteOn { } } } else if (isValidOs()) { - // we are chmodding the given directory + // we are chmoding the given directory Execute execute = prepareExec(); Commandline cloned = (Commandline) cmdl.clone(); cloned.createArgument().setValue(defaultSet.getDir(getProject()) diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index b58928d4e..ca4fe9153 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -214,7 +214,7 @@ public class Concat extends Task implements ResourceCollection { /** * This class reads from each of the source files in turn. - * The concatentated result can then be filtered as + * The concatenated result can then be filtered as * a single stream. */ private final class MultiReader extends Reader { @@ -623,7 +623,7 @@ public class Concat extends Task implements ResourceCollection { * Sets the behavior when no source resource files are available. If set to * false the destination file will always be created. * Defaults to true. - * @param ignoreEmpty if false honour destinationfile creation. + * @param ignoreEmpty if false, honour destination file creation. * @since Ant 1.8.0 */ public void setIgnoreEmpty(boolean ignoreEmpty) { @@ -698,7 +698,7 @@ public class Concat extends Task implements ResourceCollection { /** * This method adds text which appears in the 'concat' element. - * @param text the text to be concated. + * @param text the text to be concatenated. */ public void addText(String text) { if (textBuffer == null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Deltree.java b/src/main/org/apache/tools/ant/taskdefs/Deltree.java index 4d20e0171..ec967d0e1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Deltree.java +++ b/src/main/org/apache/tools/ant/taskdefs/Deltree.java @@ -81,18 +81,16 @@ public class Deltree extends Task { // the comparison of absolute path and canonical path // catches this - // if (dir.getCanonicalPath().equals(dir.getAbsolutePath())) { + // if (dir.getCanonicalPath().equals(dir.getAbsolutePath())) { // (costin) It will not work if /home/costin is symlink to - // /da0/home/costin ( taz for example ) + // /da0/home/costin (taz for example) for (String s : dir.list()) { File f = new File(dir, s); if (f.isDirectory()) { removeDir(f); - } else { - if (!f.delete()) { - throw new BuildException("Unable to delete file " - + f.getAbsolutePath()); - } + } else if (!f.delete()) { + throw new BuildException("Unable to delete file " + + f.getAbsolutePath()); } } if (!dir.delete()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java index b02651034..6fb946337 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -225,7 +225,7 @@ public class DependSet extends MatchingTask { datesel.setMillis(System.currentTimeMillis()); datesel.setWhen(TimeComparison.AFTER); // don't whine because a file has changed during the last - // second (or whathever our current granularity may be) + // second (or whatever our current granularity may be) datesel.setGranularity(0); logFuture(targets, datesel); diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index 077f7eb4d..b44a0118f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -93,7 +93,7 @@ public class Get extends Task { DEFAULT_AGENT_PREFIX + "/" + Main.getShortAntVersion()); - // Store headers as key/value pair without duplicate in keyz + // Store headers as key/value pair without duplicate in keys private Map headers = new LinkedHashMap<>(); /** @@ -212,7 +212,7 @@ public class Get extends Task { return true; } - //dont do any progress, unless asked + // don't do any progress, unless asked if (progress == null) { progress = new NullProgress(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index ca8a82ebf..1cf9964b6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -1450,8 +1450,8 @@ public class Javac extends MatchingTask { if (!"package-info.java".equals(f.getName())) { continue; } - final String path = FILE_UTILS.removeLeadingPath(srcDir, f). - replace(File.separatorChar, '/'); + final String path = FILE_UTILS.removeLeadingPath(srcDir, f) + .replace(File.separatorChar, '/'); final String suffix = "/package-info.java"; if (!path.endsWith(suffix)) { log("anomalous package-info.java path: " + path, Project.MSG_WARN); @@ -1643,7 +1643,7 @@ public class Javac extends MatchingTask { private static void findModules( final File root, String pattern, - final Map> collector) { + final Map> collector) { pattern = pattern .replace('/', File.separatorChar) .replace('\\', File.separatorChar); @@ -1684,16 +1684,14 @@ public class Javac extends MatchingTask { final String pathToModule, final String pathInModule, final Map> collector) { - final FileUtils fu = FileUtils.getFileUtils(); - final File f = fu.resolveFile(root, pathToModule); + final File f = FileUtils.getFileUtils().resolveFile(root, pathToModule); if (!f.isDirectory()) { return; } for (File module : f.listFiles(File::isDirectory)) { final String moduleName = module.getName(); - final File moduleSourceRoot = pathInModule == null ? - module : - new File(module, pathInModule); + final File moduleSourceRoot = pathInModule == null + ? module : new File(module, pathInModule); Collection moduleRoots = collector.computeIfAbsent(moduleName, k -> new ArrayList<>()); moduleRoots.add(moduleSourceRoot); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Parallel.java b/src/main/org/apache/tools/ant/taskdefs/Parallel.java index 0922b9f84..d6b5604de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Parallel.java +++ b/src/main/org/apache/tools/ant/taskdefs/Parallel.java @@ -58,7 +58,7 @@ public class Parallel extends Task private List tasks = new ArrayList<>(); /** - * Add a nested task to execute parallel (asynchron). + * Add a nested task to execute in parallel (asynchronously). *

* @param nestedTask Nested task to be executed in parallel. * must not be null. @@ -96,7 +96,7 @@ public class Parallel extends Task */ private boolean failOnAny; - /** The dameon task list if any */ + /** The daemon task list if any */ private TaskList daemonTasks; /** Accumulation of exceptions messages from all nested tasks */ @@ -215,8 +215,8 @@ public class Parallel extends Task */ private void updateThreadCounts() { if (numThreadsPerProcessor != 0) { - numThreads = Runtime.getRuntime().availableProcessors() * - numThreadsPerProcessor; + numThreads = Runtime.getRuntime().availableProcessors() + * numThreadsPerProcessor; } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java index 036a1bf2c..50183d6f5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java +++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java @@ -707,8 +707,8 @@ public class Redirector { /** outStreams */ private void outStreams() { if (out != null && out.length > 0) { - final String logHead = "Output " + - ((appendOut) ? "appended" : "redirected") + " to "; + final String logHead = "Output " + + ((appendOut) ? "appended" : "redirected") + " to "; outputStream = foldFiles(out, logHead, Project.MSG_VERBOSE, appendOut, createEmptyFilesOut); } @@ -729,8 +729,8 @@ public class Redirector { private void errorStreams() { if (error != null && error.length > 0) { - final String logHead = "Error " + - ((appendErr) ? "appended" : "redirected") + " to "; + final String logHead = "Error " + + ((appendErr) ? "appended" : "redirected") + " to "; errorStream = foldFiles(error, logHead, Project.MSG_VERBOSE, appendErr, createEmptyFilesErr); } else if (!(logError || outputStream == null) && errorProperty == null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java index fdfd81bf8..55cb8bce9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -613,9 +613,8 @@ public class Rmic extends MatchingTask { if (verify) { log("Verify has been turned on.", Project.MSG_VERBOSE); } - RmicAdapter adapter = - nestedAdapter != null ? nestedAdapter : - RmicAdapterFactory.getRmic(getCompiler(), this, + RmicAdapter adapter = nestedAdapter != null ? nestedAdapter + : RmicAdapterFactory.getRmic(getCompiler(), this, createCompilerClasspath()); // now we need to populate the compiler adapter @@ -727,8 +726,7 @@ public class Rmic extends MatchingTask { try { if (filtering) { FILE_UTILS.copyFile(oldFile, newFile, - new FilterSetCollection(getProject() - .getGlobalFilterSet())); + new FilterSetCollection(getProject().getGlobalFilterSet())); } else { FILE_UTILS.copyFile(oldFile, newFile); } diff --git a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java index 3213d25f1..1b59581bb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SubAnt.java +++ b/src/main/org/apache/tools/ant/taskdefs/SubAnt.java @@ -82,7 +82,7 @@ public class SubAnt extends Task { /** * Get the default build file name to use when launching the task. *

- * This function may be overriden by providers of custom ProjectHelper so + * This function may be overridden by providers of custom ProjectHelper so * they can implement easily their sub launcher. *

* diff --git a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java index 2ba5a618b..eb6853fea 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java +++ b/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java @@ -24,8 +24,8 @@ import java.io.OutputStream; import org.apache.tools.ant.Task; /** - * Redirects text written to a stream thru the standard - * ant logging mechanism. This class is useful for integrating + * Redirects text written to a stream through the standard + * Ant logging mechanism. This class is useful for integrating * with tools that write to System.out and System.err. For example, * the following will cause all text written to System.out to be * logged with "info" priority: diff --git a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java index af7372fe9..28d0d883e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/src/main/org/apache/tools/ant/taskdefs/WaitFor.java @@ -253,8 +253,8 @@ public class WaitFor extends ConditionBase { } /** - * Convert the value to a multipler (millisecond to unit). - * @return a multipler (a long value) + * Convert the value to a multiplier (millisecond to unit). + * @return a multiplier (a long value) */ public long getMultiplier() { String key = getValue().toLowerCase(Locale.ENGLISH); diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java index f4d7886c9..03e6ace14 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java +++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java @@ -212,7 +212,7 @@ public class XmlProperty extends Task { } /** - * @return the xmlCatalog as the entityresolver. + * @return the xmlCatalog as the EntityResolver. */ protected EntityResolver getEntityResolver() { return xmlCatalog; diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index bf61812fd..65bfdec9e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -2196,7 +2196,7 @@ public class Zip extends MatchingTask { * central directory - which is what as-needed may result * in. Java5 and Microsoft Visual Studio's Extension loader are * known to fconsider the archive broken in such cases. If you - * are targeting such an archiver uset the value never + * are targeting such an archiver use the value never * unless you know you need Zip64 extensions.

* * @since Ant 1.9.1 diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java index d3c87f911..1506519de 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java @@ -67,7 +67,7 @@ public class Kjc extends DefaultCompilerAdapter { cmd.createArgument().setFile(destDir); } - // generate the clsspath + // generate the classpath cmd.createArgument().setValue("-classpath"); Path cp = new Path(project); diff --git a/src/main/org/apache/tools/ant/taskdefs/email/Message.java b/src/main/org/apache/tools/ant/taskdefs/email/Message.java index 0b763e425..ec10e99a9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/email/Message.java +++ b/src/main/org/apache/tools/ant/taskdefs/email/Message.java @@ -109,15 +109,13 @@ public class Message extends ProjectComponent { * @param ps The print stream to write to * @throws IOException if an error occurs */ - public void print(PrintStream ps) - throws IOException { + public void print(PrintStream ps) throws IOException { // We need character encoding aware printing here. // So, using BufferedWriter over OutputStreamWriter instead of PrintStream BufferedWriter out = null; try { - out - = charset != null ? new BufferedWriter(new OutputStreamWriter(ps, charset)) - : new BufferedWriter(new OutputStreamWriter(ps)); + out = charset == null ? new BufferedWriter(new OutputStreamWriter(ps)) + : new BufferedWriter(new OutputStreamWriter(ps, charset)); if (messageSource != null) { // Read message from a file try (Reader freader = getReader(messageSource); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java index f61a93bd4..36b52f32c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java @@ -41,7 +41,7 @@ import org.xml.sax.XMLReader; * This task validates XML schema documents. It requires an XML parser * that handles the relevant SAX, Xerces or JAXP options. * - * To resolve remote referencies, Ant may need its proxy set up, using the + * To resolve remote references, Ant may need its proxy set up, using the * setproxy task. * * Hands off most of the work to its parent, {@link XMLValidateTask} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java index ac2f06729..ed1a92790 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java @@ -367,9 +367,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware * Sets the parameters for the transformer. */ private void setTransformationParameters() { - for (Map.Entry entry : params.entrySet()) { - transformer.setParameter(entry.getKey(), entry.getValue()); - } + params.forEach((key, value) -> transformer.setParameter(key, value)); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java index afd440d45..1ae4b71ce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java @@ -204,7 +204,7 @@ public class EjbJar extends MatchingTask { /** Instance variable that stores the suffix for the generated jarfile. */ private String genericJarSuffix = "-generic.jar"; - /** Instance variable that stores the CMP version for the jboss jarfile. */ + /** Instance variable that stores the CMP version for the JBoss jarfile. */ private String cmpVersion = CMPVersion.CMP1_0; /** The list of deployment tools we are going to run. */ @@ -236,7 +236,7 @@ public class EjbJar extends MatchingTask { } /** - * Adds a deployment tool for Weblogic server. + * Adds a deployment tool for WebLogic server. * * @return the deployment tool instance to be configured. */ @@ -247,7 +247,7 @@ public class EjbJar extends MatchingTask { } /** - * Adds a deployment tool for Websphere 4.0 server. + * Adds a deployment tool for WebSphere 4.0 server. * * @return the deployment tool instance to be configured. */ @@ -309,7 +309,7 @@ public class EjbJar extends MatchingTask { } /** - * Adds a deployment tool for Weblogic when using the Toplink + * Adds a deployment tool for WebLogic when using the TOPLink * Object-Relational mapping. * * @return the deployment tool instance to be configured. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java index 8752583f6..bd47c8bba 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java @@ -35,7 +35,7 @@ public class OrionDeploymentTool extends GenericDeploymentTool { protected static final String ORION_DD = "orion-ejb-jar.xml"; - /** Instance variable that stores the suffix for the jboss jarfile. */ + /** Instance variable that stores the suffix for the JBoss jarfile. */ private String jarSuffix = ".jar"; /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java index e8a868e2f..6698bd6e0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java @@ -45,11 +45,11 @@ import org.xml.sax.InputSource; /** The weblogic element is used to control the weblogic.ejbc compiler for - generating weblogic EJB jars. Prior to Ant 1.3, the method of locating CMP + generating WebLogic EJB jars. Prior to Ant 1.3, the method of locating CMP descriptors was to use the ejbjar naming convention. So if your ejb-jar was - called, Customer-ejb-jar.xml, your weblogic descriptor was called Customer- + called, Customer-ejb-jar.xml, your WebLogic descriptor was called Customer- weblogic-ejb-jar.xml and your CMP descriptor had to be Customer-weblogic-cmp- - rdbms-jar.xml. In addition, the <type-storage> element in the weblogic + rdbms-jar.xml. In addition, the <type-storage> element in the WebLogic descriptor had to be set to the standard name META-INF/weblogic-cmp-rdbms- jar.xml, as that is where the CMP descriptor was mapped to in the generated jar. @@ -61,23 +61,23 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { /** EJB20 id */ public static final String PUBLICID_EJB20 = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"; - /** Weblogic 5.1.0 id */ + /** WebLogic 5.1.0 id */ public static final String PUBLICID_WEBLOGIC_EJB510 = "-//BEA Systems, Inc.//DTD WebLogic 5.1.0 EJB//EN"; - /** Weblogic 6.0.0 id */ + /** WebLogic 6.0.0 id */ public static final String PUBLICID_WEBLOGIC_EJB600 = "-//BEA Systems, Inc.//DTD WebLogic 6.0.0 EJB//EN"; - /** Weblogic 7.0.0 id */ + /** WebLogic 7.0.0 id */ public static final String PUBLICID_WEBLOGIC_EJB700 = "-//BEA Systems, Inc.//DTD WebLogic 7.0.0 EJB//EN"; - /** Weblogic 5.1 dtd location */ + /** WebLogic 5.1 dtd location */ protected static final String DEFAULT_WL51_EJB11_DTD_LOCATION = "/weblogic/ejb/deployment/xml/ejb-jar.dtd"; - /** Weblogic 6.0 ejb 1.1 dtd location */ + /** WebLogic 6.0 ejb 1.1 dtd location */ protected static final String DEFAULT_WL60_EJB11_DTD_LOCATION = "/weblogic/ejb20/dd/xml/ejb11-jar.dtd"; - /** Weblogic 6.0 ejb 2.0 dtd location */ + /** WebLogic 6.0 ejb 2.0 dtd location */ protected static final String DEFAULT_WL60_EJB20_DTD_LOCATION = "/weblogic/ejb20/dd/xml/ejb20-jar.dtd"; @@ -101,13 +101,13 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { /** File utilities instance for copying jars */ private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); - /** Instance variable that stores the suffix for the weblogic jarfile. */ + /** Instance variable that stores the suffix for the WebLogic jarfile. */ private String jarSuffix = ".jar"; - /** Instance variable that stores the location of the weblogic DTD file. */ + /** Instance variable that stores the location of the WebLogic DTD file. */ private String weblogicDTD; - /** Instance variable that stores the location of the ejb 1.1 DTD file. */ + /** Instance variable that stores the location of the EJB 1.1 DTD file. */ private String ejb11DTD; /** Instance variable that determines whether generic ejb jars are kept. */ @@ -115,7 +115,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { /** * Instance variable that stores the fully qualified classname of the - * weblogic EJBC compiler + * WebLogic EJBC compiler */ private String ejbcClass = null; @@ -138,7 +138,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { /** Indicates if the old CMP location convention is to be used. */ private boolean newCMP = false; - /** The classpath to the weblogic classes. */ + /** The classpath to the WebLogic classes. */ private Path wlClasspath = null; /** System properties for the JVM. */ @@ -162,7 +162,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } /** - * Get the classpath to the weblogic classpaths. + * Get the classpath to the WebLogic classpaths. * @return the classpath to configure. */ public Path createWLClasspath() { @@ -184,9 +184,9 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { /** * Optional classpath to WL6.0. - * Weblogic 6.0 will give a warning if the home and remote interfaces + * WebLogic 6.0 will give a warning if the home and remote interfaces * of a bean are on the system classpath used to run weblogic.ejbc. - * In that case, the standard weblogic classes should be set with + * In that case, the standard WebLogic classes should be set with * this attribute (or equivalent nested element) and the * home and remote interfaces located with the standard classpath * attribute. @@ -246,7 +246,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } /** - * Setter used to store the suffix for the generated weblogic jar file. + * Setter used to store the suffix for the generated WebLogic jar file. * * @param inString the string to use as the suffix. */ @@ -265,7 +265,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } /** - * Controls whether weblogic will keep the generated Java + * Controls whether WebLogic will keep the generated Java * files used to build the class files added to the * jar. This can be useful when debugging; default is false. * @@ -285,7 +285,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } /** - * Set any additional arguments to pass to the weblogic JVM; optional. + * Set any additional arguments to pass to the WebLogic JVM; optional. * @param args the arguments to be passed to the JVM */ public void setJvmargs(String args) { @@ -296,7 +296,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { * Set the classname of the ejbc compiler; optional * Normally ejbjar determines * the appropriate class based on the DTD used for the EJB. The EJB 2.0 compiler - * featured in weblogic 6 has, however, been deprecated in version 7. When + * featured in WebLogic 6 has, however, been deprecated in version 7. When * using with version 7 this attribute should be set to * "weblogic.ejbc" to avoid the deprecation warning. * @param ejbcClass the name of the class to use. @@ -315,7 +315,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { /** * Deprecated. Defines the location of the ejb-jar DTD in - * the weblogic class hierarchy. Should not be needed, and the + * the WebLogic class hierarchy. Should not be needed, and the * nested <dtd> element is recommended when it is. * * @param inString the string to use as the DTD location. @@ -325,8 +325,8 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } /** - * Deprecated. Defines the location of weblogic DTD in - * the weblogic class hierarchy. Should not be needed, and the + * Deprecated. Defines the location of WebLogic DTD in + * the WebLogic class hierarchy. Should not be needed, and the * nested <dtd> element is recommended when it is. * * @param inString the string to use as the DTD location. @@ -337,7 +337,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { /** * Deprecated. Defines the location of Sun's EJB DTD in - * the weblogic class hierarchy. Should not be needed, and the + * the WebLogic class hierarchy. Should not be needed, and the * nested <dtd> element is recommended when it is. * * @param inString the string to use as the DTD location. @@ -360,10 +360,10 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { * CMP descriptors will be used; optional, default false. *

* The old CMP scheme locates the - * weblogic CMP descriptor based on the naming convention where the - * weblogic CMP file is expected to be named with the bean name as the + * WebLogic CMP descriptor based on the naming convention where the + * WebLogic CMP file is expected to be named with the bean name as the * prefix. Under this scheme the name of the CMP descriptor does not match - * the name actually used in the main weblogic EJB descriptor. Also, + * the name actually used in the main WebLogic EJB descriptor. Also, * descriptors which contain multiple CMP references could not be used. * @param newCMP a boolean value. */ @@ -394,7 +394,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } /** - * Get the weblogic descriptor handler. + * Get the WebLogic descriptor handler. * @param srcDir the source directory. * @return the descriptor. */ @@ -452,14 +452,14 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { log("The old method for locating CMP files has been DEPRECATED.", Project.MSG_VERBOSE); log("Please adjust your weblogic descriptor and set newCMP=\"true\" to use the new CMP descriptor inclusion mechanism. ", Project.MSG_VERBOSE); - // The the weblogic cmp deployment descriptor + // The the WebLogic CMP deployment descriptor File weblogicCMPDD = new File(getConfig().descriptorDir, ddPrefix + WL_CMP_DD); if (weblogicCMPDD.exists()) { ejbFiles.put(META_DIR + WL_CMP_DD, weblogicCMPDD); } } else { - // now that we have the weblogic descriptor, we parse the file + // now that we have the WebLogic descriptor, we parse the file // to find other descriptors needed to deploy the bean. // this could be the weblogic-cmp-rdbms.xml or any other O/R // mapping tool descriptors. @@ -641,27 +641,27 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { } /** - * Helper method to check to see if a weblogic EBJ1.1 jar needs to be + * Helper method to check to see if a WebLogic EJB 1.1 jar needs to be * rebuilt using ejbc. Called from writeJar it sees if the "Bean" classes * are the only thing that needs to be updated and either updates the Jar - * with the Bean classfile or returns true, saying that the whole weblogic - * jar needs to be regened with ejbc. This allows faster build times for + * with the Bean classfile or returns true, saying that the whole WebLogic + * jar needs to be regenerated with ejbc. This allows faster build times for * working developers.

* - * The way weblogic ejbc works is it creates wrappers for the publicly + * The way WebLogic ejbc works is it creates wrappers for the publicly * defined methods as they are exposed in the remote interface. If the * actual bean changes without changing the the method signatures then * only the bean classfile needs to be updated and the rest of the - * weblogic jar file can remain the same. If the Interfaces, ie. the + * WebLogic jar file can remain the same. If the Interfaces, ie. the * method signatures change or if the xml deployment descriptors changed, * the whole jar needs to be rebuilt with ejbc. This is not strictly true * for the xml files. If the JNDI name changes then the jar doesn't have to * be rebuild, but if the resources references change then it does. At - * this point the weblogic jar gets rebuilt if the xml files change at + * this point the WebLogic jar gets rebuilt if the xml files change at * all. * * @param genericJarFile java.io.File The generic jar file. - * @param weblogicJarFile java.io.File The weblogic jar file to check to + * @param weblogicJarFile java.io.File The WebLogic jar file to check to * see if it needs to be rebuilt. * @return true if the jar needs to be rebuilt. */ @@ -678,7 +678,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { try { log("Checking if weblogic Jar needs to be rebuilt for jar " + weblogicJarFile.getName(), Project.MSG_VERBOSE); - // Only go forward if the generic and the weblogic file both exist + // Only go forward if the generic and the WebLogic file both exist if (genericJarFile.exists() && genericJarFile.isFile() && weblogicJarFile.exists() && weblogicJarFile.isFile()) { //open jar files @@ -694,13 +694,13 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { JarEntry je = e.nextElement(); genericEntries.put(je.getName().replace('\\', '/'), je); } - //get the list of weblogic jar entries + // get the list of WebLogic jar entries for (Enumeration e = wlJar.entries(); e.hasMoreElements();) { JarEntry je = e.nextElement(); wlEntries.put(je.getName(), je); } - //Cycle Through generic and make sure its in weblogic + // Cycle through generic and make sure its in WebLogic genericLoader = getClassLoaderFromJar(genericJarFile); for (Enumeration e = genericEntries.keys(); e.hasMoreElements();) { @@ -765,7 +765,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { newJarStream = new JarOutputStream(Files.newOutputStream(newWLJarFile.toPath())); newJarStream.setLevel(0); - //Copy files from old weblogic jar + // Copy files from old WebLogic jar for (Enumeration e = wlEntries.elements(); e.hasMoreElements();) { JarEntry je = e.nextElement(); @@ -785,7 +785,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool { je = replaceEntries.get(je.getName()); is = genericJar.getInputStream(je); } else { - //use fle from original weblogic jar + //use file from original WebLogic jar is = wlJar.getInputStream(je); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java index 15edf4687..8a7a8b413 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java @@ -25,7 +25,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; /** - * Deployment tool for Weblogic TOPLink. + * Deployment tool for WebLogic TOPLink. */ public class WeblogicTOPLinkDeploymentTool extends WeblogicDeploymentTool { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java index 3094b0de8..3caea0680 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java @@ -37,9 +37,9 @@ import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; /** - * Websphere deployment tool that augments the ejbjar task. - * Searches for the websphere specific deployment descriptors and - * adds them to the final ejb jar file. Websphere has two specific descriptors for session + * WebSphere deployment tool that augments the ejbjar task. + * Searches for the WebSphere specific deployment descriptors and + * adds them to the final ejb jar file. WebSphere has two specific descriptors for session * beans: *

* diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index 4d34acc28..9a585bb3c 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -37,8 +37,8 @@ import org.apache.tools.ant.types.selectors.DateSelector; import org.apache.tools.ant.types.selectors.DependSelector; import org.apache.tools.ant.types.selectors.DepthSelector; import org.apache.tools.ant.types.selectors.DifferentSelector; -import org.apache.tools.ant.types.selectors.ExtendSelector; import org.apache.tools.ant.types.selectors.ExecutableSelector; +import org.apache.tools.ant.types.selectors.ExtendSelector; import org.apache.tools.ant.types.selectors.FileSelector; import org.apache.tools.ant.types.selectors.FilenameSelector; import org.apache.tools.ant.types.selectors.MajoritySelector; diff --git a/src/main/org/apache/tools/ant/types/ArchiveScanner.java b/src/main/org/apache/tools/ant/types/ArchiveScanner.java index f563d4cbe..8593bd374 100644 --- a/src/main/org/apache/tools/ant/types/ArchiveScanner.java +++ b/src/main/org/apache/tools/ant/types/ArchiveScanner.java @@ -257,8 +257,8 @@ public abstract class ArchiveScanner extends DirectoryScanner { public boolean match(String path) { String vpath = path; if (!path.isEmpty()) { - vpath = path.replace('/', File.separatorChar). - replace('\\', File.separatorChar); + vpath = path.replace('/', File.separatorChar) + .replace('\\', File.separatorChar); if (vpath.charAt(0) == File.separatorChar) { vpath = vpath.substring(1); } diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java index 7cace386f..fd6588000 100644 --- a/src/main/org/apache/tools/ant/types/CommandlineJava.java +++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java @@ -536,7 +536,7 @@ public class CommandlineJava implements Cloneable { } // this is the classname to run as well as its arguments. // in case of ExecutableType.JAR, the executable is a jar file, - // in case of ExecutableType.MODULE, the executable is a module name, portentially including a class name. + // in case of ExecutableType.MODULE, the executable is a module name, potentially including a class name. javaCommand.addCommandToList(listIterator); } @@ -602,7 +602,7 @@ public class CommandlineJava implements Cloneable { * @return the total number of arguments in the java command line. * @see #getCommandline() * @deprecated since 1.7. - * Please dont use this, it effectively creates the + * Please don't use this, it effectively creates the * entire command. */ @Deprecated diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java index dbb3bc2f4..8a833c87f 100644 --- a/src/main/org/apache/tools/ant/types/PatternSet.java +++ b/src/main/org/apache/tools/ant/types/PatternSet.java @@ -47,7 +47,7 @@ public class PatternSet extends DataType implements Cloneable { /** * inner class to hold a name on list. "If" and "Unless" attributes * may be used to invalidate the entry based on the existence of a - * property (typically set thru the use of the Available task) + * property (typically set through the use of the Available task) * or value of an expression. */ public class NameEntry { diff --git a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java index b470403c4..5d86ecb23 100644 --- a/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java +++ b/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java @@ -67,7 +67,7 @@ public class LazyResourceCollectionWrapper extends /** * Specify if the resource should be filtered or not. This function should - * be overriden in order to define the filtering algorithm + * be overridden in order to define the filtering algorithm * * @param r resource considered for filtration * @return whether the resource should be filtered or not diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java index 4974c2053..7436fc64e 100644 --- a/src/main/org/apache/tools/ant/util/DateUtils.java +++ b/src/main/org/apache/tools/ant/util/DateUtils.java @@ -32,7 +32,7 @@ import java.util.regex.Pattern; /** * Helper methods to deal with date/time formatting with a specific * defined format (ISO8601) - * or a plurialization correct elapsed time in minutes and seconds. + * or a correct pluralization of elapsed time in minutes and seconds. * * @since Ant 1.5 * diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java index cc2242c4a..864db5e5b 100644 --- a/src/main/org/apache/tools/ant/util/FileUtils.java +++ b/src/main/org/apache/tools/ant/util/FileUtils.java @@ -858,8 +858,8 @@ public class FileUtils { if (dirEnd == -1 || dirEnd < index) { file = path.substring(index); } else { - directory = new StringBuilder(path.substring(index, dirEnd). - replace(File.separatorChar, '.')); + directory = new StringBuilder(path.substring(index, dirEnd) + .replace(File.separatorChar, '.')); index = dirEnd + 1; if (path.length() > index) { file = path.substring(index); diff --git a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java index 2ace4d4b3..ebbe40d72 100644 --- a/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java +++ b/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java @@ -338,7 +338,7 @@ public class LayoutPreservingProperties extends Properties { s = "\n" + s; } else { // could be a comment, if first non-whitespace is a # or ! - comment = s.matches("^([ \t\f])*([#!]).*"); + comment = s.matches("^[ \t\f]*[#!].*"); } // continuation if not a comment and the line ends is an diff --git a/src/main/org/apache/tools/ant/util/LoaderUtils.java b/src/main/org/apache/tools/ant/util/LoaderUtils.java index 799feb58f..4928f1b19 100644 --- a/src/main/org/apache/tools/ant/util/LoaderUtils.java +++ b/src/main/org/apache/tools/ant/util/LoaderUtils.java @@ -130,7 +130,7 @@ public class LoaderUtils { * Check if a classloader has a classname resource. * @param loader the classloader to look it. * @param className the name of the class to look for. - * @return true if the classexists, false otherwise + * @return true if the class exists, false otherwise * @since Ant 1.7.0. */ public static boolean classExists(ClassLoader loader, String className) { diff --git a/src/main/org/apache/tools/ant/util/ReflectUtil.java b/src/main/org/apache/tools/ant/util/ReflectUtil.java index 8392f713e..a1a0b04e8 100644 --- a/src/main/org/apache/tools/ant/util/ReflectUtil.java +++ b/src/main/org/apache/tools/ant/util/ReflectUtil.java @@ -168,7 +168,7 @@ public class ReflectUtil { /** * A method to convert an invocationTargetException to - * a buildexception and throw it. + * a BuildException and throw it. * @param t the invocation target exception. * @throws BuildException the converted exception. */ @@ -179,7 +179,7 @@ public class ReflectUtil { /** * A method to convert an invocationTargetException to - * a buildexception. + * a BuildException. * @param t the invocation target exception. * @return the converted exception. * @since ant 1.7.1 diff --git a/src/main/org/apache/tools/ant/util/UUEncoder.java b/src/main/org/apache/tools/ant/util/UUEncoder.java index 852e9a1d3..f37cac4d3 100644 --- a/src/main/org/apache/tools/ant/util/UUEncoder.java +++ b/src/main/org/apache/tools/ant/util/UUEncoder.java @@ -23,7 +23,7 @@ import java.io.OutputStream; import java.io.PrintStream; /** - * UUEncoding of an input stream placed into an outputstream. + * UUEncoding of an input stream placed into an OutputStream. * This class is meant to be a drop in replacement for * sun.misc.UUEncoder, which was previously used by Ant. * The uuencode algorithm code has been copied from the diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java index d39d705b3..f019da87a 100644 --- a/src/main/org/apache/tools/bzip2/BlockSort.java +++ b/src/main/org/apache/tools/bzip2/BlockSort.java @@ -52,7 +52,7 @@ import java.util.BitSet; * ssCommons Compre * * - *

Which results in a new text "ss romooCCmmpnse", in adition the + *

Which results in a new text "ss romooCCmmpnse", in addition the * index of the first line that contained the original text is kept - * in this case it is 1. The idea is that in a long English text all * permutations that start with "he" are likely suffixes of a "the" and diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index a863f38c4..dad50a9fa 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -255,7 +255,7 @@ public class MailMessage { /** * Sets the named header to the given value. RFC 822 provides the rules for - * what text may constitute a header name and value. + * what text may constitue a header name and value. * @param name name of the header * @param value contents of the header */ diff --git a/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java b/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java index a399fb2a9..f75c2d80c 100644 --- a/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java +++ b/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java @@ -26,19 +26,19 @@ import java.util.Collections; import java.util.List; /** - * This ZipEncoding implementation implements a simple 8bit character - * set, which mets the following restrictions: + * This ZipEncoding implementation implements a simple 8 bit character + * set, which meets the following restrictions: * *

* *

These restrictions most notably apply to the most prominent - * omissions of java-1.4's {@link java.nio.charset.Charset Charset} + * omissions of Java 1.4 {@link java.nio.charset.Charset Charset} * implementation, Cp437 and Cp850.

* *

The methods of this class are reentrant.

diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java index 941d0aebc..6dd69bf84 100644 --- a/src/main/org/apache/tools/zip/ZipFile.java +++ b/src/main/org/apache/tools/zip/ZipFile.java @@ -472,7 +472,7 @@ public class ZipFile implements Closeable { } /** - * Reads an individual entry of the central directory, creats an + * Reads an individual entry of the central directory, creates an * ZipEntry from it and adds it to the global maps. * * @param noUTF8Flag map used to collect entries that don't have @@ -778,7 +778,7 @@ public class ZipFile implements Closeable { /** * Searches the archive backwards from minDistance to maxDistance - * for the given signature, positions the RandomaccessFile right + * for the given signature, positions the RandomAccessFile right * at the signature if it has been found. */ private boolean tryToLocateSignature(final long minDistanceFromEnd,