Browse Source

Adjust test case for Java 8

master
Gintas Grigelionis 7 years ago
parent
commit
d3ea4247a3
2 changed files with 4 additions and 8 deletions
  1. +2
    -6
      src/etc/testcases/core/containersrc/test/SpecialSeq.java
  2. +2
    -2
      src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java

+ 2
- 6
src/etc/testcases/core/containersrc/test/SpecialSeq.java View File

@@ -23,12 +23,11 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.taskdefs.Echo; import org.apache.tools.ant.taskdefs.Echo;


import java.util.Enumeration;
import java.util.Vector; import java.util.Vector;


public class SpecialSeq extends Task implements TaskContainer { public class SpecialSeq extends Task implements TaskContainer {
/** Optional Vector holding the nested tasks */ /** Optional Vector holding the nested tasks */
private Vector nestedTasks = new Vector();
private Vector<Task> nestedTasks = new Vector<>();


private FileSet fileset; private FileSet fileset;


@@ -50,10 +49,7 @@ public class SpecialSeq extends Task implements TaskContainer {
if (fileset == null || fileset.getDir(getProject()) == null) { if (fileset == null || fileset.getDir(getProject()) == null) {
throw new BuildException("Fileset was not configured"); 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.reconfigure();
nestedEcho.perform(); nestedEcho.perform();
} }


+ 2
- 2
src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java View File

@@ -403,8 +403,8 @@ public class ProjectHelperImpl extends ProjectHelper {
baseDir = value; baseDir = value;
break; break;
default: default:
throw new SAXParseException("Unexpected attribute \"" + attrs.getName(i)
+ "\"", helperImpl.locator);
throw new SAXParseException("Unexpected attribute \"" + key + "\"",
helperImpl.locator);
} }
} }




Loading…
Cancel
Save