Author: seb Date: Wed Dec 6 19:14:28 2006 New Revision: 1069 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ListAppender.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java Log: Moved getter and setter for layout to AppenderBase. Removed unused methods from subclasses Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/AppenderBase.java Wed Dec 6 19:14:28 2006 @@ -129,4 +129,11 @@ public FilterReply getFilterChainDecision(Object event) { return fai.getFilterChainDecision(event); } + + public Layout getLayout() { + return null; + } + + public void setLayout(Layout layout) { + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Wed Dec 6 19:14:28 2006 @@ -19,7 +19,6 @@ import java.sql.Statement; import ch.qos.logback.core.AppenderBase; -import ch.qos.logback.core.Layout; import ch.qos.logback.core.db.dialect.DBUtil; import ch.qos.logback.core.db.dialect.SQLDialect; @@ -159,12 +158,4 @@ public void stop() { super.stop(); } - - public Layout getLayout() { - return null; - } - - public void setLayout(Layout layout) { - } - } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java Wed Dec 6 19:14:28 2006 @@ -17,7 +17,6 @@ import java.net.Socket; import ch.qos.logback.core.AppenderBase; -import ch.qos.logback.core.Layout; /** * @@ -251,13 +250,6 @@ return reconnectionDelay; } - public Layout getLayout() { - return null; - } - - public void setLayout(Layout layout) { - } - /** * The Connector will reconnect when the server becomes available again. It * does this by attempting to open a new connection every Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/CyclicBufferAppender.java Wed Dec 6 19:14:28 2006 @@ -10,7 +10,6 @@ package ch.qos.logback.core.read; import ch.qos.logback.core.AppenderBase; -import ch.qos.logback.core.Layout; import ch.qos.logback.core.helpers.CyclicBuffer; /** @@ -59,13 +58,6 @@ } } - public Layout getLayout() { - return null; - } - - public void setLayout(Layout layout) { - } - /** * Set the size of the cyclic buffer. */ Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ListAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ListAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/read/ListAppender.java Wed Dec 6 19:14:28 2006 @@ -13,7 +13,6 @@ import java.util.List; import ch.qos.logback.core.AppenderBase; -import ch.qos.logback.core.Layout; public class ListAppender extends AppenderBase { @@ -23,12 +22,4 @@ protected void append(Object o) { list.add(o); } - - public void setLayout(Layout layout) { - } - - public Layout getLayout() { - return null; - } - } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/NOPAppender.java Wed Dec 6 19:14:28 2006 @@ -1,19 +1,10 @@ package ch.qos.logback.core.appender; import ch.qos.logback.core.AppenderBase; -import ch.qos.logback.core.Layout; public class NOPAppender extends AppenderBase { @Override protected void append(Object eventObject) { } - - public Layout getLayout() { - return null; - } - - public void setLayout(Layout layout) { - } - }