Browse Source

Commented out use of IntrospectionHelper as that violates Container-task relationship. WIll need to be reworked significantly in Ant2.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270192 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
2bbab902a5
2 changed files with 8 additions and 18 deletions
  1. +4
    -9
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
  2. +4
    -9
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java

+ 4
- 9
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java View File

@@ -16,12 +16,8 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Vector;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.IntrospectionHelper;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.types.EnumeratedAttribute;


/** /**
* Creates a partial DTD for Ant from the currently known tasks. * Creates a partial DTD for Ant from the currently known tasks.
@@ -170,6 +166,7 @@ public class AntStructure extends Task
} }
visited.put( name, "" ); visited.put( name, "" );


/*
IntrospectionHelper ih = null; IntrospectionHelper ih = null;
try try
{ {
@@ -177,11 +174,8 @@ public class AntStructure extends Task
} }
catch( Throwable t ) catch( Throwable t )
{ {
/*
* XXX - failed to load the class properly.
*
* should we print a warning here?
*/
// FIXME: failed to load the class properly.
// should we print a warning here?
return; return;
} }


@@ -318,6 +312,7 @@ public class AntStructure extends Task
printElementDecl( out, nestedName, ih.getElementType( nestedName ) ); printElementDecl( out, nestedName, ih.getElementType( nestedName ) );
} }
} }
*/
} }


private void printHead( PrintWriter out, Enumeration tasks, private void printHead( PrintWriter out, Enumeration tasks,


+ 4
- 9
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java View File

@@ -16,12 +16,8 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Vector;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.IntrospectionHelper;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.types.EnumeratedAttribute;


/** /**
* Creates a partial DTD for Ant from the currently known tasks. * Creates a partial DTD for Ant from the currently known tasks.
@@ -170,6 +166,7 @@ public class AntStructure extends Task
} }
visited.put( name, "" ); visited.put( name, "" );


/*
IntrospectionHelper ih = null; IntrospectionHelper ih = null;
try try
{ {
@@ -177,11 +174,8 @@ public class AntStructure extends Task
} }
catch( Throwable t ) catch( Throwable t )
{ {
/*
* XXX - failed to load the class properly.
*
* should we print a warning here?
*/
// FIXME: failed to load the class properly.
// should we print a warning here?
return; return;
} }


@@ -318,6 +312,7 @@ public class AntStructure extends Task
printElementDecl( out, nestedName, ih.getElementType( nestedName ) ); printElementDecl( out, nestedName, ih.getElementType( nestedName ) );
} }
} }
*/
} }


private void printHead( PrintWriter out, Enumeration tasks, private void printHead( PrintWriter out, Enumeration tasks,


Loading…
Cancel
Save