bodewig 2003/09/22 22:59:04
Modified: src/main/org/apache/tools/ant/taskdefs PreSetDef.java
Log:
Make PreSetDef compile
Revision Changes Path
1.8 +2 -26 ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
Index: PreSetDef.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PreSetDef.java 15 Sep 2003 16:55:01 -0000 1.7
+++ PreSetDef.java 23 Sep 2003 05:59:04 -0000 1.8
@@ -77,10 +77,9 @@
* @author Peter Reilly
* @since Ant 1.6
*/
-public class PreSetDef extends Task implements AntlibInterface,
TaskContainer {
+public class PreSetDef extends AntlibDefinition implements TaskContainer {
private UnknownElement nestedTask;
private String name;
- private String uri;
/**
* Name of the definition
@@ -89,29 +88,6 @@
public void setName(String name) {
this.name = name;
}
- /**
- * The URI for this definition.
- * @param uri the namespace URI
- * @throws BuildException if uri is not allowed
- */
- public void setURI(String uri) throws BuildException {
- if (uri.equals(ProjectHelper.ANT_CORE_URI)) {
- uri = "";
- }
- if (uri.startsWith("ant:")) {
- throw new BuildException("Attempt to use a reserved URI " + uri);
- }
- this.uri = uri;
- }
- /**
- * Set the class loader.
- * Not used
- * @param classLoader a <code>ClassLoader</code> value
- */
- public void setAntlibClassLoader(ClassLoader classLoader) {
- // Ignore
- }
-
/**
* Add a nested task to predefine attributes and elements on
@@ -140,7 +116,7 @@
throw new BuildException("Name not specified");
}
- name = ProjectHelper.genComponentName(uri, name);
+ name = ProjectHelper.genComponentName(getURI(), name);
ComponentHelper helper = ComponentHelper.getComponentHelper(
getProject());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
