diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java index c6e596db3..7abda84f6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java @@ -125,8 +125,6 @@ public class RuntimeConfigurable if( child.wrappedObject instanceof Task ) { Task childTask = (Task)child.wrappedObject; - childTask.setRuntimeConfigurableWrapper( child ); - childTask.maybeConfigure(); } else { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java b/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java index 88213cd5d..922204ffa 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java @@ -16,7 +16,6 @@ public abstract class Task 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 @@ public abstract class Task { 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 abstract class Task public void maybeConfigure() throws TaskException { - if( wrapper != null ) - { - wrapper.maybeConfigure( project ); - } - } - - protected void setRuntimeConfigurableWrapper( RuntimeConfigurable wrapper ) - { - this.wrapper = wrapper; } protected void handleErrorOutput( String line ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java b/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java index 05dc0d8dc..52c4ee97a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java @@ -103,25 +103,6 @@ public class UnknownElement extends Task 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 @@ public class UnknownElement extends Task } childWrapper.setProxy( realChild ); - if( parent instanceof TaskContainer ) - { - ( (Task)realChild ).setRuntimeConfigurableWrapper( childWrapper ); - } child.handleChildren( realChild, childWrapper ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java index 703bc6758..9e91783aa 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -116,11 +116,6 @@ public class Property extends Task return file; } - public String getName() - { - return name; - } - public Reference getRefid() { return ref; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java index c6e596db3..7abda84f6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java @@ -125,8 +125,6 @@ public class RuntimeConfigurable if( child.wrappedObject instanceof Task ) { Task childTask = (Task)child.wrappedObject; - childTask.setRuntimeConfigurableWrapper( child ); - childTask.maybeConfigure(); } else { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java index 88213cd5d..922204ffa 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java @@ -16,7 +16,6 @@ public abstract class Task 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 @@ public abstract class Task { 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 abstract class Task public void maybeConfigure() throws TaskException { - if( wrapper != null ) - { - wrapper.maybeConfigure( project ); - } - } - - protected void setRuntimeConfigurableWrapper( RuntimeConfigurable wrapper ) - { - this.wrapper = wrapper; } protected void handleErrorOutput( String line ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java index 05dc0d8dc..52c4ee97a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java @@ -103,25 +103,6 @@ public class UnknownElement extends Task 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 @@ public class UnknownElement extends Task } childWrapper.setProxy( realChild ); - if( parent instanceof TaskContainer ) - { - ( (Task)realChild ).setRuntimeConfigurableWrapper( childWrapper ); - } child.handleChildren( realChild, childWrapper ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java index 703bc6758..9e91783aa 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java @@ -116,11 +116,6 @@ public class Property extends Task return file; } - public String getName() - { - return name; - } - public Reference getRefid() { return ref;