diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index dbe6b7ec3..4d502233a 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -527,7 +527,7 @@ public class ProjectHelper {
return ex;
}
String errorMessage
- = "Following error occured while executing this line"
+ = "The following error occurred while executing this line:"
+ System.getProperty("line.separator")
+ ex.getLocation().toString()
+ ex.getMessage();
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 692cb93ce..747c6990e 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
@@ -509,7 +509,7 @@ public class Translate extends MatchingTask {
destDir.mkdirs();
}
} catch (Exception e) {
- log("Exception occured while trying to check/create "
+ log("Exception occurred while trying to check/create "
+ " parent directory. " + e.getMessage(),
Project.MSG_DEBUG);
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
index 2b6336883..5ea49b298 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
@@ -156,7 +156,7 @@ public class VAJAntToolGUI extends Frame {
/**
* 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()
*/
@@ -226,7 +226,7 @@ public class VAJAntToolGUI extends Frame {
/**
* 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()
*/
@@ -246,7 +246,7 @@ public class VAJAntToolGUI extends Frame {
/**
* 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()
*/
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
index fbb7d48af..e3ac36040 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
@@ -76,7 +76,7 @@ class VAJBuildInfo implements Runnable {
/**
* checks if the thread was interrupted. When an
- * interrupt occured, throw an Exception to stop
+ * interrupt occurred, throw an Exception to stop
* the execution.
*/
protected void checkInterrupted() {
@@ -87,7 +87,7 @@ class VAJBuildInfo implements Runnable {
/**
* 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.
*/
public void buildFinished(BuildEvent event) {
wrappedListener.buildFinished(event);
@@ -112,7 +112,7 @@ class VAJBuildInfo implements Runnable {
/**
* 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.
*/
public void targetFinished(BuildEvent event) {
wrappedListener.targetFinished(event);
@@ -129,7 +129,7 @@ class VAJBuildInfo implements Runnable {
/**
* 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.
*/
public void taskFinished(BuildEvent event) {
wrappedListener.taskFinished(event);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
index 8af1e38ae..baae137a9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
@@ -202,7 +202,7 @@ abstract class VAJLocalUtil implements VAJUtil {
}
}
} catch (IvjException e) {
- throw createBuildException("VA Exception occured: ", e);
+ throw createBuildException("VA Exception occurred: ", e);
}
return expandedDescs;
@@ -238,7 +238,7 @@ abstract class VAJLocalUtil implements VAJUtil {
return pe;
} catch (IvjException e) {
- throw createBuildException("VA Exception occured: ", e);
+ throw createBuildException("VA Exception occurred: ", e);
}
}
@@ -282,7 +282,7 @@ abstract class VAJLocalUtil implements VAJUtil {
+ " of " + pe.getName(), MSG_INFO);
return pe;
} catch (IvjException e) {
- throw createBuildException("VA Exception occured: ", e);
+ throw createBuildException("VA Exception occurred: ", e);
}
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
index dbfa75074..0d6356036 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
@@ -99,7 +99,7 @@ public abstract class VAJToolsServlet extends HttpServlet {
initRequest();
executeRequest();
} catch (BuildException e) {
- util.log("Error occured: " + e.getMessage(), VAJUtil.MSG_ERR);
+ util.log("Error occurred: " + e.getMessage(), VAJUtil.MSG_ERR);
} catch (Exception e) {
try {
if (!(e instanceof BuildException)) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
index a8deeac6c..a4a4bb987 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
@@ -182,7 +182,7 @@ class VAJWorkspaceScanner extends DirectoryScanner {
}
}
} catch (IvjException e) {
- throw VAJLocalUtil.createBuildException("VA Exception occured: ", e);
+ throw VAJLocalUtil.createBuildException("VA Exception occurred: ", e);
}
}
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index 63b4b39a3..3730f8d0c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -335,7 +335,7 @@ public class JDependTask extends Task {
*/
private static final int SUCCESS = 0;
/**
- * An error occured.
+ * An error occurred.
*/
private static final int ERRORS = 1;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
index 605c48cb3..27f77c820 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
@@ -169,7 +169,7 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter {
+ JUnitVersionHelper.getTestCaseName(test));
Long l = (Long) testStarts.get(test);
double seconds = 0;
- // can be null if an error occured in setUp
+ // can be null if an error occurred in setUp
if (l != null) {
seconds =
(System.currentTimeMillis() - l.longValue()) / 1000.0;
@@ -200,7 +200,7 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter {
/**
* Interface TestListener.
*
- * An error occured while running the test.
+ *
An error occurred while running the test.
*/
public void addError(Test test, Throwable t) {
formatError("\tCaused an ERROR", test, t);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
index 957102a6a..75f9da5e9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
@@ -213,7 +213,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan
/**
* Interface TestListener.
*
- *
An error occured while running the test.
+ *
An error occurred while running the test.
*/
public void addError(Test test, Throwable t) {
formatError(ERROR, test, t);
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 8834d4a0a..59160b834 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
@@ -179,7 +179,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
/**
* 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()
*/
@@ -202,7 +202,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
/**
* 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()
*/
@@ -219,7 +219,7 @@ public class AntSoundPlayer implements LineListener, BuildListener {
/**
* 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()
*/
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index 2e9d4013a..ec7bc571d 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -335,7 +335,7 @@ public class PatternSet extends DataType implements Cloneable {
line = patternReader.readLine();
}
} catch (IOException ioe) {
- String msg = "An error occured while reading from pattern file: "
+ String msg = "An error occurred while reading from pattern file: "
+ patternfile;
throw new BuildException(msg, ioe);
} finally {
diff --git a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java
index 0bc213852..67aec4107 100644
--- a/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java
+++ b/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
* A Cache let the user store key-value-pairs in a permanent manner and access
* them.
* It is possible that a client uses get() before load() therefore the
- * implementation must ensure that no error occured because of the wrong
+ * implementation must ensure that no error occurred because of the wrong
* order.
* The implementing class should implement a useful toString() method.
*