Author: ceki Date: Tue Aug 11 23:19:41 2009 New Revision: 2444 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/AppenderFactory.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/SiftAction.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/AppenderFactory.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderFactoryBase.java Log: - removed unused fields. Curtesty of Sonar. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/AppenderFactory.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/AppenderFactory.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/AppenderFactory.java Tue Aug 11 23:19:41 2009 @@ -12,7 +12,6 @@ import java.util.List; import ch.qos.logback.access.spi.AccessEvent; -import ch.qos.logback.core.Context; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.sift.AppenderFactoryBase; import ch.qos.logback.core.sift.SiftingJoranConfiguratorBase; @@ -21,8 +20,8 @@ String keyName; - AppenderFactory(Context context, List<SaxEvent> eventList, String keyName) { - super(context, eventList); + AppenderFactory(List<SaxEvent> eventList, String keyName) { + super(eventList); this.keyName = keyName; } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/SiftAction.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/SiftAction.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/sift/SiftAction.java Tue Aug 11 23:19:41 2009 @@ -36,7 +36,7 @@ Object o = ec.peekObject(); if (o instanceof SiftingAppender) { SiftingAppender siftingAppender = (SiftingAppender) o; - AppenderFactory appenderFactory = new AppenderFactory(context, seList, siftingAppender.getDiscriminatorKey()); + AppenderFactory appenderFactory = new AppenderFactory(seList, siftingAppender.getDiscriminatorKey()); siftingAppender.setAppenderFactory(appenderFactory); } } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/AppenderFactory.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/AppenderFactory.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/AppenderFactory.java Tue Aug 11 23:19:41 2009 @@ -12,7 +12,6 @@ import java.util.List; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.Context; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.sift.AppenderFactoryBase; import ch.qos.logback.core.sift.SiftingJoranConfiguratorBase; @@ -21,8 +20,8 @@ String key; - AppenderFactory(Context context, List<SaxEvent> eventList, String key) { - super(context, eventList); + AppenderFactory(List<SaxEvent> eventList, String key) { + super(eventList); this.key = key; } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftAction.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftAction.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftAction.java Tue Aug 11 23:19:41 2009 @@ -27,7 +27,7 @@ Object o = ec.peekObject(); if (o instanceof SiftingAppender) { SiftingAppender sa = (SiftingAppender) o; - AppenderFactory appenderFactory = new AppenderFactory(context, seList, sa + AppenderFactory appenderFactory = new AppenderFactory(seList, sa .getDiscriminatorKey()); sa.setAppenderFactory(appenderFactory); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java Tue Aug 11 23:19:41 2009 @@ -20,7 +20,6 @@ final FileNamePattern fileNamePattern; final RollingCalendar rc; - int maxHistory; int periodOffset; final boolean parentClean; @@ -96,7 +95,6 @@ } public void setMaxHistory(int maxHistory) { - this.maxHistory = maxHistory; this.periodOffset = -maxHistory - 1; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderFactoryBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderFactoryBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/sift/AppenderFactoryBase.java Tue Aug 11 23:19:41 2009 @@ -20,10 +20,8 @@ public abstract class AppenderFactoryBase<E> { final List<SaxEvent> eventList; - Context context; - protected AppenderFactoryBase(Context context, List<SaxEvent> eventList) { - this.context = context; + protected AppenderFactoryBase(List<SaxEvent> eventList) { this.eventList = new ArrayList<SaxEvent>(eventList); removeHoardElement();