You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/11/12 22:46:03 UTC
cvs commit: jakarta-avalon-excalibur/testcase/src/java/org/apache/avalon/excalibur/testcase BufferedLogger.java
donaldp 2002/11/12 13:46:03
Modified: testcase/src/java/org/apache/avalon/excalibur/testcase
BufferedLogger.java
Log:
Cleaned
Revision Changes Path
1.2 +26 -75 jakarta-avalon-excalibur/testcase/src/java/org/apache/avalon/excalibur/testcase/BufferedLogger.java
Index: BufferedLogger.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/src/java/org/apache/avalon/excalibur/testcase/BufferedLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BufferedLogger.java 4 Apr 2002 05:09:05 -0000 1.1
+++ BufferedLogger.java 12 Nov 2002 21:46:03 -0000 1.2
@@ -7,8 +7,7 @@
*/
package org.apache.avalon.excalibur.testcase;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
+import org.apache.avalon.framework.ExceptionUtil;
import org.apache.avalon.framework.logger.Logger;
/**
@@ -23,23 +22,7 @@
public class BufferedLogger
implements Logger
{
- private StringBuffer _sb;
-
- /*---------------------------------------------------------------
- * Constructors
- *-------------------------------------------------------------*/
-
- /**
- * Create a new <code>BufferedLogger</code>.
- */
- public BufferedLogger()
- {
- _sb = new StringBuffer();
- }
-
- /*---------------------------------------------------------------
- * Logger Methods
- *-------------------------------------------------------------*/
+ private final StringBuffer m_sb = new StringBuffer();
/**
* Log a debug message.
@@ -48,7 +31,7 @@
*/
public void debug( final String message )
{
- append( "DEBUG", message );
+ debug( message, null );
}
/**
@@ -79,7 +62,7 @@
*/
public void info( final String message )
{
- append( "INFO", message );
+ info( message, null );
}
/**
@@ -110,7 +93,7 @@
*/
public void warn( final String message )
{
- append( "WARN", message );
+ warn( message, null );
}
/**
@@ -141,7 +124,7 @@
*/
public void error( final String message )
{
- append( "ERROR", message );
+ error( message, null );
}
/**
@@ -172,7 +155,7 @@
*/
public void fatalError( final String message )
{
- append( "FATAL ERROR", message );
+ fatalError( message, null );
}
/**
@@ -208,67 +191,35 @@
return this;
}
- /*---------------------------------------------------------------
- * Public Methods
- *-------------------------------------------------------------*/
- private void append( final String message )
- {
- synchronized( _sb )
- {
- _sb.append( message );
- _sb.append( "\n" );
- }
- }
-
- private void append( final String level, final String message )
+ /**
+ * Returns the contents of the buffer.
+ *
+ * @return the buffer contents
+ *
+ */
+ public String toString()
{
- synchronized( _sb )
- {
- _sb.append( level );
- _sb.append( " - " );
- _sb.append( message );
- _sb.append( "\n" );
- }
+ return m_sb.toString();
}
private void append( final String level,
final String message,
final Throwable throwable )
{
- synchronized( _sb )
+ synchronized( m_sb )
{
- String tDump = null;
- final ByteArrayOutputStream ba = new ByteArrayOutputStream();
- final PrintStream ps = new PrintStream( ba );
+ m_sb.append( level );
+ m_sb.append( " - " );
+ m_sb.append( message );
- try
+ if( null != throwable )
{
- throwable.printStackTrace( ps );
-
- tDump = ba.toString();
+ final String stackTrace =
+ ExceptionUtil.printStackTrace( throwable );
+ m_sb.append( " : " );
+ m_sb.append( stackTrace );
}
- finally
- {
- ps.close();
- }
-
- _sb.append( level );
- _sb.append( " - " );
- _sb.append( message );
- _sb.append( " : " );
- _sb.append( tDump );
- _sb.append( "\n" );
+ m_sb.append( "\n" );
}
- }
-
- /**
- * Returns the contents of the buffer.
- *
- * @return the buffer contents
- *
- */
- public String toString()
- {
- return _sb.toString();
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>