mcconnell 2003/02/04 22:15:14
Modified: src/java/org/apache/log Logger.java LogEvent.java
Hierarchy.java ContextMap.java
Log:
Checkstyle corrections and javadoc additions.
Revision Changes Path
1.35 +8 -4 jakarta-avalon-logkit/src/java/org/apache/log/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-logkit/src/java/org/apache/log/Logger.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Logger.java 3 Feb 2003 19:36:54 -0000 1.34
+++ Logger.java 5 Feb 2003 06:15:13 -0000 1.35
@@ -59,16 +59,19 @@
/**
* The object interacted with by client objects to perform logging.
*
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Avalon Development
Team</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
*/
public class Logger
{
private static final Logger[] EMPTY_SET = new Logger[ 0 ];
- ///Separator character use to separate different categories
+ /**
+ * Separator character use to separate different categories
+ */
public static final char CATEGORY_SEPARATOR = '.';
- ///The ErrorHandler associated with Logger
+ // The ErrorHandler associated with Logger
private final ErrorHandler m_errorHandler;
///The ErrorHandler associated with Logger
@@ -181,6 +184,7 @@
* Log a info priority event.
*
* @param message the message
+ * @param throwable the throwable
*/
public final void info( final String message, final Throwable throwable )
{
@@ -341,8 +345,8 @@
/**
* Log a event at specific priority with a certain message and throwable.
*
- * @param message the message
* @param priority the priority
+ * @param message the message
* @param throwable the throwable
*/
public final void log( final Priority priority,
@@ -358,8 +362,8 @@
/**
* Log a event at specific priority with a certain message.
*
- * @param message the message
* @param priority the priority
+ * @param message the message
*/
public final void log( final Priority priority, final String message )
{
1.13 +9 -2 jakarta-avalon-logkit/src/java/org/apache/log/LogEvent.java
Index: LogEvent.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-logkit/src/java/org/apache/log/LogEvent.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LogEvent.java 3 Feb 2003 17:40:12 -0000 1.12
+++ LogEvent.java 5 Feb 2003 06:15:14 -0000 1.13
@@ -62,6 +62,7 @@
* LogEvents usually originate at a Logger and are routed
* to LogTargets.
*
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Avalon Development
Team</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
*/
public final class LogEvent
@@ -257,8 +258,14 @@
private Object readResolve()
throws ObjectStreamException
{
- if( null == m_category ) m_category = "";
- if( null == m_message ) m_message = "";
+ if( null == m_category )
+ {
+ m_category = "";
+ }
+ if( null == m_message )
+ {
+ m_message = "";
+ }
String priorityName = "";
if( null != m_priority )
1.21 +4 -3 jakarta-avalon-logkit/src/java/org/apache/log/Hierarchy.java
Index: Hierarchy.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-logkit/src/java/org/apache/log/Hierarchy.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Hierarchy.java 3 Feb 2003 19:36:54 -0000 1.20
+++ Hierarchy.java 5 Feb 2003 06:15:14 -0000 1.21
@@ -63,14 +63,15 @@
* This class encapsulates a basic independent log hierarchy.
* The hierarchy is essentially a safe wrapper around root logger.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Avalon Development
Team</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
*/
public class Hierarchy
{
///Format of default formatter
private static final String FORMAT =
- "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}]
(%{context}): " +
- "%{message}\n%{throwable}";
+ "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS} [%8.8{category}]
(%{context}): "
+ + "%{message}\n%{throwable}";
///The instance of default hierarchy
private static final Hierarchy c_hierarchy = new Hierarchy();
1.12 +5 -0 jakarta-avalon-logkit/src/java/org/apache/log/ContextMap.java
Index: ContextMap.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-logkit/src/java/org/apache/log/ContextMap.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ContextMap.java 3 Feb 2003 17:40:12 -0000 1.11
+++ ContextMap.java 5 Feb 2003 06:15:14 -0000 1.12
@@ -74,6 +74,7 @@
* The context is bound to a thread (and inherited by sub-threads) but
* it can also be added to by LogTargets.
*
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Avalon Development
Team</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
*/
public final class ContextMap
@@ -198,9 +199,13 @@
final Object object = get( key );
if( null != object )
+ {
return object;
+ }
else
+ {
return defaultObject;
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
