PR: 27282 Obtained from: Jesse Glick git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276200 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -527,7 +527,7 @@ public class ProjectHelper { | |||||
| return ex; | return ex; | ||||
| } | } | ||||
| String errorMessage | String errorMessage | ||||
| = "Following error occured while executing this line" | |||||
| = "The following error occurred while executing this line:" | |||||
| + System.getProperty("line.separator") | + System.getProperty("line.separator") | ||||
| + ex.getLocation().toString() | + ex.getLocation().toString() | ||||
| + ex.getMessage(); | + ex.getMessage(); | ||||
| @@ -509,7 +509,7 @@ public class Translate extends MatchingTask { | |||||
| destDir.mkdirs(); | destDir.mkdirs(); | ||||
| } | } | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| log("Exception occured while trying to check/create " | |||||
| log("Exception occurred while trying to check/create " | |||||
| + " parent directory. " + e.getMessage(), | + " parent directory. " + e.getMessage(), | ||||
| Project.MSG_DEBUG); | Project.MSG_DEBUG); | ||||
| } | } | ||||
| @@ -156,7 +156,7 @@ public class VAJAntToolGUI extends Frame { | |||||
| /** | /** | ||||
| * Fired after the last target has finished. This event | * 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() | * @see BuildEvent#getException() | ||||
| */ | */ | ||||
| @@ -226,7 +226,7 @@ public class VAJAntToolGUI extends Frame { | |||||
| /** | /** | ||||
| * Fired when a target has finished. This event will | * 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() | * @see BuildEvent#getException() | ||||
| */ | */ | ||||
| @@ -246,7 +246,7 @@ public class VAJAntToolGUI extends Frame { | |||||
| /** | /** | ||||
| * Fired when a task has finished. This event will still | * 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() | * @see BuildEvent#getException() | ||||
| */ | */ | ||||
| @@ -76,7 +76,7 @@ class VAJBuildInfo implements Runnable { | |||||
| /** | /** | ||||
| * checks if the thread was interrupted. When an | * checks if the thread was interrupted. When an | ||||
| * interrupt occured, throw an Exception to stop | |||||
| * interrupt occurred, throw an Exception to stop | |||||
| * the execution. | * the execution. | ||||
| */ | */ | ||||
| protected void checkInterrupted() { | protected void checkInterrupted() { | ||||
| @@ -87,7 +87,7 @@ class VAJBuildInfo implements Runnable { | |||||
| /** | /** | ||||
| * Fired after the last target has finished. This event | * 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) { | public void buildFinished(BuildEvent event) { | ||||
| wrappedListener.buildFinished(event); | wrappedListener.buildFinished(event); | ||||
| @@ -112,7 +112,7 @@ class VAJBuildInfo implements Runnable { | |||||
| /** | /** | ||||
| * Fired when a target has finished. This event will | * 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) { | public void targetFinished(BuildEvent event) { | ||||
| wrappedListener.targetFinished(event); | wrappedListener.targetFinished(event); | ||||
| @@ -129,7 +129,7 @@ class VAJBuildInfo implements Runnable { | |||||
| /** | /** | ||||
| * Fired when a task has finished. This event will still | * 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) { | public void taskFinished(BuildEvent event) { | ||||
| wrappedListener.taskFinished(event); | wrappedListener.taskFinished(event); | ||||
| @@ -202,7 +202,7 @@ abstract class VAJLocalUtil implements VAJUtil { | |||||
| } | } | ||||
| } | } | ||||
| } catch (IvjException e) { | } catch (IvjException e) { | ||||
| throw createBuildException("VA Exception occured: ", e); | |||||
| throw createBuildException("VA Exception occurred: ", e); | |||||
| } | } | ||||
| return expandedDescs; | return expandedDescs; | ||||
| @@ -238,7 +238,7 @@ abstract class VAJLocalUtil implements VAJUtil { | |||||
| return pe; | return pe; | ||||
| } catch (IvjException e) { | } 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); | + " of " + pe.getName(), MSG_INFO); | ||||
| return pe; | return pe; | ||||
| } catch (IvjException e) { | } catch (IvjException e) { | ||||
| throw createBuildException("VA Exception occured: ", e); | |||||
| throw createBuildException("VA Exception occurred: ", e); | |||||
| } | } | ||||
| } | } | ||||
| @@ -99,7 +99,7 @@ public abstract class VAJToolsServlet extends HttpServlet { | |||||
| initRequest(); | initRequest(); | ||||
| executeRequest(); | executeRequest(); | ||||
| } catch (BuildException e) { | } catch (BuildException e) { | ||||
| util.log("Error occured: " + e.getMessage(), VAJUtil.MSG_ERR); | |||||
| util.log("Error occurred: " + e.getMessage(), VAJUtil.MSG_ERR); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| try { | try { | ||||
| if (!(e instanceof BuildException)) { | if (!(e instanceof BuildException)) { | ||||
| @@ -182,7 +182,7 @@ class VAJWorkspaceScanner extends DirectoryScanner { | |||||
| } | } | ||||
| } | } | ||||
| } catch (IvjException e) { | } catch (IvjException e) { | ||||
| throw VAJLocalUtil.createBuildException("VA Exception occured: ", e); | |||||
| throw VAJLocalUtil.createBuildException("VA Exception occurred: ", e); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -335,7 +335,7 @@ public class JDependTask extends Task { | |||||
| */ | */ | ||||
| private static final int SUCCESS = 0; | private static final int SUCCESS = 0; | ||||
| /** | /** | ||||
| * An error occured. | |||||
| * An error occurred. | |||||
| */ | */ | ||||
| private static final int ERRORS = 1; | private static final int ERRORS = 1; | ||||
| @@ -169,7 +169,7 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter { | |||||
| + JUnitVersionHelper.getTestCaseName(test)); | + JUnitVersionHelper.getTestCaseName(test)); | ||||
| Long l = (Long) testStarts.get(test); | Long l = (Long) testStarts.get(test); | ||||
| double seconds = 0; | double seconds = 0; | ||||
| // can be null if an error occured in setUp | |||||
| // can be null if an error occurred in setUp | |||||
| if (l != null) { | if (l != null) { | ||||
| seconds = | seconds = | ||||
| (System.currentTimeMillis() - l.longValue()) / 1000.0; | (System.currentTimeMillis() - l.longValue()) / 1000.0; | ||||
| @@ -200,7 +200,7 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter { | |||||
| /** | /** | ||||
| * Interface TestListener. | * Interface TestListener. | ||||
| * | * | ||||
| * <p>An error occured while running the test. | |||||
| * <p>An error occurred while running the test. | |||||
| */ | */ | ||||
| public void addError(Test test, Throwable t) { | public void addError(Test test, Throwable t) { | ||||
| formatError("\tCaused an ERROR", test, t); | formatError("\tCaused an ERROR", test, t); | ||||
| @@ -213,7 +213,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstan | |||||
| /** | /** | ||||
| * Interface TestListener. | * Interface TestListener. | ||||
| * | * | ||||
| * <p>An error occured while running the test. | |||||
| * <p>An error occurred while running the test. | |||||
| */ | */ | ||||
| public void addError(Test test, Throwable t) { | public void addError(Test test, Throwable t) { | ||||
| formatError(ERROR, test, t); | formatError(ERROR, test, t); | ||||
| @@ -179,7 +179,7 @@ public class AntSoundPlayer implements LineListener, BuildListener { | |||||
| /** | /** | ||||
| * Fired after the last target has finished. This event | * 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() | * @see BuildEvent#getException() | ||||
| */ | */ | ||||
| @@ -202,7 +202,7 @@ public class AntSoundPlayer implements LineListener, BuildListener { | |||||
| /** | /** | ||||
| * Fired when a target has finished. This event will | * 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() | * @see BuildEvent#getException() | ||||
| */ | */ | ||||
| @@ -219,7 +219,7 @@ public class AntSoundPlayer implements LineListener, BuildListener { | |||||
| /** | /** | ||||
| * Fired when a task has finished. This event will still | * 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() | * @see BuildEvent#getException() | ||||
| */ | */ | ||||
| @@ -335,7 +335,7 @@ public class PatternSet extends DataType implements Cloneable { | |||||
| line = patternReader.readLine(); | line = patternReader.readLine(); | ||||
| } | } | ||||
| } catch (IOException ioe) { | } catch (IOException ioe) { | ||||
| String msg = "An error occured while reading from pattern file: " | |||||
| String msg = "An error occurred while reading from pattern file: " | |||||
| + patternfile; | + patternfile; | ||||
| throw new BuildException(msg, ioe); | throw new BuildException(msg, ioe); | ||||
| } finally { | } finally { | ||||
| @@ -25,7 +25,7 @@ import java.util.Iterator; | |||||
| * A Cache let the user store key-value-pairs in a permanent manner and access | * A Cache let the user store key-value-pairs in a permanent manner and access | ||||
| * them. | * them. | ||||
| * It is possible that a client uses get() before load() therefore the | * 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 | |||||
| * <i>order</i>. | * <i>order</i>. | ||||
| * The implementing class should implement a useful toString() method. | * The implementing class should implement a useful toString() method. | ||||
| * | * | ||||