Repository: ant Updated Branches: refs/heads/master 73bda1fb1 -> a4099af87
Adjust test case for Java 8 Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d3ea4247 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d3ea4247 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d3ea4247 Branch: refs/heads/master Commit: d3ea4247a33f703f411e887347ff34d01bf17434 Parents: 73bda1f Author: Gintas Grigelionis <gin...@apache.org> Authored: Fri Apr 6 22:14:36 2018 +0200 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Fri Apr 6 22:14:36 2018 +0200 ---------------------------------------------------------------------- src/etc/testcases/core/containersrc/test/SpecialSeq.java | 8 ++------ src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/d3ea4247/src/etc/testcases/core/containersrc/test/SpecialSeq.java ---------------------------------------------------------------------- diff --git a/src/etc/testcases/core/containersrc/test/SpecialSeq.java b/src/etc/testcases/core/containersrc/test/SpecialSeq.java index f3f0176..d823732 100644 --- a/src/etc/testcases/core/containersrc/test/SpecialSeq.java +++ b/src/etc/testcases/core/containersrc/test/SpecialSeq.java @@ -23,12 +23,11 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.taskdefs.Echo; -import java.util.Enumeration; import java.util.Vector; public class SpecialSeq extends Task implements TaskContainer { /** Optional Vector holding the nested tasks */ - private Vector nestedTasks = new Vector(); + private Vector<Task> nestedTasks = new Vector<>(); private FileSet fileset; @@ -50,10 +49,7 @@ public class SpecialSeq extends Task implements TaskContainer { if (fileset == null || fileset.getDir(getProject()) == null) { throw new BuildException("Fileset was not configured"); } - for (Enumeration e = nestedTasks.elements(); e.hasMoreElements();) { - Task nestedTask = (Task) e.nextElement(); - nestedTask.perform(); - } + nestedTasks.forEach(Task::perform); nestedEcho.reconfigure(); nestedEcho.perform(); } http://git-wip-us.apache.org/repos/asf/ant/blob/d3ea4247/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java index 8f0d13d..175a39a 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java @@ -403,8 +403,8 @@ public class ProjectHelperImpl extends ProjectHelper { baseDir = value; break; default: - throw new SAXParseException("Unexpected attribute \"" + attrs.getName(i) - + "\"", helperImpl.locator); + throw new SAXParseException("Unexpected attribute \"" + key + "\"", + helperImpl.locator); } }
