Return-Path: <bodewig@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 51211 invoked by uid 500); 14 Sep 2000 14:13:44 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 51192 invoked by uid 1146); 14 Sep 2000 14:13:42 -0000
Date: 14 Sep 2000 14:13:42 -0000
Message-ID: <20000914141342.51191.qmail@locus.apache.org>
From: bodewig@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Echo.java

bodewig     00/09/14 07:13:41

  Modified:    docs     index.html
               src/main/org/apache/tools/ant/taskdefs Echo.java
  Log:
  Make <echo> accept #PCDATA.
  
  Revision  Changes    Path
  1.101     +8 -1      jakarta-ant/docs/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/index.html,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- index.html	2000/09/14 10:49:49	1.100
  +++ index.html	2000/09/14 14:13:35	1.101
  @@ -1442,11 +1442,18 @@
     <tr>
       <td valign="top">message</td>
       <td valign="top">the message to echo.</td>
  -    <td valign="top" align="center">Yes</td>
  +    <td valign="top" align="center">Yes, unless data is included in a
  +      character section within this element.</td>
     </tr>
   </table>
   <h3>Examples</h3>
   <pre>  &lt;echo message=&quot;Hello world&quot; /&gt;</pre>
  +<pre>  
  +&lt;echo&gt;
  +This is a longer message stretching over
  +two lines.
  +&lt;/echo&gt;
  +</pre>
   <hr>
   <h2><a name="exec">Exec</a></h2>
   <h3>Description</h3>
  
  
  
  1.3       +8 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Echo.java	2000/01/14 02:13:19	1.2
  +++ Echo.java	2000/09/14 14:13:39	1.3
  @@ -63,7 +63,7 @@
    * @author costin@dnt.ro
    */
   public class Echo extends Task {
  -    private String message; // required
  +    private String message = ""; // required
       
       /**
        * Does the work.
  @@ -81,5 +81,12 @@
        */
       public void setMessage(String msg) {
   	this.message = msg;
  +    }
  +
  +    /**
  +     * Set a multiline message.
  +     */
  +    public void addText(String msg) {
  +        message += msg;
       }
   }