ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs PreSetDef.java
Date Tue, 23 Sep 2003 06:00:00 GMT
bodewig     2003/09/22 23:00:00

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        PreSetDef.java
  Log:
  Make PreSetDef compile
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.7.2.1   +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.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- PreSetDef.java	15 Sep 2003 16:55:01 -0000	1.7
  +++ PreSetDef.java	23 Sep 2003 06:00:00 -0000	1.7.2.1
  @@ -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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message