From efa57c6a8b4c9760ab4e0ca4ec0b884d64270654 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Mon, 10 Jul 2000 11:04:22 +0000 Subject: [PATCH] Avoid problems due to changes in JDK 1.3 introspection. This was discovered by Phil Hanna Similar to the problem with the old class attribute (changed to classname) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267751 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/ProjectHelper.java | 2 +- src/main/org/apache/tools/ant/Task.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Expand.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Untar.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index d1eaa4fe0..a463b5276 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -333,7 +333,7 @@ public class ProjectHelper { // Top level tasks don't have associated targets if (target != null) { - task.setTarget(target); + task.setOwningTarget(target); target.addTask(task); } } diff --git a/src/main/org/apache/tools/ant/Task.java b/src/main/org/apache/tools/ant/Task.java index a051c5672..a442f8da9 100644 --- a/src/main/org/apache/tools/ant/Task.java +++ b/src/main/org/apache/tools/ant/Task.java @@ -91,7 +91,7 @@ public abstract class Task { * * @param target Target in whose scope this task belongs. */ - public void setTarget(Target target) { + public void setOwningTarget(Target target) { this.target = target; } diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index 7f758971f..1b6b5c201 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -75,7 +75,7 @@ public class Expand extends Task { // XXX move it to util or tools public void execute() throws BuildException { Touch touch = (Touch) project.createTask("touch"); - touch.setTarget(target); + touch.setOwningTarget(target); File srcF=project.resolveFile(source); File dir=project.resolveFile(dest); diff --git a/src/main/org/apache/tools/ant/taskdefs/Untar.java b/src/main/org/apache/tools/ant/taskdefs/Untar.java index 6e1e88c5f..8d3d719c0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Untar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Untar.java @@ -77,7 +77,7 @@ public class Untar extends Task { public void execute() throws BuildException { Touch touch = (Touch) project.createTask("touch"); - touch.setTarget(target); + touch.setOwningTarget(target); File srcF=project.resolveFile(source);