From 03c8be4a90a10705e0dd3161769a9128fe32cbe0 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 29 Jun 2000 13:35:33 +0000 Subject: [PATCH] reverted unnecessary change to Task.setProject intorduced with the Touch patch. Expand and Untar use Project.createTask now. Submitted by: Glenn McAllister git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267710 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/Task.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Expand.java | 3 +-- src/main/org/apache/tools/ant/taskdefs/Untar.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java index a5949bfda..daf7fc1d2 100644 --- a/src/main/org/apache/tools/ant/Task.java +++ b/src/main/org/apache/tools/ant/Task.java @@ -73,7 +73,7 @@ public abstract class Task { * * @param project Project in whose scope this task belongs. */ - public void setProject(Project project) { + void setProject(Project project) { this.project = project; } diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 82b153204..57a8eaa07 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -74,8 +74,7 @@ public class Expand extends Task { */ // XXX move it to util or tools public void execute() throws BuildException { - Touch touch = new Touch(); - touch.setProject(project); + Touch touch = (Touch) project.createTask("touch"); touch.setTarget(target); try { diff --git a/src/main/org/apache/tools/ant/taskdefs/Untar.java b/src/main/org/apache/tools/ant/taskdefs/Untar.java index d165436e4..6bad0cdfb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Untar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Untar.java @@ -76,8 +76,7 @@ public class Untar extends Task { */ public void execute() throws BuildException { - Touch touch = new Touch(); - touch.setProject(project); + Touch touch = (Touch) project.createTask("touch"); touch.setTarget(target); try {