diff options
| author | mattinger <[email protected]> | 2007-03-06 18:45:08 +0000 |
|---|---|---|
| committer | mattinger <[email protected]> | 2007-03-06 18:45:08 +0000 |
| commit | 806257ab91162e28b34e969aa7c3d8dd62a3459a (patch) | |
| tree | fde1bc38221e4fbced6001f7efd6e0b99bd30fee | |
| parent | 337d1bb11c7e1449404df37f4399d58424d3db4d (diff) | |
git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/trunk/ant-contrib@94 32d7a393-a5a9-423c-abd3-5d954feb1f2f
| -rw-r--r-- | src/java/net/sf/antcontrib/logic/AntCallBack.java | 11 | ||||
| -rw-r--r-- | src/java/net/sf/antcontrib/logic/AntFetch.java | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/java/net/sf/antcontrib/logic/AntCallBack.java b/src/java/net/sf/antcontrib/logic/AntCallBack.java index cb0cf38..744d387 100644 --- a/src/java/net/sf/antcontrib/logic/AntCallBack.java +++ b/src/java/net/sf/antcontrib/logic/AntCallBack.java @@ -19,7 +19,7 @@ import java.util.StringTokenizer; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Ant; +import org.apache.tools.ant.taskdefs.CallTarget; import org.apache.tools.ant.taskdefs.Property; /** @@ -32,7 +32,7 @@ import org.apache.tools.ant.taskdefs.Property; * @author inger * @author Dale Anson, [email protected] */ -public class AntCallBack extends Ant { +public class AntCallBack extends CallTarget { /** the name of the property to fetch from the new project */ private String returnName = null; @@ -42,7 +42,6 @@ public class AntCallBack extends Ant { public void setProject(Project realProject) { fakeProject = new ProjectDelegate(realProject); super.setProject(fakeProject); - setAntfile(realProject.getProperty("ant.file")); } /** @@ -83,10 +82,6 @@ public class AntCallBack extends Ant { */ public void setReturn( String r ) { returnName = r; - } - - public Property createParam() { - return super.createProperty(); - } + } } diff --git a/src/java/net/sf/antcontrib/logic/AntFetch.java b/src/java/net/sf/antcontrib/logic/AntFetch.java index 3154b22..a208800 100644 --- a/src/java/net/sf/antcontrib/logic/AntFetch.java +++ b/src/java/net/sf/antcontrib/logic/AntFetch.java @@ -32,7 +32,7 @@ import org.apache.tools.ant.taskdefs.CallTarget; * @author inger * @author Dale Anson, [email protected] */ -public class AntFetch extends CallTarget { +public class AntFetch extends Ant { /** the name of the property to fetch from the new project */ private String returnName = null; |