peterreilly 2004/01/08 09:35:44
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
MacroDef.java
docs/manual/CoreTasks Tag: ANT_16_BRANCH macrodef.html
Log:
sync with head
Revision Changes Path
No revision
No revision
1.7.2.9 +33 -0 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.8
retrieving revision 1.7.2.9
diff -u -r1.7.2.8 -r1.7.2.9
--- MacroDef.java 22 Dec 2003 10:08:58 -0000 1.7.2.8
+++ MacroDef.java 8 Jan 2004 17:35:44 -0000 1.7.2.9
@@ -283,6 +283,7 @@
public static class Attribute {
private String name;
private String defaultValue;
+ private String description;
/**
* The name of the attribute.
@@ -322,6 +323,21 @@
}
/**
+ * @param desc Description of the element.
+ */
+ public void setDescription(String desc) {
+ description = desc;
+ }
+
+ /**
+ * @return the description of the element, or <code>null</code> if
+ * no description is available.
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
* equality method
*
* @param obj an <code>Object</code> value
@@ -367,6 +383,8 @@
public static class TemplateElement {
private String name;
private boolean optional = false;
+ private String description;
+
/**
* The name of the element.
*
@@ -402,6 +420,21 @@
*/
public boolean isOptional() {
return optional;
+ }
+
+ /**
+ * @param desc Description of the element.
+ */
+ public void setDescription(String desc) {
+ description = desc;
+ }
+
+ /**
+ * @return the description of the element, or <code>null</code> if
+ * no description is available.
+ */
+ public String getDescription() {
+ return description;
}
/**
No revision
No revision
1.2.2.7 +15 -0 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.6
retrieving revision 1.2.2.7
diff -u -r1.2.2.6 -r1.2.2.7
--- macrodef.html 22 Dec 2003 10:08:58 -0000 1.2.2.6
+++ macrodef.html 8 Jan 2004 17:35:44 -0000 1.2.2.7
@@ -85,6 +85,13 @@
</td>
<td valign="top" align="center">No</td>
</tr>
+ <tr>
+ <td valign="top">description</td>
+ <td valign="top">
+ This contains a description of the attribute.
+ </td>
+ <td valign="top" align="center">No</td>
+ </tr>
</table>
<h4>element</h4>
<p>
@@ -110,6 +117,14 @@
If true this nested element is optional. Default is
false - i.e the nested element is required in
the new task.
+ </td>
+ <td valign="top" align="center">No</td>
+ </tr>
+ <tr>
+ <td valign="top">description</td>
+ <td valign="top">
+ This contains a description
+ informing the user what the contents of the element are expected
to be.
</td>
<td valign="top" align="center">No</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
