summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormattinger <[email protected]>2007-03-08 15:39:39 +0000
committermattinger <[email protected]>2007-03-08 15:39:39 +0000
commit4a9b3399ba163cae31529d8cc8700f758c6a9908 (patch)
tree64a7471a2c76f60eef5c1eb905142032cb34a896
parentdcbc8b1395a1c6a4b0e6678e06b11fcbd793f269 (diff)
git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/branches/ant-1.7.0-upgrade@102 32d7a393-a5a9-423c-abd3-5d954feb1f2f
-rw-r--r--ant1.6/src/java/net/sf/antcontrib/logic/ant16/ForTask.java5
-rw-r--r--ant1.7/src/java/net/sf/antcontrib/logic/ant17/ForTask.java4
2 files changed, 4 insertions, 5 deletions
diff --git a/ant1.6/src/java/net/sf/antcontrib/logic/ant16/ForTask.java b/ant1.6/src/java/net/sf/antcontrib/logic/ant16/ForTask.java
index 8838a16..154ab7e 100644
--- a/ant1.6/src/java/net/sf/antcontrib/logic/ant16/ForTask.java
+++ b/ant1.6/src/java/net/sf/antcontrib/logic/ant16/ForTask.java
@@ -27,10 +27,10 @@ import java.util.StringTokenizer;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.taskdefs.MacroDef;
import org.apache.tools.ant.taskdefs.MacroInstance;
import org.apache.tools.ant.taskdefs.Parallel;
-import org.apache.tools.ant.taskdefs.Sequential;
import org.apache.tools.ant.types.DirSet;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
@@ -176,10 +176,9 @@ public class ForTask extends Task {
* Defines the macro which will be executed for each loop iteration.
* The macro parameter indicated by the <code>param</code> attribute
* will be set with the current loop value.
- * @ant.attribute group="required"
* @return a MacroDef#NestedSequential object to be configured
*/
- public MacroDef.NestedSequential createSequential() {
+ public TaskContainer createSequential() {
macroDef = new MacroDef();
macroDef.setProject(getProject());
return macroDef.createSequential();
diff --git a/ant1.7/src/java/net/sf/antcontrib/logic/ant17/ForTask.java b/ant1.7/src/java/net/sf/antcontrib/logic/ant17/ForTask.java
index 709e58c..df4d713 100644
--- a/ant1.7/src/java/net/sf/antcontrib/logic/ant17/ForTask.java
+++ b/ant1.7/src/java/net/sf/antcontrib/logic/ant17/ForTask.java
@@ -26,6 +26,7 @@ import java.util.StringTokenizer;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.taskdefs.MacroDef;
import org.apache.tools.ant.taskdefs.MacroInstance;
import org.apache.tools.ant.taskdefs.Parallel;
@@ -151,10 +152,9 @@ public class ForTask extends Task {
* Defines the macro which will be executed for each loop iteration.
* The macro parameter indicated by the <code>param</code> attribute
* will be set with the current loop value.
- * @ant.attribute group="required"
* @return a MacroDef#NestedSequential object to be configured
*/
- public MacroDef.NestedSequential createSequential() {
+ public TaskContainer createSequential() {
macroDef = new MacroDef();
macroDef.setProject(getProject());
return macroDef.createSequential();