You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2005/03/08 23:43:29 UTC

cvs commit: logging-chainsaw/src/java/org/apache/log4j/chainsaw ChainsawAppender.java ChainsawAppenderHandler.java

carnold     2005/03/08 14:43:29

  Modified:    src/java/org/apache/log4j/chainsaw ChainsawAppender.java
                        ChainsawAppenderHandler.java
  Log:
  Reversion of AppenderInterface per 2005-02-28 vote
  
  Revision  Changes    Path
  1.14      +3 -2      logging-chainsaw/src/java/org/apache/log4j/chainsaw/ChainsawAppender.java
  
  Index: ChainsawAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-chainsaw/src/java/org/apache/log4j/chainsaw/ChainsawAppender.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ChainsawAppender.java	18 Feb 2005 17:23:45 -0000	1.13
  +++ ChainsawAppender.java	8 Mar 2005 22:43:29 -0000	1.14
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 1999,2004 The Apache Software Foundation.
  + * Copyright 1999,2005 The Apache Software Foundation.
    * 
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -56,6 +56,7 @@
      * Constructor, initialises the singleton instance of the appender
      */
     public ChainsawAppender() {
  +    super(false);
       synchronized (ChainsawAppender.class) {
         if (sSharedAppender == null) {
           sSharedAppender = this;
  @@ -109,7 +110,7 @@
      * Instantiates and activates an instance of a ChainsawViewer
      * to view the contents of this appender.
      */
  -  public void activate() {
  +  public void activateOptions() {
       if (viewerClassname == null) {
         viewerClassname = "org.apache.log4j.chainsaw.DefaultViewer";
       }
  
  
  
  1.28      +4 -9      logging-chainsaw/src/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java
  
  Index: ChainsawAppenderHandler.java
  ===================================================================
  RCS file: /home/cvs/logging-chainsaw/src/java/org/apache/log4j/chainsaw/ChainsawAppenderHandler.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ChainsawAppenderHandler.java	18 Feb 2005 17:23:45 -0000	1.27
  +++ ChainsawAppenderHandler.java	8 Mar 2005 22:43:29 -0000	1.28
  @@ -43,7 +43,7 @@
    */
   public class ChainsawAppenderHandler extends AppenderSkeleton {
     private static final String DEFAULT_IDENTIFIER = "Unknown";
  -  private WorkQueue worker;
  +  private WorkQueue worker = new WorkQueue();
     private final Object mutex = new Object();
     private int sleepInterval = 1000;
     private EventListenerList listenerList = new EventListenerList();
  @@ -55,13 +55,13 @@
         this);
     private Map customExpressionRules = new HashMap();
   
  -  public ChainsawAppenderHandler(ChainsawAppender appender) {
  +  public ChainsawAppenderHandler(final ChainsawAppender appender) {
  +    super(true);
       appender.setAppender(this);
  -    activate();
     }
   
     public ChainsawAppenderHandler() {
  -    activate();
  +    super(true);
     }
   
     public void setIdentifierExpression(String identifierExpression) {
  @@ -95,11 +95,6 @@
   
     public void close() {}
   
  -  public void activate() {
  -    worker = new WorkQueue();
  -    super.activate();
  -  }
  -
     public boolean requiresLayout() {
       return false;
     }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org