cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners ClassicProjectListener.java DefaultProjectListener.java

[do...@apache.org]

donaldp     01/12/15 21:26:17

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/listeners
                        DefaultProjectListener.java
  Added:       proposal/myrmidon/src/java/org/apache/myrmidon/listeners
                        ClassicProjectListener.java
  Log:
  Update Listeners so that the default listener is like the NoBannerLogger from Ant1.x while the classic is like ants current default.
  
  Revision  Changes    Path
  1.4       +8 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java
  
  Index: DefaultProjectListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultProjectListener.java	2001/12/16 05:19:35	1.3
  +++ DefaultProjectListener.java	2001/12/16 05:26:16	1.4
  @@ -18,6 +18,7 @@
       extends AbstractProjectListener
   {
       private String        m_prefix;
  +    private String        m_targetName;
   
       /**
        * Notify listener of targetStarted event.
  @@ -26,7 +27,7 @@
        */
       public void targetStarted( final String targetName )
       {
  -        output( targetName + ":\n" );
  +        m_targetName = targetName;
       }
   
       /**
  @@ -76,6 +77,12 @@
        */
       protected void output( final String data )
       {
  +        if( null != m_targetName )
  +        {
  +            output( m_targetName + ":\n" );
  +            m_targetName = null;
  +        }
  +
           if( null != getPrefix() ) System.out.println( "\t[" + getPrefix() + "] " + data );
           else System.out.println( data );
       }
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ClassicProjectListener.java
  
  Index: ClassicProjectListener.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE file.
   */
  package org.apache.myrmidon.listeners;
  
  import org.apache.avalon.framework.ExceptionUtil;
  
  /**
   * Default listener that emulates the old ant listener notifications.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   */
  public class ClassicProjectListener
      extends AbstractProjectListener
  {
      private String        m_prefix;
  
      /**
       * Notify listener of targetStarted event.
       *
       * @param targetName the name of target
       */
      public void targetStarted( final String targetName )
      {
          output( targetName + ":\n" );
      }
  
      /**
       * Notify listener of taskStarted event.
       *
       * @param taskName the name of task
       */
      public void taskStarted( final String taskName )
      {
          setPrefix( taskName );
      }
  
      /**
       * Notify listener of taskFinished event.
       */
      public void taskFinished()
      {
          setPrefix( null );
      }
  
      /**
       * Notify listener of log message event.
       *
       * @param message the message
       */
      public void log( String message )
      {
          output( message );
      }
  
      /**
       * Notify listener of log message event.
       *
       * @param message the message
       * @param throwable the throwable
       */
      public void log( String message, Throwable throwable )
      {
          output( message + "\n" + ExceptionUtil.printStackTrace( throwable, 5, true ) );
      }
  
      /**
       * Utility class to output data.
       * Overide in sub-classes to direct to a different destination.
       *
       * @param data the data
       */
      protected void output( final String data )
      {
          if( null != getPrefix() ) System.out.println( "\t[" + getPrefix() + "] " + data );
          else System.out.println( data );
      }
  
      protected final String getPrefix()
      {
          return m_prefix;
      }
  
      protected final void setPrefix( final String prefix )
      {
          m_prefix = prefix;
      }
  }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>