diff --git a/WHATSNEW b/WHATSNEW index 32932e822..5894c07c7 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -1416,7 +1416,7 @@ Fixed bugs: have full control. Bugzilla Report 34638. - * would fail if the executed statment didn't return a result + * would fail if the executed statement didn't return a result set with some JDBC driver that dissalow Statement.getResultSet to be called in such a situation. Bugzilla Report 36265 @@ -2582,7 +2582,7 @@ Fixed bugs: * OOM caused by IH holding on to classes and thus their classloaders. Bugzilla 28283 and 33061. -* doesnt delete when defaultexcludes="false" and no includes is set +* doesn't delete when defaultexcludes="false" and no includes is set fixed. Bugzilla 40313. * Behavior change of DirectoryScanner/AbstractFileset when conditional include @@ -2868,7 +2868,7 @@ Other changes: distribution. Bugzilla 40980. * Roll back automatic proxy enabling on Java 1.5. It broke things like - Oracle JDBC drivers, and Ant itself on IBM's JVM on AIX, and didnt + Oracle JDBC drivers, and Ant itself on IBM's JVM on AIX, and didn't seem to work to well the rest of the time. To enable the feature, use the -autoproxy command line option. @@ -4338,7 +4338,7 @@ Other changes: * now supports a new nested element which is the same as but point to compiled classes (the - prefered mode of operation for JDepend > 2.5). Additionally, nested + preferred mode of operation for JDepend > 2.5). Additionally, nested elements can be used to exclude certain packages from being parsed. Bugzilla Report 17134. diff --git a/manual/Tasks/ear.html b/manual/Tasks/ear.html index 5ee8206c9..de4a96260 100644 --- a/manual/Tasks/ear.html +++ b/manual/Tasks/ear.html @@ -258,7 +258,7 @@ to a value other than its default, "add".

flattenAttributes - Whether to merge attributes occuring more than + Whether to merge attributes occurring more than once in a section (this can only happen for the Class-Path attribute) into a single attribute. Since Ant 1.8.0. diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html index 2315aca48..6c1d4e651 100644 --- a/manual/Tasks/javac.html +++ b/manual/Tasks/javac.html @@ -428,11 +428,11 @@ invoking the compiler.

The default value of this is "true" and this means that previously compiled classes are on the classpath for the compiler. This means that "greedy" compilers - will not recompile dependant classes that are already compiled. + will not recompile dependent classes that are already compiled. In general this is a good thing as it stops the compiler for doing unnecessary work. However, for some edge cases, involving generics, the javac compiler - needs to compile the dependant classes to get the generics + needs to compile the dependent classes to get the generics information. One example is documented in the bug report: Bug 40776 - a problem compiling a Java 5 project with generics. diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html index 2a328eb22..76df9ced6 100644 --- a/manual/Tasks/junit.html +++ b/manual/Tasks/junit.html @@ -657,7 +657,7 @@ supported.

  • It runs in the same Java VM as Ant itself, this is a different Java VM than the one that was executing the test and it may see a - different classloader (and thus may be unable to load the tast + different classloader (and thus may be unable to load the test class).
  • It cannot determine which test was run when the timeout/crash occurred if the forked VM was running multiple test. I.e. the diff --git a/manual/Types/propertyset.html b/manual/Types/propertyset.html index 94fcf44e8..81d491e0b 100644 --- a/manual/Types/propertyset.html +++ b/manual/Types/propertyset.html @@ -38,7 +38,7 @@ supports this.

    dynamic - Whether to reevaluate the set everytime the set + Whether to reevaluate the set every time the set is used. Default is "true". No diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html index 0c75d4ac9..560b416c7 100644 --- a/manual/Types/selectors.html +++ b/manual/Types/selectors.html @@ -828,9 +828,9 @@
  • seldirs : same as attribute seldirs
  • algorithm.* : Value is transferred to the algorithm via its setXX-methods
    • -
  • cache.* : Value is transfered to the cache via its +
  • cache.* : Value is transferred to the cache via its setXX-methods
    • -
  • comparator.* : Value is transfered to the comparator via its +
  • comparator.* : Value is transferred to the comparator via its setXX-methods
@@ -1248,7 +1248,7 @@ Select files whose filename length is even.

Selects all the JAR file larger than 4096 bytes which haven't been update - since the last millenium. + since the last millennium.

diff --git a/manual/argumentprocessor.html b/manual/argumentprocessor.html index 22160ccb5..2cd5202f0 100644 --- a/manual/argumentprocessor.html +++ b/manual/argumentprocessor.html @@ -37,7 +37,7 @@ Ant behaviour.

An ArgumentProcessor is called each time Ant parse an unknown argument, an ArgumentProcessor doesn't take precedence over Ant to -parse already suported options. It is then recommended to thrid party +parse already suported options. It is then recommended to third party ArgumentProcessor implementation to chose specific 'enough' argument name, avoiding for instance one letter arguments.

@@ -47,7 +47,7 @@ It is also called at the different phases so different behaviour can be implemented. It is called just after every arguments are parsed, just before the project is being configured (the build file being parsed), and just after. Some of the methods to be implemented return a boolean: -if true is returned, Ant will terminate immediatly, without +if true is returned, Ant will terminate immediately, without error.

diff --git a/src/main/org/apache/tools/ant/DemuxOutputStream.java b/src/main/org/apache/tools/ant/DemuxOutputStream.java index cd5a7e9d6..bd3991321 100644 --- a/src/main/org/apache/tools/ant/DemuxOutputStream.java +++ b/src/main/org/apache/tools/ant/DemuxOutputStream.java @@ -54,7 +54,7 @@ public class DemuxOutputStream extends OutputStream { private static final int MAX_SIZE = 1024; /** Initial buffer size. */ - private static final int INTIAL_SIZE = 132; + private static final int INITIAL_SIZE = 132; /** Carriage return */ private static final int CR = 0x0d; @@ -100,7 +100,7 @@ public class DemuxOutputStream extends OutputStream { BufferInfo bufferInfo = (BufferInfo) buffers.get(current); if (bufferInfo == null) { bufferInfo = new BufferInfo(); - bufferInfo.buffer = new ByteArrayOutputStream(INTIAL_SIZE); + bufferInfo.buffer = new ByteArrayOutputStream(INITIAL_SIZE); bufferInfo.crSeen = false; buffers.put(current, bufferInfo); } diff --git a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java index 055720072..8a37924c7 100644 --- a/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java +++ b/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java @@ -343,7 +343,7 @@ public final class FixCrLfFilter extends BaseParamFilterReader implements Chaina /** * Indicate whether this stream contains Java source. * - * This attribute is only used in assocation with the "tab" + * This attribute is only used in association with the "tab" * attribute. * * @param javafiles diff --git a/src/main/org/apache/tools/ant/filters/SortFilter.java b/src/main/org/apache/tools/ant/filters/SortFilter.java index 62bf3c6c8..471660c3b 100644 --- a/src/main/org/apache/tools/ant/filters/SortFilter.java +++ b/src/main/org/apache/tools/ant/filters/SortFilter.java @@ -353,7 +353,7 @@ public final class SortFilter extends BaseParamFilterReader } /** - * Sorts the read lines (lines)acording to the sorting + * Sorts the read lines (lines) according to the sorting * criteria defined by the user. * */ diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index 15fca4081..06596fa3b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -617,7 +617,7 @@ public class Execute { for (int i = 0; i < env.length; i++) { String keyValue = env[i]; String key = keyValue.substring(0, keyValue.indexOf('=')); - // Find the key in the current enviroment copy + // Find the key in the current environment copy // and remove it. // Try without changing case first diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java index b38e1c690..63f68c5a8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java @@ -695,7 +695,7 @@ public class MacroDef extends AntlibDefinition { * runtime info. * * @param obj an Object value - * @param same if true test for sameness, otherwise just similiar + * @param same if true test for sameness, otherwise just similar * @return a boolean value */ private boolean sameOrSimilar(Object obj, boolean same) { diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java index 2d5958091..9b600db55 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java @@ -136,7 +136,7 @@ public class ManifestTask extends Task { } /** - * Checks the attribute agains the Jar-specification. + * Checks the attribute against the Jar-specification. * * Jar-Specification "Name-Value pairs and Sections": 
      *   name:       alphanum *headerchar
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index 981663ef7..9aa9fe8e6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -482,7 +482,7 @@ public class Replace extends MatchingTask {
 
     /**
      * Do the execution.
-     * @throws BuildException if we cant build
+     * @throws BuildException if we can't build
      */
     public void execute() throws BuildException {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
index f971001fa..fc31b1d3d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java
@@ -395,7 +395,7 @@ public class SignJar extends AbstractJarSignerTask {
             throw new BuildException(ERROR_SIGNEDJAR_AND_PATHS);
         }
 
-        //this isnt strictly needed, but by being fussy now,
+        //this isn't strictly needed, but by being fussy now,
         //we can change implementation details later
         if (!hasDestDir && hasMapper) {
             throw new BuildException(ERROR_MAPPER_WITHOUT_DEST);
@@ -569,7 +569,7 @@ public class SignJar extends AbstractJarSignerTask {
     /**
      * 
Compare a jar file with its corresponding signed jar. The logic for this
      * is complex, and best explained in the source itself. Essentially if
-     * either file doesnt exist, or the destfile has an out of date timestamp,
+     * either file doesn't exist, or the destfile has an out of date timestamp,
      * then the return value is false.

      *
      * 
If we are signing ourself, the check {@link #isSigned(File)} is used to
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index 9d10f2c0c..4fe31260b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -1131,7 +1131,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
      * 
      * 
The parameter will be then passed to the XSLT template.

      *
-     * 
Default type (if omited) is primitive String. So if the expression is e.g
+     * 
Default type (if omitted) is primitive String. So if the expression is e.g
      * "true" with no type, in XSLT it will be only a text string, not true
      * boolean.

      *
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
index b1f9fca6f..974c396fb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
@@ -266,7 +266,7 @@ public class Os implements Condition {
                             || OS_NAME.indexOf("98") >= 0
                             || OS_NAME.indexOf("me") >= 0
                             //wince isn't really 9x, but crippled enough to
-                            //be a muchness. Ant doesnt run on CE, anyway.
+                            //be a muchness. Ant doesn't run on CE, anyway.
                             || OS_NAME.indexOf("ce") >= 0);
                     isNT = !is9x;
                 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
index 838f122a0..162cab1a4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
@@ -709,7 +709,7 @@ public class PropertyFile extends Task {
 
         /**
          * Convert the value to a Calendar field index.
-         * @return the calander value.
+         * @return the calendar value.
          */
         public int getCalendarField() {
             String key = getValue().toLowerCase();
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 cf66e913e..8d9a44a65 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -609,7 +609,7 @@ public class TraXLiaison implements XSLTLiaison4, ErrorListener, XSLTLoggerAware
 
     /**
      * Specific configuration for the TRaX liaison.
-     * @param xsltTask the XSLTProcess task instance from which this liasion
+     * @param xsltTask the XSLTProcess task instance from which this liaison
      *        is to be configured.
      */
     public void configure(final XSLTProcess xsltTask) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
index 28b6b5a2d..e9fed0dfd 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
@@ -98,7 +98,7 @@ public class XMLValidateTask extends Task {
     private final Vector propertyList = new Vector();
 
     private XMLCatalog xmlCatalog = new XMLCatalog();
-    /** Message for successfull validation */
+    /** Message for successful validation */
     public static final String MESSAGE_FILES_VALIDATED
         = " file(s) have been successfully validated.";
 
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 62dd64005..550f59ce0 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
@@ -698,7 +698,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
      * 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 doesnt have to
+     * 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
      * all.
@@ -794,7 +794,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
                             }
                         }
                     } else {
-                        // a file doesnt exist rebuild
+                        // a file doesn't exist rebuild
 
                         log("File " + filepath + " not present in weblogic jar",
                             Project.MSG_VERBOSE);
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 232a1fb23..d15f9f523 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
@@ -666,7 +666,7 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
      * websphere 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 ejbdeploy. This is not strictly
-     * true for the xml files. If the JNDI name changes then the jar doesnt
+     * 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 websphere jar gets rebuilt if the xml files
      * change at all.
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
index 40cc50b92..c13194fa9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
@@ -202,7 +202,7 @@ public class JarLibResolveTask extends Task {
 
     /**
      * Check if specified file satisfies extension.
-     * If it does then set the relevent property
+     * If it does then set the relevant property
      * else throw a BuildException.
      *
      * @param file the candidate library
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
index 591fda7d0..b21719e58 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
@@ -21,7 +21,7 @@ import org.apache.tools.ant.types.FileSet;
 
 /**
  * LibFileSet represents a fileset containing libraries.
- * Asociated with the libraries is data pertaining to
+ * Associated with the libraries is data pertaining to
  * how they are to be handled when building manifests.
  *
  */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index 5cca45c00..82731fe9e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -575,7 +575,7 @@ public class Translate extends MatchingTask {
 
                     // we found a starttoken, is there an endtoken following?
                     // start at token+tokenlength because start and end
-                    // token may be indentical
+                    // token may be identical
                     int endIndex = line.indexOf(endToken, startIndex
                                                 + startToken.length());
                     if (endIndex < 0) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
index 6aaae5c25..6e08e7d5e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
@@ -144,7 +144,7 @@ public class JspNameMangler implements JspMangler {
     /**
      * taking in the substring representing the path relative to the source dir
      * return a new string representing the destination path
-     * not supported, as jasper in tomcat4.0 doesnt either
+     * not supported, as jasper in tomcat4.0 doesn't either
      * @param path not used
      * @return null always.
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
index 34897d5bf..16b67f9d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.java
@@ -25,7 +25,7 @@ import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
  * The interface that all jsp compiler adapters must adher to.
  *
  * 
A compiler adapter is an adapter that interprets the jspc's
- * parameters in preperation to be passed off to the compiler this
+ * parameters in preparation to be passed off to the compiler this
  * adapter represents.  As all the necessary values are stored in the
  * Jspc task itself, the only thing all adapters need is the jsp
  * task, the execute command and a parameterless constructor (for
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
index 63451e7e2..3046b75aa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
@@ -279,7 +279,7 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm
         writer.newLine();
         writer.write("public class ");
         writer.write(className);
-        // If this class does not extend TC, Ant doesnt run these
+        // If this class does not extend TC, Ant doesn't run these
         writer.write(" extends TestCase {");
         writer.newLine();
         // standard String-constructor
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 44f50b0d4..cef9dda0f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -941,7 +941,7 @@ public class FTP extends Task implements FTPTaskConfig {
                 return relativePath;
             }
             /**
-             * get thge relative path of this file
+             * get the relative path of this file
              * @param currentPath          base path
              * @param currentRelativePath  relative path of the base path with regards to remote dir
              * @return relative path
@@ -1970,7 +1970,7 @@ public class FTP extends Task implements FTPTaskConfig {
                 ftp.deleteFile(ftpFiles[0].getName());
             }
             // delegate the deletion of the local temp file to the delete task
-            // because of race conditions occuring on Windows
+            // because of race conditions occurring on Windows
             Delete mydelete = new Delete();
             mydelete.bindToOwner(this);
             mydelete.setFile(tempFile.getCanonicalFile());
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index 1115f67ef..a4f241301 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -844,7 +844,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
                 return relativePath;
             }
             /**
-             * get thge relative path of this file
+             * get the relative path of this file
              * @param currentPath          base path
              * @param currentRelativePath  relative path of the base path with regards to remote dir
              * @return relative path
@@ -1359,7 +1359,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
                 ftp.deleteFile(ftpFiles[0].getName());
             }
             // delegate the deletion of the local temp file to the delete task
-            // because of race conditions occuring on Windows
+            // because of race conditions occurring on Windows
             Delete mydelete = new Delete();
             mydelete.bindToOwner(task);
             mydelete.setFile(tempFile.getCanonicalFile());
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 9bdae6a3f..dd6016a8c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
@@ -51,7 +51,7 @@ import org.apache.tools.ant.util.FileUtils;
  * of PVCS (get and pcli) and must have access to the repository. Note that the way to specify
  * the repository is platform dependent so use property to specify location of repository.
  * 

- * This version has been tested agains PVCS version 6.5 and 6.6 under Windows and Solaris.
+ * This version has been tested against PVCS version 6.5 and 6.6 under Windows and Solaris.
 
  *
  * 19-04-2001 
The task now has a more robust
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
index 3f090644c..7988bc60b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
@@ -198,7 +198,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
      */
     public void buildFinished(BuildEvent event) {
         if (event.getException() == null && fileSuccess != null) {
-            // build successfull!
+            // build successful!
             play(event.getProject(), fileSuccess, loopsSuccess, durationSuccess);
         } else if (event.getException() != null && fileFail != null) {
             play(event.getProject(), fileFail, loopsFail, durationFail);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 66c9b811c..7a09f68ac 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -82,7 +82,7 @@ public class Scp extends SSHBase {
     }
 
     /**
-     * Similiar to {@link #setFile setFile} but explicitly states that
+     * Similar to {@link #setFile setFile} but explicitly states that
      * the file is a local file.  This is the only way to specify a
      * local file with a @ character.
      * @param aFromUri a string representing the source of the copy.
@@ -94,7 +94,7 @@ public class Scp extends SSHBase {
     }
 
     /**
-     * Similiar to {@link #setFile setFile} but explicitly states that
+     * Similar to {@link #setFile setFile} but explicitly states that
      * the file is a remote file.
      * @param aFromUri a string representing the source of the copy.
      * @since Ant 1.6.2
@@ -106,7 +106,7 @@ public class Scp extends SSHBase {
      }
 
     /**
-     * Similiar to {@link #setTodir setTodir} but explicitly states
+     * Similar to {@link #setTodir setTodir} but explicitly states
      * that the directory is a local.  This is the only way to specify
      * a local directory with a @ character.
      * @param aToUri a string representing the target of the copy.
@@ -127,7 +127,7 @@ public class Scp extends SSHBase {
     }
 
     /**
-     * Similiar to {@link #setTodir setTodir} but explicitly states
+     * Similar to {@link #setTodir setTodir} but explicitly states
      * that the directory is a remote.
      * @param aToUri a string representing the target of the copy.
      * @since Ant 1.6.2
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
index 851f3d5a5..2cabe2faa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
@@ -27,7 +27,7 @@ import org.apache.tools.ant.util.FileNameMapper;
  * The interface that all rmic adapters must adhere to.
  *
  * 
A rmic adapter is an adapter that interprets the rmic's
- * parameters in preperation to be passed off to the compiler this
+ * parameters in preparation to be passed off to the compiler this
  * adapter represents.  As all the necessary values are stored in the
  * Rmic task itself, the only thing all adapters need is the rmic
  * task, the execute command and a parameterless constructor (for
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
index a5b9ad61b..559c76985 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
@@ -21,7 +21,7 @@ import org.apache.tools.ant.types.Commandline;
 
 /**
  * Run rmic in a new process with -Xnew set.
- * This switches rmic to use a new compiler, one that doesnt work in-process
+ * This switches rmic to use a new compiler, one that doesn't work in-process
  * on ant on java1.6.
  * see: 
  * http://issues.apache.org/bugzilla/show_bug.cgi?id=38732
diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java
index b37602c9d..f59920445 100644
--- a/src/main/org/apache/tools/ant/types/PropertySet.java
+++ b/src/main/org/apache/tools/ant/types/PropertySet.java
@@ -224,7 +224,7 @@ public class PropertySet extends DataType implements ResourceCollection {
     }
 
     /**
-     * Set whether to reevaluate the set everytime the set is used.
+     * Set whether to reevaluate the set every time the set is used.
      * Default is true.
      *
      * @param dynamic if true, reevaluate the property set each time
diff --git a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
index 82884deaf..dbe7ec81c 100644
--- a/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
+++ b/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
@@ -161,7 +161,7 @@ public class TokenizedPattern {
      */
     public TokenizedPattern withoutLastToken() {
         if (tokenizedPattern.length == 0) {
-            throw new IllegalStateException("cant strip a token from nothing");
+            throw new IllegalStateException("can't strip a token from nothing");
         } else if (tokenizedPattern.length == 1) {
             return EMPTY_PATTERN;
         } else {
diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java b/src/main/org/apache/tools/ant/util/DateUtils.java
index 1ed95ecbf..9ce737b0a 100644
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -181,7 +181,7 @@ public final class DateUtils {
      * + 11/22 for rounding
      *
* - * @param cal the calander. + * @param cal the calendar. * * @return The phase of the moon as a number between 0 and 7 with * 0 meaning new moon and 4 meaning full moon. diff --git a/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java b/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java index 1d081bf42..073a89f1e 100644 --- a/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java +++ b/src/main/org/apache/tools/ant/util/LineOrientedOutputStream.java @@ -31,7 +31,7 @@ import java.io.OutputStream; public abstract class LineOrientedOutputStream extends OutputStream { /** Initial buffer size. */ - private static final int INTIAL_SIZE = 132; + private static final int INITIAL_SIZE = 132; /** Carriage return */ private static final int CR = 0x0d; @@ -40,7 +40,7 @@ public abstract class LineOrientedOutputStream extends OutputStream { private static final int LF = 0x0a; private ByteArrayOutputStream buffer - = new ByteArrayOutputStream(INTIAL_SIZE); + = new ByteArrayOutputStream(INITIAL_SIZE); private boolean skip = false; /** diff --git a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java index ff221d10a..a0a8a155c 100644 --- a/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java +++ b/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java @@ -104,7 +104,7 @@ public class RegexpMatcherFactory { public static boolean regexpMatcherPresent(Project project) { try { // The factory throws a BuildException if no usable matcher - // cant be instantiated. We dont need the matcher itself here. + // cannot be instantiated. We dont need the matcher itself here. new RegexpMatcherFactory().newRegexpMatcher(project); return true; } catch (Throwable ex) { diff --git a/src/main/org/apache/tools/bzip2/BlockSort.java b/src/main/org/apache/tools/bzip2/BlockSort.java index f997bab39..eb9066ee9 100644 --- a/src/main/org/apache/tools/bzip2/BlockSort.java +++ b/src/main/org/apache/tools/bzip2/BlockSort.java @@ -28,7 +28,7 @@ import java.util.BitSet; * blocksort.c in his libbzip2

* *

The Burrows-Wheeler transform is a reversible transform of the - * original data that is supposed to group similiar bytes close to + * original data that is supposed to group similar bytes close to * each other. The idea is to sort all permutations of the input and * only keep the last byte of each permutation. E.g. for "Commons * Compress" you'd get:

@@ -586,7 +586,7 @@ class BlockSort { * *

* This is the version using unrolled loops. Normally I never use such ones - * in Java code. The unrolling has shown a noticable performance improvement + * in Java code. The unrolling has shown a noticeable performance improvement * on JRE 1.4.2 (Linux i586 / HotSpot Client). Of course it depends on the * JIT compiler of the vm. *

diff --git a/src/main/org/apache/tools/mail/MailMessage.java b/src/main/org/apache/tools/mail/MailMessage.java index 71d0d379f..b4173a96b 100644 --- a/src/main/org/apache/tools/mail/MailMessage.java +++ b/src/main/org/apache/tools/mail/MailMessage.java @@ -327,7 +327,7 @@ public class MailMessage { // RFC 822 s4.1: // "Header fields are NOT required to occur in any particular order, // except that the message body MUST occur AFTER the headers" - // (the same section specifies a reccommended order, which we ignore) + // (the same section specifies a recommended order, which we ignore) final int size = headersKeys.size(); for (int i = 0; i < size; i++) { String name = (String) headersKeys.elementAt(i);