From ff55918264e6e23033480d0bdd8110350a155c95 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 16 Dec 2001 04:34:14 +0000 Subject: [PATCH] No need for tasks to know which target they are in ... or even if they are in a target. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270183 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/org/apache/tools/ant/BuildEvent.java | 1 - .../src/main/org/apache/tools/ant/Task.java | 20 ------------------- .../org/apache/tools/ant/taskdefs/Get.java | 1 - .../org/apache/tools/ant/taskdefs/Rmic.java | 1 - .../tools/ant/taskdefs/optional/Cab.java | 3 +-- .../todo/org/apache/tools/ant/BuildEvent.java | 1 - .../src/todo/org/apache/tools/ant/Task.java | 20 ------------------- .../org/apache/tools/ant/taskdefs/Get.java | 1 - .../org/apache/tools/ant/taskdefs/Rmic.java | 1 - .../tools/ant/taskdefs/optional/Cab.java | 3 +-- 10 files changed, 2 insertions(+), 50 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java index 1e89804b1..50fd6f313 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java @@ -53,7 +53,6 @@ public class BuildEvent extends EventObject { super( task ); this.project = task.getProject(); - this.target = task.getOwningTarget(); this.task = task; } 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 922204ffa..6d289113e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java @@ -13,7 +13,6 @@ public abstract class Task extends ProjectComponent implements org.apache.myrmidon.api.Task { - protected Target target; protected String description; protected String taskType; @@ -28,30 +27,11 @@ public abstract class Task description = desc; } - /** - * Sets the target object of this task. - * - * @param target Target in whose scope this task belongs. - */ - public void setOwningTarget( Target target ) - { - this.target = target; - } - public String getDescription() { return description; } - /** - * Get the Target to which this task belongs - * - * @return the task's target. - */ - public Target getOwningTarget() - { - return target; - } /** * Perform this task */ diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java index 7385eccc4..002b9a41d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -303,7 +303,6 @@ public class Get extends Task if( project.getJavaVersion() != Project.JAVA_1_1 ) { Touch touch = (Touch)project.createTask( "touch" ); - touch.setOwningTarget( target ); touch.setFile( file ); touch.setMillis( timemillis ); touch.touch(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java index 22bfedd22..04046e333 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java @@ -691,6 +691,5 @@ public class Rmic extends MatchingTask } } } - } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index 2ed1c4ca7..3d642686d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -317,8 +317,7 @@ public class Cab extends MatchingTask throws TaskException { ExecTask exec = (ExecTask)project.createTask( "exec" ); - exec.setOwningTarget( this.getOwningTarget() ); - exec.setDescription( this.getDescription() ); + exec.setDescription( getDescription() ); return exec; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java index 1e89804b1..50fd6f313 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java @@ -53,7 +53,6 @@ public class BuildEvent extends EventObject { super( task ); this.project = task.getProject(); - this.target = task.getOwningTarget(); this.task = task; } 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 922204ffa..6d289113e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java @@ -13,7 +13,6 @@ public abstract class Task extends ProjectComponent implements org.apache.myrmidon.api.Task { - protected Target target; protected String description; protected String taskType; @@ -28,30 +27,11 @@ public abstract class Task description = desc; } - /** - * Sets the target object of this task. - * - * @param target Target in whose scope this task belongs. - */ - public void setOwningTarget( Target target ) - { - this.target = target; - } - public String getDescription() { return description; } - /** - * Get the Target to which this task belongs - * - * @return the task's target. - */ - public Target getOwningTarget() - { - return target; - } /** * Perform this task */ diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java index 7385eccc4..002b9a41d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java @@ -303,7 +303,6 @@ public class Get extends Task if( project.getJavaVersion() != Project.JAVA_1_1 ) { Touch touch = (Touch)project.createTask( "touch" ); - touch.setOwningTarget( target ); touch.setFile( file ); touch.setMillis( timemillis ); touch.touch(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java index 22bfedd22..04046e333 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java @@ -691,6 +691,5 @@ public class Rmic extends MatchingTask } } } - } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java index 2ed1c4ca7..3d642686d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -317,8 +317,7 @@ public class Cab extends MatchingTask throws TaskException { ExecTask exec = (ExecTask)project.createTask( "exec" ); - exec.setOwningTarget( this.getOwningTarget() ); - exec.setDescription( this.getDescription() ); + exec.setDescription( getDescription() ); return exec; }