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/types PatternSet.java
Date Sun, 30 Dec 2001 00:50:33 GMT
donaldp     01/12/29 16:50:33

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Input.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
                        Javadoc.java
               proposal/myrmidon/src/main/org/apache/tools/ant/types
                        PatternSet.java
  Log:
  Removed uneeded property expansion
  
  Revision  Changes    Path
  1.11      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
  
  Index: Input.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Input.java	30 Dec 2001 00:38:44 -0000	1.10
  +++ Input.java	30 Dec 2001 00:50:33 -0000	1.11
  @@ -88,7 +88,7 @@
       public void addContent( String msg )
           throws TaskException
       {
  -        message += getProject().replaceProperties( msg );
  +        message = msg;
       }
   
       /**
  
  
  
  1.6       +5 -17     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Javadoc.java	30 Dec 2001 00:38:44 -0000	1.5
  +++ Javadoc.java	30 Dec 2001 00:50:33 -0000	1.6
  @@ -571,22 +571,22 @@
           if( m_doctitle != null )
           {
               m_command.createArgument().setValue( "-doctitle" );
  -            m_command.createArgument().setValue( expand( m_doctitle.getText() ) );
  +            m_command.createArgument().setValue( m_doctitle.getText() );
           }
           if( m_header != null )
           {
               m_command.createArgument().setValue( "-header" );
  -            m_command.createArgument().setValue( expand( m_header.getText() ) );
  +            m_command.createArgument().setValue( m_header.getText() );
           }
           if( m_footer != null )
           {
               m_command.createArgument().setValue( "-footer" );
  -            m_command.createArgument().setValue( expand( m_footer.getText() ) );
  +            m_command.createArgument().setValue( m_footer.getText() );
           }
           if( m_bottom != null )
           {
               m_command.createArgument().setValue( "-bottom" );
  -            m_command.createArgument().setValue( expand( m_bottom.getText() ) );
  +            m_command.createArgument().setValue( m_bottom.getText() );
           }
   
           Commandline toExecute = (Commandline)m_command.clone();
  @@ -739,7 +739,7 @@
                           throw new TaskException( "The title and packages must be specified
for group elements." );
                       }
                       toExecute.createArgument().setValue( "-group" );
  -                    toExecute.createArgument().setValue( expand( title ) );
  +                    toExecute.createArgument().setValue( title );
                       toExecute.createArgument().setValue( packages );
                   }
               }
  @@ -884,18 +884,6 @@
               {
               }
           }
  -    }
  -
  -    /**
  -     * Convenience method to expand properties.
  -     *
  -     * @param content Description of Parameter
  -     * @return Description of the Returned Value
  -     */
  -    protected String expand( String content )
  -        throws TaskException
  -    {
  -        return getProject().replaceProperties( content );
       }
   
       private String getJavadocExecutableName()
  
  
  
  1.7       +0 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/PatternSet.java
  
  Index: PatternSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/PatternSet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PatternSet.java	23 Dec 2001 06:32:48 -0000	1.6
  +++ PatternSet.java	30 Dec 2001 00:50:33 -0000	1.7
  @@ -468,8 +468,6 @@
        * inner class to hold a name on list. "If" and "Unless" attributes may be
        * used to invalidate the entry based on the existence of a property
        * (typically set thru the use of the Available task).
  -     *
  -     * @author RT
        */
       public class NameEntry
       {
  
  
  

--
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