Removed uneeded property expansion

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270438 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java

@@ -88,7 +88,7 @@ public class Input extends Task
     public void addContent( String msg )
         throws TaskException
     {
-        message += getProject().replaceProperties( msg );
+        message = msg;
     }
 
     /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java

@@ -571,22 +571,22 @@ public class Javadoc
         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 @@ public class Javadoc
                         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 );
                 }
             }
@@ -886,18 +886,6 @@ public class Javadoc
         }
     }
 
-    /**
-     * 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()
     {
         // This is the most common extension case - exe for windows and OS/2,

proposal/myrmidon/src/main/org/apache/tools/ant/types/PatternSet.java

@@ -468,8 +468,6 @@ public class PatternSet extends DataType
      * 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
     {

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java

@@ -88,7 +88,7 @@ public class Input extends Task
     public void addContent( String msg )
         throws TaskException
     {
-        message += getProject().replaceProperties( msg );
+        message = msg;
     }
 
     /**

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java

@@ -571,22 +571,22 @@ public class Javadoc
         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 @@ public class Javadoc
                         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 );
                 }
             }
@@ -886,18 +886,6 @@ public class Javadoc
         }
     }
 
-    /**
-     * 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()
     {
         // This is the most common extension case - exe for windows and OS/2,

proposal/myrmidon/src/todo/org/apache/tools/ant/types/PatternSet.java

@@ -468,8 +468,6 @@ public class PatternSet extends DataType
      * 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
     {