Browse Source

Name is optional for <project>

PR: 5028

Submitted by: jesse.glick@netbeans.com (Jesse Glick)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271052 13f79535-47bb-0310-9956-ffa450edef68
master
Magesh Umasankar 23 years ago
parent
commit
00013b4e5c
1 changed files with 16 additions and 16 deletions
  1. +16
    -16
      src/main/org/apache/tools/ant/taskdefs/AntStructure.java

+ 16
- 16
src/main/org/apache/tools/ant/taskdefs/AntStructure.java View File

@@ -104,7 +104,7 @@ public class AntStructure extends Task {
if (output == null) { if (output == null) {
throw new BuildException("output attribute is required", location); throw new BuildException("output attribute is required", location);
} }
PrintWriter out = null; PrintWriter out = null;
try { try {
try { try {
@@ -118,8 +118,8 @@ public class AntStructure extends Task {
*/ */
out = new PrintWriter(new FileWriter(output)); out = new PrintWriter(new FileWriter(output));
} }
printHead(out, project.getTaskDefinitions().keys(),
printHead(out, project.getTaskDefinitions().keys(),
project.getDataTypeDefinitions().keys()); project.getDataTypeDefinitions().keys());


printTargetDecl(out); printTargetDecl(out);
@@ -127,14 +127,14 @@ public class AntStructure extends Task {
Enumeration dataTypes = project.getDataTypeDefinitions().keys(); Enumeration dataTypes = project.getDataTypeDefinitions().keys();
while (dataTypes.hasMoreElements()) { while (dataTypes.hasMoreElements()) {
String typeName = (String) dataTypes.nextElement(); String typeName = (String) dataTypes.nextElement();
printElementDecl(out, typeName,
printElementDecl(out, typeName,
(Class) project.getDataTypeDefinitions().get(typeName)); (Class) project.getDataTypeDefinitions().get(typeName));
} }
Enumeration tasks = project.getTaskDefinitions().keys(); Enumeration tasks = project.getTaskDefinitions().keys();
while (tasks.hasMoreElements()) { while (tasks.hasMoreElements()) {
String taskName = (String) tasks.nextElement(); String taskName = (String) tasks.nextElement();
printElementDecl(out, taskName,
printElementDecl(out, taskName,
(Class) project.getTaskDefinitions().get(taskName)); (Class) project.getTaskDefinitions().get(taskName));
} }


@@ -150,7 +150,7 @@ public class AntStructure extends Task {
} }
} }


private void printHead(PrintWriter out, Enumeration tasks,
private void printHead(PrintWriter out, Enumeration tasks,
Enumeration types) { Enumeration types) {
out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"); out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
out.println("<!ENTITY % boolean \"(true|false|on|off|yes|no)\">"); out.println("<!ENTITY % boolean \"(true|false|on|off|yes|no)\">");
@@ -180,12 +180,12 @@ public class AntStructure extends Task {
out.println("\">"); out.println("\">");


out.println(""); out.println("");
out.print("<!ELEMENT project (target | property | taskdef | "); out.print("<!ELEMENT project (target | property | taskdef | ");
out.print(TYPES); out.print(TYPES);
out.println(")*>"); out.println(")*>");
out.println("<!ATTLIST project"); out.println("<!ATTLIST project");
out.println(" name CDATA #REQUIRED");
out.println(" name CDATA #IMPLIED");
out.println(" default CDATA #REQUIRED"); out.println(" default CDATA #REQUIRED");
out.println(" basedir CDATA #IMPLIED>"); out.println(" basedir CDATA #IMPLIED>");
out.println(""); out.println("");
@@ -209,7 +209,7 @@ public class AntStructure extends Task {
out.println(""); out.println("");
} }


private void printElementDecl(PrintWriter out, String name, Class element)
private void printElementDecl(PrintWriter out, String name, Class element)
throws BuildException { throws BuildException {


if (visited.containsKey(name)) { if (visited.containsKey(name)) {
@@ -278,24 +278,24 @@ public class AntStructure extends Task {
sb.setLength(0); sb.setLength(0);
sb.append("<!ATTLIST ").append(name); sb.append("<!ATTLIST ").append(name);
sb.append(lSep).append(" id ID #IMPLIED"); sb.append(lSep).append(" id ID #IMPLIED");
enum = ih.getAttributes(); enum = ih.getAttributes();
while (enum.hasMoreElements()) { while (enum.hasMoreElements()) {
String attrName = (String) enum.nextElement(); String attrName = (String) enum.nextElement();
if ("id".equals(attrName)) { if ("id".equals(attrName)) {
continue; continue;
} }
sb.append(lSep).append(" ").append(attrName).append(" "); sb.append(lSep).append(" ").append(attrName).append(" ");
Class type = ih.getAttributeType(attrName); Class type = ih.getAttributeType(attrName);
if (type.equals(java.lang.Boolean.class) ||
if (type.equals(java.lang.Boolean.class) ||
type.equals(java.lang.Boolean.TYPE)) { type.equals(java.lang.Boolean.TYPE)) {
sb.append(BOOLEAN).append(" "); sb.append(BOOLEAN).append(" ");
} else if (org.apache.tools.ant.types.Reference.class.isAssignableFrom(type)) {
} else if (org.apache.tools.ant.types.Reference.class.isAssignableFrom(type)) {
sb.append("IDREF "); sb.append("IDREF ");
} else if (org.apache.tools.ant.types.EnumeratedAttribute.class.isAssignableFrom(type)) { } else if (org.apache.tools.ant.types.EnumeratedAttribute.class.isAssignableFrom(type)) {
try { try {
EnumeratedAttribute ea =
EnumeratedAttribute ea =
(EnumeratedAttribute)type.newInstance(); (EnumeratedAttribute)type.newInstance();
String[] values = ea.getValues(); String[] values = ea.getValues();
if (values == null if (values == null
@@ -336,7 +336,7 @@ public class AntStructure extends Task {
} }
} }
} }
private void printTail(PrintWriter out) {} private void printTail(PrintWriter out) {}


/** /**


Loading…
Cancel
Save