ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc JavadocOutputStream.java
Date Sun, 30 Dec 2001 00:00:05 GMT
donaldp     01/12/29 16:00:05

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
                        JavadocOutputStream.java
  Log:
  Update to use new format of LogOutputStream where you pass in a Logger
  
  Revision  Changes    Path
  1.2       +13 -10    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/JavadocOutputStream.java
  
  Index: JavadocOutputStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/JavadocOutputStream.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavadocOutputStream.java	23 Dec 2001 06:55:55 -0000	1.1
  +++ JavadocOutputStream.java	30 Dec 2001 00:00:05 -0000	1.2
  @@ -10,30 +10,29 @@
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
  +import org.apache.avalon.framework.logger.Logger;
   
   class JavadocOutputStream
       extends LogOutputStream
   {
  -
  -    //
       // Override the logging of output in order to filter out Generating
       // messages.  Generating messages are set to a priority of VERBOSE
       // unless they appear after what could be an informational message.
       //
       private String m_queuedLine;
   
  -    JavadocOutputStream( Task javadoc, int level )
  +    JavadocOutputStream( final Logger logger, final boolean isError )
       {
  -        super( javadoc, level );
  +        super( logger, isError );
       }
   
  -    protected void processLine( String line, int messageLevel )
  +    protected void processLine( final String line )
       {
  -        if( messageLevel == Project.MSG_INFO && line.startsWith( "Generating "
) )
  +        if( !isError() && line.startsWith( "Generating " ) )
           {
               if( m_queuedLine != null )
               {
  -                super.processLine( m_queuedLine, Project.MSG_VERBOSE );
  +                getLogger().debug( m_queuedLine );
               }
               m_queuedLine = line;
           }
  @@ -42,12 +41,16 @@
               if( m_queuedLine != null )
               {
                   if( line.startsWith( "Building " ) )
  -                    super.processLine( m_queuedLine, Project.MSG_VERBOSE );
  +                {
  +                    getLogger().debug( m_queuedLine );
  +                }
                   else
  -                    super.processLine( m_queuedLine, Project.MSG_INFO );
  +                {
  +                    getLogger().info( m_queuedLine );
  +                }
                   m_queuedLine = null;
               }
  -            super.processLine( line, messageLevel );
  +            getLogger().warn( line );
           }
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message