Author: jalkanen
Date: Sat Nov 29 15:14:11 2008
New Revision: 721737
URL: http://svn.apache.org/viewvc?rev=721737&view=rev
Log:
Refactored to conform to JSPWiki coding rules.
Removed incorrect javadocs.
Reduced number of log entries (JSPWiki has ~300 classes, so no need to reserve
1000 initial entries).
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java?rev=721737&r1=721736&r2=721737&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java Sat
Nov 29 15:14:11 2008
@@ -40,8 +40,7 @@
* <p>
* You can decide at runtime which logging framework to use by placing one of
* the slf4j wrapped implementations in WEB-INF/lib. By default, JSPWiki ships
- * with a log4j implementation. The factory keeps a HashMap of all registered
- * loggers to a maximum of 1000 Loggers. The static initializer calls the
+ * with a log4j implementation. The static initializer calls the
* SLF4JBridgeHandler.install() which is a jul handler, that routes all
incoming
* jul records to the slf4j API.
* </p>
@@ -51,13 +50,13 @@
*/
public class LoggerFactory
{
- private static boolean log4jPresent = true;
+ private static boolean c_log4jPresent = true;
public static final String SLF4J_LOG4J_ADAPTER_CLASS =
"org.slf4j.impl.Log4jLoggerAdapter";
public static final String LOG4J_LOGGER_CLASS = "org.apache.log4j.Logger";
- private static HashMap<String, LoggerImpl> registeredLoggers = new
HashMap<String, LoggerImpl>( 1000 );
+ private static HashMap<String, LoggerImpl> c_registeredLoggers = new
HashMap<String, LoggerImpl>( 200 );
static
{
@@ -70,17 +69,17 @@
*/
public static final synchronized Logger getLogger( String loggerName )
{
- if( registeredLoggers.get( loggerName ) == null )
+ if( c_registeredLoggers.get( loggerName ) == null )
{
LoggerImpl logger = new LoggerImpl( loggerName );
- registeredLoggers.put( loggerName, logger );
- if( log4jPresent )
+ c_registeredLoggers.put( loggerName, logger );
+ if( c_log4jPresent )
{
registerLoggerMBean( loggerName );
}
return logger;
}
- return registeredLoggers.get( loggerName );
+ return c_registeredLoggers.get( loggerName );
}
/**
@@ -129,7 +128,7 @@
{
// apparently we cannot find the slf4j log4j adapter, so we assume
there is no log4j
// available, so there is no use in registering MBeans
- log4jPresent = false;
+ c_log4jPresent = false;
System.out.println( "Could not find class "
+SLF4J_LOG4J_ADAPTER_CLASS + ", so no dynamic log configuration here :-(" );
}
catch( Exception e )
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java?rev=721737&r1=721736&r2=721737&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java Sat Nov
29 15:14:11 2008
@@ -30,73 +30,73 @@
*/
public class LoggerImpl implements com.ecyrd.jspwiki.log.Logger
{
- Logger slf4jLogger = null;
+ Logger m_slf4jLogger = null;
/**
* @param loggerName
*/
protected LoggerImpl( String loggerName )
{
- slf4jLogger = org.slf4j.LoggerFactory.getLogger( loggerName );
+ m_slf4jLogger = org.slf4j.LoggerFactory.getLogger( loggerName );
}
public void error( String string )
{
- slf4jLogger.error( string );
+ m_slf4jLogger.error( string );
}
public void warn( String string )
{
- slf4jLogger.warn( string );
+ m_slf4jLogger.warn( string );
}
public void info( String string )
{
- slf4jLogger.info( string );
+ m_slf4jLogger.info( string );
}
public void debug( String arg0 )
{
- slf4jLogger.debug( arg0 );
+ m_slf4jLogger.debug( arg0 );
}
public void error( String string, Throwable t )
{
- slf4jLogger.error( string, t );
+ m_slf4jLogger.error( string, t );
}
public void warn( String string, Throwable t )
{
- slf4jLogger.warn( string, t );
+ m_slf4jLogger.warn( string, t );
}
public void info( String string, Throwable t )
{
- slf4jLogger.info( string, t );
+ m_slf4jLogger.info( string, t );
}
public void debug( String string, Throwable t )
{
- slf4jLogger.debug( string, t );
+ m_slf4jLogger.debug( string, t );
}
public boolean isErrorEnabled()
{
- return slf4jLogger.isErrorEnabled();
+ return m_slf4jLogger.isErrorEnabled();
}
public boolean isWarnEnabled()
{
- return slf4jLogger.isWarnEnabled();
+ return m_slf4jLogger.isWarnEnabled();
}
public boolean isInfoEnabled()
{
- return slf4jLogger.isInfoEnabled();
+ return m_slf4jLogger.isInfoEnabled();
}
public boolean isDebugEnabled()
{
- return slf4jLogger.isDebugEnabled();
+ return m_slf4jLogger.isDebugEnabled();
}
}
