Apply changes made in CVS HEAD
diff --git a/p2/publishing/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java b/p2/publishing/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
index 5f69648..b57d201 100755
--- a/p2/publishing/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
+++ b/p2/publishing/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
@@ -1723,7 +1723,7 @@
// check the excludes directive for copying files over
Target dot = (Target) antProject.getTargets().get("@dot");
Copy copyChild = (Copy) AntUtils.getFirstChildByName(dot, "copy");
- Enumeration rc = (Enumeration) ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
+ Enumeration rc = ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
RuntimeConfigurable configurable = (RuntimeConfigurable) rc.nextElement();
assertEquals(configurable.getElementTag(), "exclude");
assertEquals(configurable.getAttributeMap().get("name"), "**/*.java");
@@ -1735,7 +1735,7 @@
// check the includes directive for copying source files
Target copySource = (Target) antProject.getTargets().get("copy.src.zip");
copyChild = (Copy) AntUtils.getFirstChildByName(copySource, "copy");
- rc = (Enumeration) ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
+ rc = ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
configurable = (RuntimeConfigurable) rc.nextElement();
assertEquals(configurable.getElementTag(), "include");
assertEquals(configurable.getAttributeMap().get("name"), "**/*.java");
@@ -1746,7 +1746,7 @@
// check the includes directive for zipping source files
Target zipSource = (Target) antProject.getTargets().get("zip.src.zip");
Zip zipChild = (Zip) AntUtils.getFirstChildByName(zipSource, "zip");
- rc = (Enumeration) ((RuntimeConfigurable) zipChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
+ rc = ((RuntimeConfigurable) zipChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
configurable = (RuntimeConfigurable) rc.nextElement();
assertEquals(configurable.getElementTag(), "include");
assertEquals(configurable.getAttributeMap().get("name"), "**/*.java");
@@ -1779,7 +1779,7 @@
// check the excludes directive for copying files over
Target dot = (Target) antProject.getTargets().get("@dot");
Copy copyChild = (Copy) AntUtils.getFirstChildByName(dot, "copy");
- Enumeration rc = (Enumeration) ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
+ Enumeration rc = ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
assertEquals(((RuntimeConfigurable) rc.nextElement()).getAttributeMap().get("name"), "**/*.java");
assertEquals(((RuntimeConfigurable) rc.nextElement()).getAttributeMap().get("name"), "**/package.htm*");
assertFalse("Should have only found 2 filter elements", rc.hasMoreElements());
@@ -1787,14 +1787,14 @@
// check the includes directive for copying source files
Target copySource = (Target) antProject.getTargets().get("copy.src.zip");
copyChild = (Copy) AntUtils.getFirstChildByName(copySource, "copy");
- rc = (Enumeration) ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
+ rc = ((RuntimeConfigurable) copyChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
assertEquals(((RuntimeConfigurable) rc.nextElement()).getAttributeMap().get("name"), "**/*.java");
assertFalse("Should have only found 1 filter elements", rc.hasMoreElements());
// check the includes directive for zipping source files
Target zipSource = (Target) antProject.getTargets().get("zip.src.zip");
Zip zipChild = (Zip) AntUtils.getFirstChildByName(zipSource, "zip");
- rc = (Enumeration) ((RuntimeConfigurable) zipChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
+ rc = ((RuntimeConfigurable) zipChild.getRuntimeConfigurableWrapper().getChildren().nextElement()).getChildren();
assertEquals(((RuntimeConfigurable) rc.nextElement()).getAttributeMap().get("name"), "**/*.java");
assertFalse("Should have only found 1 filter elements", rc.hasMoreElements());
}
