[slf4j-dev] svn commit: r524 - in slf4j/trunk: src/java/org/slf4j/impl tests/src/java/org/slf4j/impl

[ceki at slf4j.org]

Author: ceki
Date: Thu Jan 26 14:15:55 2006
New Revision: 524

Added:
   slf4j/trunk/src/java/org/slf4j/impl/MarkerIgnoringAdapterBase.java
      - copied, changed from r520, slf4j/trunk/src/java/org/slf4j/impl/WrappingLoggerAdapter.java
Removed:
   slf4j/trunk/src/java/org/slf4j/impl/WrappingLoggerAdapter.java
Modified:
   slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java
   slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java
   slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java
   slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java
   slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java
   slf4j/trunk/tests/src/java/org/slf4j/impl/XLogger.java
Log:

Renamed WrappingLoggerAdapter as MarkerIgnoringAdapterBase because this class 
can be used for direct implementations as well as wrapped implementations.

Modified: slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java	(original)
+++ slf4j/trunk/src/java/org/slf4j/impl/JCLLoggerAdapter.java	Thu Jan 26 14:15:55 2006
@@ -43,7 +43,7 @@
  * 
  * @author Ceki Gülcü
  */
-public final class JCLLoggerAdapter extends WrappingLoggerAdapter {
+public final class JCLLoggerAdapter extends MarkerIgnoringAdapterBase {
   final Log log;
   final String name;
   

Modified: slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java	(original)
+++ slf4j/trunk/src/java/org/slf4j/impl/JDK14LoggerAdapter.java	Thu Jan 26 14:15:55 2006
@@ -45,7 +45,7 @@
  * 
  * @author Ceki Gülcü
  */
-public final class JDK14LoggerAdapter extends WrappingLoggerAdapter {
+public final class JDK14LoggerAdapter extends MarkerIgnoringAdapterBase {
   final java.util.logging.Logger logger;
 
   // WARN: JDK14LoggerAdapter constructor should have only package access so that

Modified: slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java	(original)
+++ slf4j/trunk/src/java/org/slf4j/impl/Log4jLoggerAdapter.java	Thu Jan 26 14:15:55 2006
@@ -46,7 +46,7 @@
 
  * @author Ceki Gülcü
  */
-public final class Log4jLoggerAdapter extends WrappingLoggerAdapter {
+public final class Log4jLoggerAdapter extends MarkerIgnoringAdapterBase {
   final org.apache.log4j.Logger logger;
   
   /**

Copied: slf4j/trunk/src/java/org/slf4j/impl/MarkerIgnoringAdapterBase.java (from r520, slf4j/trunk/src/java/org/slf4j/impl/WrappingLoggerAdapter.java)
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/WrappingLoggerAdapter.java	(original)
+++ slf4j/trunk/src/java/org/slf4j/impl/MarkerIgnoringAdapterBase.java	Thu Jan 26 14:15:55 2006
@@ -13,7 +13,7 @@
  * 
  * @author Ceki Gulcu
  */
-abstract class WrappingLoggerAdapter implements Logger {
+abstract class MarkerIgnoringAdapterBase implements Logger {
 
   public boolean isDebugEnabled(Marker marker) {
     return isDebugEnabled();

Modified: slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java	(original)
+++ slf4j/trunk/src/java/org/slf4j/impl/NOPLogger.java	Thu Jan 26 14:15:55 2006
@@ -41,7 +41,7 @@
  *
  * @author Ceki Gülcü
  */
-public class NOPLogger extends WrappingLoggerAdapter {
+public class NOPLogger extends MarkerIgnoringAdapterBase {
   /**
    * The unique instance of NOPLogger.
    */

Modified: slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java
==============================================================================
--- slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java	(original)
+++ slf4j/trunk/src/java/org/slf4j/impl/SimpleLogger.java	Thu Jan 26 14:15:55 2006
@@ -58,7 +58,7 @@
  *
  * @author Ceki Gülcü
  */
-public class SimpleLogger extends WrappingLoggerAdapter {
+public class SimpleLogger extends MarkerIgnoringAdapterBase {
   /**
    * Mark the time when this class gets loaded into memory.
    */

Modified: slf4j/trunk/tests/src/java/org/slf4j/impl/XLogger.java
==============================================================================
--- slf4j/trunk/tests/src/java/org/slf4j/impl/XLogger.java	(original)
+++ slf4j/trunk/tests/src/java/org/slf4j/impl/XLogger.java	Thu Jan 26 14:15:55 2006
@@ -32,13 +32,10 @@
 
 package org.slf4j.impl;
 
-import org.slf4j.Logger;
-
-
 /**
  * A NOP Logger implementation.
  */
-public class XLogger extends WrappingLoggerAdapter {
+public class XLogger extends MarkerIgnoringAdapterBase {
 
   /**
    * The unique instance of NOPLogger.