jglick 2005/03/30 09:08:27
Modified: src/testcases/org/apache/tools/ant BuildFileTest.java
src/main/org/apache/tools/ant/util Watchdog.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTestRunner.java
docs/manual/CoreTypes selectors-program.html
docs/manual/CoreTasks exec.html
Log:
s/occured/occurred/g wherever possible - unfortunately we included the
spelling error in several public method
signatures. Just like java.lang.Cloneable. :-(
Revision Changes Path
1.35 +3 -3 ant/src/testcases/org/apache/tools/ant/BuildFileTest.java
Index: BuildFileTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/BuildFileTest.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- BuildFileTest.java 9 Mar 2005 22:56:39 -0000 1.34
+++ BuildFileTest.java 30 Mar 2005 17:08:26 -0000 1.35
@@ -431,7 +431,7 @@
/**
* Fired after the last target has finished. This event
- * will still be thrown if an error occured during the build.
+ * will still be thrown if an error occurred during the build.
*
* @see BuildEvent#getException()
*/
@@ -449,7 +449,7 @@
/**
* Fired when a target has finished. This event will
- * still be thrown if an error occured during the build.
+ * still be thrown if an error occurred during the build.
*
* @see BuildEvent#getException()
*/
@@ -468,7 +468,7 @@
/**
* Fired when a task has finished. This event will still
- * be throw if an error occured during the build.
+ * be throw if an error occurred during the build.
*
* @see BuildEvent#getException()
*/
1.14 +1 -1 ant/src/main/org/apache/tools/ant/util/Watchdog.java
Index: Watchdog.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/Watchdog.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Watchdog.java 21 Jan 2005 17:37:28 -0000 1.13
+++ Watchdog.java 30 Mar 2005 17:08:27 -0000 1.14
@@ -62,7 +62,7 @@
}
/**
- * Inform the observers that a timeout has occured.
+ * Inform the observers that a timeout has occurred.
*/
protected final void fireTimeoutOccured() {
Enumeration e = observers.elements();
1.58 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Index: JUnitTestRunner.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- JUnitTestRunner.java 29 Mar 2005 19:19:04 -0000 1.57
+++ JUnitTestRunner.java 30 Mar 2005 17:08:27 -0000 1.58
@@ -593,8 +593,8 @@
new java.io.BufferedReader(new
java.io.FileReader(args[0]));
String testCaseName;
int code = 0;
- boolean errorOccured = false;
- boolean failureOccured = false;
+ boolean errorOccurred = false;
+ boolean failureOccurred = false;
String line = null;
while ((line = reader.readLine()) != null) {
StringTokenizer st = new StringTokenizer(line, ",");
@@ -604,11 +604,11 @@
t.setOutfile(st.nextToken());
code = launch(t, haltError, stackfilter, haltFail,
showOut, logTestListenerEvents, props);
- errorOccured = (code == ERRORS);
- failureOccured = (code != SUCCESS);
- if (errorOccured || failureOccured) {
- if ((errorOccured && haltError)
- || (failureOccured && haltFail)) {
+ errorOccurred = (code == ERRORS);
+ failureOccurred = (code != SUCCESS);
+ if (errorOccurred || failureOccurred) {
+ if ((errorOccurred && haltError)
+ || (failureOccurred && haltFail)) {
registerNonCrash(noCrashFile);
System.exit(code);
} else {
1.8 +1 -1 ant/docs/manual/CoreTypes/selectors-program.html
Index: selectors-program.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/selectors-program.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- selectors-program.html 7 Mar 2005 18:18:27 -0000 1.7
+++ selectors-program.html 30 Mar 2005 17:08:27 -0000 1.8
@@ -161,7 +161,7 @@
BaseSelectorTest provides the method <tt>performTests()</tt> which
iterates over all files (and directories) in the String array
<tt>filenames</tt>
and checks whether the given selector returns the expected result. If an
error
- occured (especially the selector does not return the expected result)
the test
+ occurred (especially the selector does not return the expected result)
the test
fails and the failing filenames are logged.</p>
<p>An example test would be:<pre>
1.49 +1 -1 ant/docs/manual/CoreTasks/exec.html
Index: exec.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/exec.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- exec.html 7 Mar 2005 18:09:09 -0000 1.48
+++ exec.html 30 Mar 2005 17:08:27 -0000 1.49
@@ -56,7 +56,7 @@
<p>Please note that the Java VM provided by HP doesn't follow OpenVMS'
conventions of exit codes. If you run a Java VM with this task, the
-task may falsely claim that an error occured (or silently ignore an
+task may falsely claim that an error occurred (or silently ignore an
error). Don't use this task to run <code>JAVA.EXE</code>, use a
<code><java></code> task with the <code>fork</code> attribute
set to <code>true</code> instead as this task will follow the VM's
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
