> -----Original Message-----
> From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
> Sent: Saturday, September 13, 2003 5:58 AM
> To: Ant Developers List
> Subject: AW: [PATCH] More typos
>
>
>
> Patches committed, thanks.
> Antoine
Found another line ending one:
src/main/org/apache/tools/ant/util/UnPackageNameMapper.java
Also attached, my next set of typo corrections.
-- Larry
Index: src/main/org/apache/tools/ant/DirectoryScanner.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.63
diff -u -r1.63 DirectoryScanner.java
--- src/main/org/apache/tools/ant/DirectoryScanner.java 21 Aug 2003 16:56:12
-0000 1.63
+++ src/main/org/apache/tools/ant/DirectoryScanner.java 12 Sep 2003 21:32:19
-0000
@@ -877,7 +877,7 @@
}
} catch (IOException ioe) {
String msg = "IOException caught while checking "
- + "for links, couldn't get cannonical path!";
+ + "for links, couldn't get canonical path!";
// will be caught and redirected to Ant's logging system
System.err.println(msg);
noLinks.addElement(newfiles[i]);
@@ -1108,7 +1108,7 @@
* performing a slow scan if one has not already been completed.
*
* @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
*
* @see #slowScan
*/
@@ -1385,7 +1385,7 @@
}
} catch (IOException ioe) {
String msg = "IOException caught while checking "
- + "for links, couldn't get cannonical path!";
+ + "for links, couldn't get canonical path!";
// will be caught and redirected to Ant's logging system
System.err.println(msg);
return false;
@@ -1402,8 +1402,8 @@
private Set scannedDirs = new HashSet();
/**
- * Has the directorty with the given path relative to the base
- * directory allready been scanned?
+ * Has the directory with the given path relative to the base
+ * directory already been scanned?
*
* <p>Registers the given directory as scanned as a side effect.</p>
*
Index: src/main/org/apache/tools/ant/FileScanner.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/FileScanner.java,v
retrieving revision 1.12
diff -u -r1.12 FileScanner.java
--- src/main/org/apache/tools/ant/FileScanner.java 6 Jul 2003 09:57:34
-0000 1.12
+++ src/main/org/apache/tools/ant/FileScanner.java 12 Sep 2003 21:32:19
-0000
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@
* The names are relative to the base directory.
*
* @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
*
*/
String[] getExcludedFiles();
Index: src/main/org/apache/tools/ant/IntrospectionHelper.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.64
diff -u -r1.64 IntrospectionHelper.java
--- src/main/org/apache/tools/ant/IntrospectionHelper.java 24 Jul 2003
14:20:31 -0000 1.64
+++ src/main/org/apache/tools/ant/IntrospectionHelper.java 12 Sep 2003
21:32:20 -0000
@@ -146,7 +146,7 @@
// distinction between addConfigured and add. It's obvious what the
// code *here* does (addConfigured sets both a creator method which
// calls a no-arg constructor and a storer method which calls the
- // method we're looking at, whlie add just sets a creator method
+ // method we're looking at, while add just sets a creator method
// which calls the method we're looking at) but it's not at all
// obvious what the difference in actual *effect* will be later
// on. I can't see any mention of addConfiguredXXX in "Developing
@@ -1071,7 +1071,7 @@
if (polyType != null) {
if (!nestedCreator.isPolyMorphic()) {
throw new BuildException(
- "Not allowed to use the polymorhic form"
+ "Not allowed to use the polymorphic form"
+ " for this element");
}
Class elementClass = nestedCreator.getElementClass();
@@ -1111,8 +1111,8 @@
}
/**
- * Stores the nested elemtnt object using a storage method
- * detimined by introspection.
+ * Stores the nested element object using a storage method
+ * determined by introspection.
*
*/
public void store() {
Index: src/main/org/apache/tools/ant/ProjectComponent.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/ProjectComponent.java,v
retrieving revision 1.9
diff -u -r1.9 ProjectComponent.java
--- src/main/org/apache/tools/ant/ProjectComponent.java 6 Jul 2003 09:57:34
-0000 1.9
+++ src/main/org/apache/tools/ant/ProjectComponent.java 12 Sep 2003 21:32:20
-0000
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001,2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -106,7 +106,7 @@
}
/**
- * Logs a mesage with the given priority.
+ * Logs a message with the given priority.
*
* @param msg The message to be logged. Should not be <code>null</code>.
* @param msgLevel the message priority at which this message is
Index: src/main/org/apache/tools/ant/taskdefs/CVSPass.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
retrieving revision 1.19
diff -u -r1.19 CVSPass.java
--- src/main/org/apache/tools/ant/taskdefs/CVSPass.java 4 Jul 2003 13:03:37
-0000 1.19
+++ src/main/org/apache/tools/ant/taskdefs/CVSPass.java 12 Sep 2003 21:32:20
-0000
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -116,7 +116,7 @@
/**
* Does the work.
*
- * @exception BuildException if someting goes wrong with the build
+ * @exception BuildException if something goes wrong with the build
*/
public final void execute() throws BuildException {
if (cvsRoot == null) {
Index: src/main/org/apache/tools/ant/taskdefs/Checksum.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.33
diff -u -r1.33 Checksum.java
--- src/main/org/apache/tools/ant/taskdefs/Checksum.java 19 Jul 2003
11:20:12 -0000 1.33
+++ src/main/org/apache/tools/ant/taskdefs/Checksum.java 12 Sep 2003
21:32:20 -0000
@@ -96,7 +96,7 @@
private File file = null;
/**
- * Root directory in which the checksu files will be written.
+ * Root directory in which the checksum files will be written.
* If not specified, the checksum files will be written
* in the same directory as each file.
*/
@@ -576,7 +576,7 @@
}
/**
- * Converts an array of characters representing hexidecimal values into an
+ * Converts an array of characters representing hexadecimal values into an
* array of bytes of those same values. The returned array will be half the
* length of the passed array, as it takes two characters to represent any
* given byte. An exception is thrown if the passed char array has an odd
Index: src/main/org/apache/tools/ant/taskdefs/Concat.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
retrieving revision 1.27
diff -u -r1.27 Concat.java
--- src/main/org/apache/tools/ant/taskdefs/Concat.java 22 Aug 2003 15:25:44
-0000 1.27
+++ src/main/org/apache/tools/ant/taskdefs/Concat.java 12 Sep 2003 21:32:20
-0000
@@ -303,7 +303,7 @@
/**
* Specify the end of line to find and to add if
* not present at end of each input file. This attribute
- * is used in conjuction with fixlastline.
+ * is used in conjunction with fixlastline.
* @param crlf the type of new line to add -
* cr, mac, lf, unix, crlf, or dos
* @since Ant 1.6
@@ -737,7 +737,7 @@
* Read a character from the current reader object. Advance
* to the next if the reader is finished.
* @return the character read, -1 for EOF on the last reader.
- * @exception IOException - possiblly thrown by the read for a reader
+ * @exception IOException - possibly thrown by the read for a reader
* object.
*/
public int read() throws IOException {
@@ -773,7 +773,7 @@
* @param cbuf The array to be read into.
* @param off The offset.
* @param len The length to read.
- * @exception IOException - possiblely thrown by the reads to the
+ * @exception IOException - possibly thrown by the reads to the
* reader objects.
*/
public int read(char[] cbuf, int off, int len)
Index: src/main/org/apache/tools/ant/taskdefs/Copy.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.64
diff -u -r1.64 Copy.java
--- src/main/org/apache/tools/ant/taskdefs/Copy.java 25 Jul 2003 08:31:45
-0000 1.64
+++ src/main/org/apache/tools/ant/taskdefs/Copy.java 12 Sep 2003 21:32:21
-0000
@@ -193,7 +193,7 @@
/**
* Give the copied files the same last modified time as the original files.
- * @param preserve if true perserce the modified time, default is false
+ * @param preserve if true perverse the modified time, default is false
*/
public void setPreserveLastModified(boolean preserve) {
preserveLastModified = preserve;
@@ -537,7 +537,7 @@
* copied.
*
* @param fromDir The source directory
- * @param toDir The destination dirctory
+ * @param toDir The destination directory
* @param files A list of files to copy
* @param dirs A list of directories to copy
*/
Index: src/main/org/apache/tools/ant/taskdefs/DefBase.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/DefBase.java,v
retrieving revision 1.4
diff -u -r1.4 DefBase.java
--- src/main/org/apache/tools/ant/taskdefs/DefBase.java 15 Aug 2003 15:04:29
-0000 1.4
+++ src/main/org/apache/tools/ant/taskdefs/DefBase.java 12 Sep 2003 21:32:21
-0000
@@ -65,7 +65,7 @@
/**
* Base class for Definitions
- * handling uri and and class loading.
+ * handling uri and class loading.
* (This was part of Definer)
*
* @author Costin Manolache
@@ -130,7 +130,7 @@
}
/**
- * @return the class path path for this definition
+ * @return the classpath for this definition
*/
public Path getClasspath() {
return cpDelegate.getClasspath();
Index: src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java,v
retrieving revision 1.6
diff -u -r1.6 DefaultExcludes.java
--- src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java 25 Jul 2003
16:26:49 -0000 1.6
+++ src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java 12 Sep 2003
21:32:21 -0000
@@ -80,7 +80,7 @@
/**
* Does the work.
*
- * @exception BuildException if someting goes wrong with the build
+ * @exception BuildException if something goes wrong with the build
*/
public void execute() throws BuildException {
if (!defaultrequested && add.equals("") && remove.equals("") && !echo)
{
@@ -129,7 +129,7 @@
* Pattern to remove from the default excludes.
*
* @param remove Sets the value for the pattern that
- * should nolonger be excluded.
+ * should no longer be excluded.
*/
public void setRemove(String remove) {
this.remove = remove;
Index: src/main/org/apache/tools/ant/taskdefs/Delete.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
retrieving revision 1.45
diff -u -r1.45 Delete.java
--- src/main/org/apache/tools/ant/taskdefs/Delete.java 25 Jul 2003 08:59:39
-0000 1.45
+++ src/main/org/apache/tools/ant/taskdefs/Delete.java 12 Sep 2003 21:32:21
-0000
@@ -444,7 +444,7 @@
}
/**
- * add an arbitary selector
+ * add an arbitrary selector
* @param selector the selector to be added
* @since Ant 1.6
*/
Index: src/main/org/apache/tools/ant/taskdefs/Ear.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
retrieving revision 1.24
diff -u -r1.24 Ear.java
--- src/main/org/apache/tools/ant/taskdefs/Ear.java 6 Jul 2003 09:57:36
-0000 1.24
+++ src/main/org/apache/tools/ant/taskdefs/Ear.java 12 Sep 2003 21:32:21
-0000
@@ -136,7 +136,7 @@
}
/**
- * Overriden from Zip class to deal with application.xml
+ * Overridden from Zip class to deal with application.xml
*/
protected void zipFile(File file, ZipOutputStream zOut, String vPath,
int mode)
Index: src/main/org/apache/tools/ant/taskdefs/Echo.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
retrieving revision 1.28
diff -u -r1.28 Echo.java
--- src/main/org/apache/tools/ant/taskdefs/Echo.java 19 Jul 2003 08:10:59
-0000 1.28
+++ src/main/org/apache/tools/ant/taskdefs/Echo.java 12 Sep 2003 21:32:21
-0000
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -81,7 +81,7 @@
/**
* Does the work.
*
- * @exception BuildException if someting goes wrong with the build
+ * @exception BuildException if something goes wrong with the build
*/
public void execute() throws BuildException {
if (file == null) {
Index: src/main/org/apache/tools/ant/taskdefs/ExecTask.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.59
diff -u -r1.59 ExecTask.java
--- src/main/org/apache/tools/ant/taskdefs/ExecTask.java 29 Jul 2003
13:09:11 -0000 1.59
+++ src/main/org/apache/tools/ant/taskdefs/ExecTask.java 12 Sep 2003
21:32:21 -0000
@@ -537,7 +537,7 @@
/**
* Run the command using the given Execute instance. This may be
- * overidden by subclasses
+ * overridden by subclasses
*
* @param exe instance of Execute to run
*
Index: src/main/org/apache/tools/ant/taskdefs/Execute.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
retrieving revision 1.65
diff -u -r1.65 Execute.java
--- src/main/org/apache/tools/ant/taskdefs/Execute.java 3 Sep 2003 16:47:17
-0000 1.65
+++ src/main/org/apache/tools/ant/taskdefs/Execute.java 12 Sep 2003 21:32:21
-0000
@@ -440,7 +440,7 @@
* allow the shell to perform additional processing such as associating an
* executable with a script, etc
*
- * @param useVMLauncher true if exec should launch through thge VM,
+ * @param useVMLauncher true if exec should launch through the VM,
* false if the shell should be used to launch the
* command.
*/
@@ -603,7 +603,7 @@
/**
* test for an untimely death of the process
- * @return true iff a watchdog had to kill the process
+ * @return true if a watchdog had to kill the process
* @since Ant 1.5
*/
public boolean killedProcess() {
@@ -727,7 +727,7 @@
* @param project The project that the command is part of
* @param cmd The command to execute
* @param env The environment for the new process. If null,
- * the environment of the current proccess is
used.
+ * the environment of the current process is used.
* @throws IOException if attempting to run a command in a specific
directory
*/
public Process exec(Project project, String[] cmd, String[] env)
@@ -746,7 +746,7 @@
* @param project The project that the command is part of
* @param cmd The command to execute
* @param env The environment for the new process. If null,
- * the environment of the current proccess is
used.
+ * the environment of the current process is used.
* @param workingDir The directory to start the command in. If
null,
* the current directory is used
* @throws IOException if trying to change directory
Index: src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.37
diff -u -r1.37 ExecuteJava.java
--- src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java 3 Sep 2003
16:47:17 -0000 1.37
+++ src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java 12 Sep 2003
21:32:21 -0000
@@ -166,7 +166,7 @@
Task currentThreadTask
= project.getThreadTask(Thread.currentThread());
project.registerThreadTask(thread, currentThreadTask);
- // if we run into a timout, the run-away thread shall not
+ // if we run into a timeout, the run-away thread shall not
// make the VM run forever - if no timeout occurs, Ant's
// main thread will still be there to let the new thread
// finish
Index: src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
===================================================================
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java,v
retrieving revision 1.17
diff -u -r1.17 ExecuteWatchdog.java
--- src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java 25 Jul 2003
12:14:42 -0000 1.17
+++ src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java 12 Sep 2003
21:32:22 -0000
@@ -82,7 +82,7 @@
/** the process to execute and watch for duration */
private Process process;
- /** say whether or not the watchog is currently monitoring a process */
+ /** say whether or not the watchdog is currently monitoring a process */
private boolean watch = false;
/** exception that might be thrown during the process execution */
@@ -91,14 +91,14 @@
/** say whether or not the process was killed due to running overtime */
private boolean killedProcess = false;
- /** will tell us whether timeout has occured */
+ /** will tell us whether timeout has occurred */
private Watchdog watchdog;
/**
* Creates a new watchdog with a given timeout.
*
* @param timeout the timeout for the process in milliseconds.
- * It must be greather than 0.
+ * It must be greater than 0.
*/
public ExecuteWatchdog(long timeout) {
watchdog = new Watchdog(timeout);
Index: src/main/org/apache/tools/ant/taskdefs/Exit.java
===================================================================
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
retrieving revision 1.23
diff -u -r1.23 Exit.java
--- src/main/org/apache/tools/ant/taskdefs/Exit.java 6 Sep 2003 07:02:31
-0000 1.23
+++ src/main/org/apache/tools/ant/taskdefs/Exit.java 12 Sep 2003 21:32:22
-0000
@@ -111,7 +111,7 @@
* evaluate both if and unless conditions, and if
* ifCondition is true or unlessCondition is false, throw a
* build exception to exit the build.
- * The errore message is constructed from the text fields, or from
+ * The error message is constructed from the text fields, or from
* the if and unless parameters (if present).
* @throws BuildException
*/
@@ -168,7 +168,7 @@
/**
* test the unless condition
* @return true if there is no unless condition,
- * or there is a named property but it doesnt exist
+ * or there is a named property but it doesn't exist
*/
private boolean testUnlessCondition() {
if (unlessCondition == null || "".equals(unlessCondition)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
