Browse Source

s/occured/occurred/g wherever possible - unfortunately we included the spelling error in several public method

signatures. Just like java.lang.Cloneable. :-(


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278092 13f79535-47bb-0310-9956-ffa450edef68
master
Jesse N. Glick 20 years ago
parent
commit
debc4cf475
5 changed files with 13 additions and 13 deletions
  1. +1
    -1
      docs/manual/CoreTasks/exec.html
  2. +1
    -1
      docs/manual/CoreTypes/selectors-program.html
  3. +7
    -7
      src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
  4. +1
    -1
      src/main/org/apache/tools/ant/util/Watchdog.java
  5. +3
    -3
      src/testcases/org/apache/tools/ant/BuildFileTest.java

+ 1
- 1
docs/manual/CoreTasks/exec.html View File

@@ -56,7 +56,7 @@ the job table (see the <i>JDK Release Notes</i>).</p>

<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>&lt;java&gt;</code> task with the <code>fork</code> attribute
set to <code>true</code> instead as this task will follow the VM's


+ 1
- 1
docs/manual/CoreTypes/selectors-program.html View File

@@ -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>


+ 7
- 7
src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java View File

@@ -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 {


+ 1
- 1
src/main/org/apache/tools/ant/util/Watchdog.java View File

@@ -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();


+ 3
- 3
src/testcases/org/apache/tools/ant/BuildFileTest.java View File

@@ -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()
*/


Loading…
Cancel
Save