ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs Property.java
Date Sun, 16 Dec 2001 04:26:06 GMT
donaldp     01/12/15 20:26:06

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant
                        RuntimeConfigurable.java Task.java
                        UnknownElement.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Property.java
  Log:
  No need for tasks to know about their wrappers - thats a concern of the container.
  
  Revision  Changes    Path
  1.4       +0 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java
  
  Index: RuntimeConfigurable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RuntimeConfigurable.java	2001/12/16 01:01:19	1.3
  +++ RuntimeConfigurable.java	2001/12/16 04:26:05	1.4
  @@ -125,8 +125,6 @@
               if( child.wrappedObject instanceof Task )
               {
                   Task childTask = (Task)child.wrappedObject;
  -                childTask.setRuntimeConfigurableWrapper( child );
  -                childTask.maybeConfigure();
               }
               else
               {
  
  
  
  1.6       +0 -25     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Task.java	2001/12/16 04:11:56	1.5
  +++ Task.java	2001/12/16 04:26:05	1.6
  @@ -16,7 +16,6 @@
       protected Target target;
       protected String description;
       protected String taskType;
  -    protected RuntimeConfigurable wrapper;
   
       /**
        * Sets a description of the current action. It will be usefull in
  @@ -53,21 +52,6 @@
       {
           return target;
       }
  -
  -    /**
  -     * Returns the wrapper class for runtime configuration.
  -     *
  -     * @return The RuntimeConfigurableWrapper value
  -     */
  -    public RuntimeConfigurable getRuntimeConfigurableWrapper()
  -    {
  -        if( wrapper == null )
  -        {
  -            wrapper = new RuntimeConfigurable( this, getName() );
  -        }
  -        return wrapper;
  -    }
  -
       /**
        * Perform this task
        */
  @@ -146,15 +130,6 @@
       public void maybeConfigure()
           throws TaskException
       {
  -        if( wrapper != null )
  -        {
  -            wrapper.maybeConfigure( project );
  -        }
  -    }
  -
  -    protected void setRuntimeConfigurableWrapper( RuntimeConfigurable wrapper )
  -    {
  -        this.wrapper = wrapper;
       }
   
       protected void handleErrorOutput( String line )
  
  
  
  1.5       +0 -23     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
  
  Index: UnknownElement.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UnknownElement.java	2001/12/16 04:12:39	1.4
  +++ UnknownElement.java	2001/12/16 04:26:05	1.5
  @@ -103,25 +103,6 @@
       public void maybeConfigure()
           throws TaskException
       {
  -        realThing = makeObject( this, wrapper );
  -
  -        wrapper.setProxy( realThing );
  -        if( realThing instanceof Task )
  -        {
  -            ( (Task)realThing ).setRuntimeConfigurableWrapper( wrapper );
  -        }
  -
  -        handleChildren( realThing, wrapper );
  -
  -        wrapper.maybeConfigure( project );
  -        if( realThing instanceof Task )
  -        {
  -            target.replaceChild( this, realThing );
  -        }
  -        else
  -        {
  -            target.replaceChild( this, wrapper );
  -        }
       }
   
       protected BuildException getNotFoundException( String what,
  @@ -182,10 +163,6 @@
               }
   
               childWrapper.setProxy( realChild );
  -            if( parent instanceof TaskContainer )
  -            {
  -                ( (Task)realChild ).setRuntimeConfigurableWrapper( childWrapper );
  -            }
   
               child.handleChildren( realChild, childWrapper );
   
  
  
  
  1.8       +0 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Property.java	2001/12/16 04:21:29	1.7
  +++ Property.java	2001/12/16 04:26:06	1.8
  @@ -116,11 +116,6 @@
           return file;
       }
   
  -    public String getName()
  -    {
  -        return name;
  -    }
  -
       public Reference getRefid()
       {
           return ref;
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message