diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html index 274d6c69c..77002c01a 100644 --- a/docs/manual/CoreTasks/exec.html +++ b/docs/manual/CoreTasks/exec.html @@ -56,7 +56,7 @@ the job table (see the JDK Release Notes).
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 JAVA.EXE, use a
<java> task with the fork attribute
set to true instead as this task will follow the VM's
diff --git a/docs/manual/CoreTypes/selectors-program.html b/docs/manual/CoreTypes/selectors-program.html
index b471e0822..959280bdf 100755
--- a/docs/manual/CoreTypes/selectors-program.html
+++ b/docs/manual/CoreTypes/selectors-program.html
@@ -161,7 +161,7 @@
BaseSelectorTest provides the method performTests() which
iterates over all files (and directories) in the String array filenames
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.
An example test would be:
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index 946487c14..679966ea6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -593,8 +593,8 @@ public class JUnitTestRunner implements TestListener {
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 @@ public class JUnitTestRunner implements TestListener {
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 {
diff --git a/src/main/org/apache/tools/ant/util/Watchdog.java b/src/main/org/apache/tools/ant/util/Watchdog.java
index ded57673d..e277a1427 100644
--- a/src/main/org/apache/tools/ant/util/Watchdog.java
+++ b/src/main/org/apache/tools/ant/util/Watchdog.java
@@ -62,7 +62,7 @@ public class Watchdog implements Runnable {
}
/**
- * Inform the observers that a timeout has occured.
+ * Inform the observers that a timeout has occurred.
*/
protected final void fireTimeoutOccured() {
Enumeration e = observers.elements();
diff --git a/src/testcases/org/apache/tools/ant/BuildFileTest.java b/src/testcases/org/apache/tools/ant/BuildFileTest.java
index 565b8f108..062aef263 100644
--- a/src/testcases/org/apache/tools/ant/BuildFileTest.java
+++ b/src/testcases/org/apache/tools/ant/BuildFileTest.java
@@ -431,7 +431,7 @@ public abstract class BuildFileTest extends TestCase {
/**
* 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 @@ public abstract class BuildFileTest extends TestCase {
/**
* 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 @@ public abstract class BuildFileTest extends TestCase {
/**
* 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()
*/