peterreilly 2004/03/09 07:47:11
Modified: src/main/org/apache/tools/ant/types/selectors/modifiedselector
Tag: ANT_16_BRANCH Cache.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
PatternSet.java
src/main/org/apache/tools/ant/taskdefs/optional/sound Tag:
ANT_16_BRANCH AntSoundPlayer.java
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH XMLJUnitResultFormatter.java
PlainJUnitResultFormatter.java
src/main/org/apache/tools/ant/taskdefs/optional/jdepend Tag:
ANT_16_BRANCH JDependTask.java
src/main/org/apache/tools/ant/taskdefs/optional/ide Tag:
ANT_16_BRANCH VAJWorkspaceScanner.java
VAJToolsServlet.java VAJLocalUtil.java
VAJBuildInfo.java VAJAntToolGUI.java
src/main/org/apache/tools/ant/taskdefs/optional/i18n Tag:
ANT_16_BRANCH Translate.java
src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
ProjectHelper.java
Log:
sync with head
Revision Changes Path
No revision
No revision
1.1.2.5 +1 -1
ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java
Index: Cache.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/modifiedselector/Cache.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Cache.java 9 Feb 2004 22:12:43 -0000 1.1.2.4
+++ Cache.java 9 Mar 2004 15:47:10 -0000 1.1.2.5
@@ -25,7 +25,7 @@
* 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
* <i>order</i>.
* The implementing class should implement a useful toString() method.
*
No revision
No revision
1.31.2.8 +1 -1 ant/src/main/org/apache/tools/ant/types/PatternSet.java
Index: PatternSet.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/PatternSet.java,v
retrieving revision 1.31.2.7
retrieving revision 1.31.2.8
diff -u -r1.31.2.7 -r1.31.2.8
--- PatternSet.java 24 Feb 2004 14:07:23 -0000 1.31.2.7
+++ PatternSet.java 9 Mar 2004 15:47:10 -0000 1.31.2.8
@@ -335,7 +335,7 @@
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 {
No revision
No revision
1.13.2.4 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
Index: AntSoundPlayer.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- AntSoundPlayer.java 9 Feb 2004 22:12:37 -0000 1.13.2.3
+++ AntSoundPlayer.java 9 Mar 2004 15:47:10 -0000 1.13.2.4
@@ -179,7 +179,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()
*/
@@ -202,7 +202,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()
*/
@@ -219,7 +219,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()
*/
No revision
No revision
1.30.2.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
Index: XMLJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java,v
retrieving revision 1.30.2.3
retrieving revision 1.30.2.4
diff -u -r1.30.2.3 -r1.30.2.4
--- XMLJUnitResultFormatter.java 9 Feb 2004 22:12:34 -0000 1.30.2.3
+++ XMLJUnitResultFormatter.java 9 Mar 2004 15:47:10 -0000 1.30.2.4
@@ -213,7 +213,7 @@
/**
* 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) {
formatError(ERROR, test, t);
1.19.2.5 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
Index: PlainJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -r1.19.2.4 -r1.19.2.5
--- PlainJUnitResultFormatter.java 9 Feb 2004 22:12:34 -0000 1.19.2.4
+++ PlainJUnitResultFormatter.java 9 Mar 2004 15:47:10 -0000 1.19.2.5
@@ -169,7 +169,7 @@
+ 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 @@
/**
* 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) {
formatError("\tCaused an ERROR", test, t);
No revision
No revision
1.22.2.6 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.22.2.5
retrieving revision 1.22.2.6
diff -u -r1.22.2.5 -r1.22.2.6
--- JDependTask.java 9 Feb 2004 22:12:33 -0000 1.22.2.5
+++ JDependTask.java 9 Mar 2004 15:47:10 -0000 1.22.2.6
@@ -335,7 +335,7 @@
*/
private static final int SUCCESS = 0;
/**
- * An error occured.
+ * An error occurred.
*/
private static final int ERRORS = 1;
No revision
No revision
1.12.2.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
Index: VAJWorkspaceScanner.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -r1.12.2.3 -r1.12.2.4
--- VAJWorkspaceScanner.java 9 Feb 2004 22:12:32 -0000 1.12.2.3
+++ VAJWorkspaceScanner.java 9 Mar 2004 15:47:10 -0000 1.12.2.4
@@ -182,7 +182,7 @@
}
}
} catch (IvjException e) {
- throw VAJLocalUtil.createBuildException("VA Exception occured:
", e);
+ throw VAJLocalUtil.createBuildException("VA Exception occurred:
", e);
}
}
}
1.12.2.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java
Index: VAJToolsServlet.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -r1.12.2.3 -r1.12.2.4
--- VAJToolsServlet.java 9 Feb 2004 22:12:32 -0000 1.12.2.3
+++ VAJToolsServlet.java 9 Mar 2004 15:47:10 -0000 1.12.2.4
@@ -99,7 +99,7 @@
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)) {
1.14.2.4 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
Index: VAJLocalUtil.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -r1.14.2.3 -r1.14.2.4
--- VAJLocalUtil.java 9 Feb 2004 22:12:32 -0000 1.14.2.3
+++ VAJLocalUtil.java 9 Mar 2004 15:47:10 -0000 1.14.2.4
@@ -202,7 +202,7 @@
}
}
} catch (IvjException e) {
- throw createBuildException("VA Exception occured: ", e);
+ throw createBuildException("VA Exception occurred: ", e);
}
return expandedDescs;
@@ -238,7 +238,7 @@
return pe;
} catch (IvjException e) {
- throw createBuildException("VA Exception occured: ", e);
+ throw createBuildException("VA Exception occurred: ", e);
}
}
@@ -282,7 +282,7 @@
+ " of " + pe.getName(), MSG_INFO);
return pe;
} catch (IvjException e) {
- throw createBuildException("VA Exception occured: ", e);
+ throw createBuildException("VA Exception occurred: ", e);
}
}
1.11.2.4 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java
Index: VAJBuildInfo.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -r1.11.2.3 -r1.11.2.4
--- VAJBuildInfo.java 9 Feb 2004 22:12:32 -0000 1.11.2.3
+++ VAJBuildInfo.java 9 Mar 2004 15:47:10 -0000 1.11.2.4
@@ -76,7 +76,7 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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);
1.21.2.4 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
Index: VAJAntToolGUI.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- VAJAntToolGUI.java 9 Feb 2004 22:12:32 -0000 1.21.2.3
+++ VAJAntToolGUI.java 9 Mar 2004 15:47:10 -0000 1.21.2.4
@@ -156,7 +156,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()
*/
@@ -226,7 +226,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()
*/
@@ -246,7 +246,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()
*/
No revision
No revision
1.31.2.4 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
Index: Translate.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -r1.31.2.3 -r1.31.2.4
--- Translate.java 9 Feb 2004 22:12:31 -0000 1.31.2.3
+++ Translate.java 9 Mar 2004 15:47:11 -0000 1.31.2.4
@@ -508,7 +508,7 @@
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);
}
No revision
No revision
1.101.2.8 +1 -1 ant/src/main/org/apache/tools/ant/ProjectHelper.java
Index: ProjectHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
retrieving revision 1.101.2.7
retrieving revision 1.101.2.8
diff -u -r1.101.2.7 -r1.101.2.8
--- ProjectHelper.java 9 Feb 2004 22:12:14 -0000 1.101.2.7
+++ ProjectHelper.java 9 Mar 2004 15:47:11 -0000 1.101.2.8
@@ -527,7 +527,7 @@
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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
