git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/branches/ant-1.7.0-upgrade@101 32d7a393-a5a9-423c-abd3-5d954feb1f2f

3 files changed, 23 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 d4e70e1..8838a16 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
@@ -30,6 +30,7 @@ import org.apache.tools.ant.Task;
 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;
@@ -40,7 +41,8 @@ import org.apache.tools.ant.types.Path;
  * instead of a target and only works for ant >= 1.6Beta3
  * @author Peter Reilly
  * @author Matt Inger
- * @ant.task name="for"
+ * @ant.task name="for" category="logic"
+ * @since Ant 1.6
  */
 public class ForTask extends Task {
 
@@ -171,9 +173,13 @@ 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 Object createSequential() {
+    public MacroDef.NestedSequential createSequential() {
         macroDef = new MacroDef();
         macroDef.setProject(getProject());
         return macroDef.createSequential();
@@ -197,6 +203,7 @@ public class ForTask extends Task {
 
     /**
      * Set step attribute.
+     * @param stemp The increment step when using begin and end attributes.
      *
      */
     public void setStep(int step) {
diff --git a/ant1.7/.classpath b/ant1.7/.classpath
index d770978..7ef75df 100644
--- a/ant1.7/.classpath
+++ b/ant1.7/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ant1.6"/>
-	<classpathentry kind="lib" path="../lib/ant/jars/ant-1.7.0.jar"/>
+	<classpathentry kind="lib" path="/lib/ant/jars/ant-1.7.0.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ant1.5"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
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 bfff54c..709e58c 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
@@ -38,7 +38,8 @@ import org.apache.tools.ant.types.ResourceCollection;
  * instead of a target and only works for ant >= 1.7.0
  * @author Peter Reilly
  * @author Matt Inger
- * @ant.task name="for"
+ * @ant.task name="for" category="logic"
+ * @since Ant 1.6
  */
 public class ForTask extends Task {
 
@@ -66,6 +67,11 @@ public class ForTask extends Task {
     public ForTask() {
     }
 
+    /***
+     * Add a resource collection
+     * @param resourceCollection The resource collection to add
+     * @since Ant 1.7
+     */
     public void add(ResourceCollection resourceCollection) {
     	this.resourceCollections.add(resourceCollection);
     }
@@ -142,9 +148,13 @@ 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 Object createSequential() {
+    public MacroDef.NestedSequential createSequential() {
         macroDef = new MacroDef();
         macroDef.setProject(getProject());
         return macroDef.createSequential();