peterreilly 2003/12/17 07:59:04
Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
Project.java Task.java
Log:
sync with HEAD
Revision Changes Path
No revision
No revision
1.154.2.2 +5 -5 ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.154.2.1
retrieving revision 1.154.2.2
diff -u -r1.154.2.1 -r1.154.2.2
--- Project.java 11 Dec 2003 12:16:46 -0000 1.154.2.1
+++ Project.java 17 Dec 2003 15:59:04 -0000 1.154.2.2
@@ -1101,15 +1101,15 @@
* the message is logged directly.
*
* @param output Message to handle. Should not be <code>null</code>.
- * @param isError Whether the text represents an error
(<code>true</code>)
+ * @param isWarning Whether the text represents an warning
(<code>true</code>)
* or information (<code>false</code>).
*/
- public void demuxOutput(String output, boolean isError) {
+ public void demuxOutput(String output, boolean isWarning) {
Task task = getThreadTask(Thread.currentThread());
if (task == null) {
- log(output, isError ? MSG_ERR : MSG_INFO);
+ log(output, isWarning ? MSG_WARN : MSG_INFO);
} else {
- if (isError) {
+ if (isWarning) {
task.handleErrorOutput(output);
} else {
task.handleOutput(output);
1.50.2.2 +2 -2 ant/src/main/org/apache/tools/ant/Task.java
Index: Task.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Task.java,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
diff -u -r1.50.2.1 -r1.50.2.2
--- Task.java 18 Nov 2003 11:29:06 -0000 1.50.2.1
+++ Task.java 17 Dec 2003 15:59:04 -0000 1.50.2.2
@@ -344,12 +344,12 @@
}
/**
- * Handles an error output by logging it with the ERR priority.
+ * Handles an error output by logging it with the WARN priority.
*
* @param output The error output to log. Should not be
<code>null</code>.
*/
protected void handleErrorOutput(String output) {
- log(output, Project.MSG_ERR);
+ log(output, Project.MSG_WARN);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
