cvs commit: ant/docs/manual/CoreTasks macrodef.html

[peterreilly]

peterreilly    2003/10/31 01:56:43

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        MacroDef.java
               docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
  Log:
  Merge with HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.7.2.4   +2 -3      ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -r1.7.2.3 -r1.7.2.4
  --- MacroDef.java     15 Oct 2003 07:40:32 -0000      1.7.2.3
  +++ MacroDef.java     31 Oct 2003 09:56:42 -0000      1.7.2.4
  @@ -96,12 +96,11 @@
        */
       public void addTask(Task nestedTask) {
           if (this.nestedTask != null) {
  -            throw new BuildException("Only one sequential/Parallel allowed");
  +            throw new BuildException("Only one sequential allowed");
           }
           UnknownElement ue = (UnknownElement) nestedTask;
           if (!ue.getNamespace().equals("")
  -            || (!ue.getTag().equals("sequential")
  -                && !ue.getTag().equals("parallel"))) {
  +            || !ue.getTag().equals("sequential")) {
               throw new BuildException("Unsupported tag " + ue.getQName());
           }
           this.nestedTask = ue;
  
  
  
  No                   revision
  No                   revision
  1.2.2.4   +2 -2      ant/docs/manual/CoreTasks/macrodef.html
  
  Index: macrodef.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/macrodef.html,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- macrodef.html     14 Oct 2003 09:59:49 -0000      1.2.2.3
  +++ macrodef.html     31 Oct 2003 09:56:42 -0000      1.2.2.4
  @@ -11,11 +11,11 @@
       <h2><a name="macrodef">MacroDef</a></h2>
       <h3>Description</h3>
       <p>
  -      This defines a new task using a &lt;sequential&gt; or &lt;parallel&gt;
  +      This defines a new task using a &lt;sequential&gt; 
         nested task as a template. Nested elements &lt;attribute&gt; and
         &lt;element&gt; are used to specify attributes and elements of
         the new task. These get substituted into the  &lt;sequential&gt;
  -      or &lt;parallel&gt; task when the new task is run.
  +      task when the new task is run.
       </p>
       <p>
         <em>since Ant 1.6</em>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]