Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 68450 invoked from network); 11 Dec 2001 15:06:29 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 11 Dec 2001 15:06:29 -0000 Received: (qmail 5717 invoked by uid 97); 11 Dec 2001 15:06:28 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 5700 invoked by uid 97); 11 Dec 2001 15:06:27 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 5689 invoked by uid 97); 11 Dec 2001 15:06:27 -0000 Date: 11 Dec 2001 15:06:23 -0000 Message-ID: <20011211150623.4407.qmail@icarus.apache.org> From: bodewig@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant DefaultLogger.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bodewig 01/12/11 07:06:23 Modified: src/main/org/apache/tools/ant DefaultLogger.java Log: simplify DefaultLogger Revision Changes Path 1.22 +13 -14 jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java Index: DefaultLogger.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/DefaultLogger.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- DefaultLogger.java 2001/12/11 12:01:51 1.21 +++ DefaultLogger.java 2001/12/11 15:06:23 1.22 @@ -99,7 +99,7 @@ * @param output the output stream for the logger. */ public void setOutputPrintStream(PrintStream output) { - this.out = output; + this.out = new PrintStream(output, true); } /** @@ -108,7 +108,7 @@ * @param err the error stream for the logger. */ public void setErrorPrintStream(PrintStream err) { - this.err = err; + this.err = new PrintStream(err, true); } /** @@ -160,14 +160,18 @@ + formatTime(System.currentTimeMillis() - startTime)); String msg = message.toString(); - printlnAndFlush(error == null ? out : err, msg); + if (error == null) { + out.println(msg); + } else { + err.println(msg); + } log(msg); } public void targetStarted(BuildEvent event) { if (Project.MSG_INFO <= msgOutputLevel) { String msg = lSep + event.getTarget().getName() + ":"; - printlnAndFlush(out, msg); + out.println(msg); log(msg); } } @@ -198,8 +202,11 @@ message.append(event.getMessage()); String msg = message.toString(); - printlnAndFlush(event.getPriority() != Project.MSG_ERR ? out : err, - msg); + if (event.getPriority() != Project.MSG_ERR) { + out.println(msg); + } else { + err.println(msg); + } log(msg); } } @@ -227,13 +234,5 @@ * same output that is generated here. */ protected void log(String message) {} - - /** - * Print a line to the given stream and flush the stream right after that. - */ - protected void printlnAndFlush(PrintStream p, String line) { - p.println(line); - p.flush(); - } } -- To unsubscribe, e-mail: For additional commands, e-mail: