Author: jglick
Date: Thu Apr 19 17:02:09 2012
New Revision: 1328047
URL: http://svn.apache.org/viewvc?rev=1328047&view=rev
Log:
JDK 5.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java?rev=1328047&r1=1328046&r2=1328047&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ProjectHelper.java Thu Apr 19
17:02:09 2012
@@ -166,7 +166,7 @@ public class ProjectHelper {
* of the target and the third the name of the enum like class
* {@link OnMissingExtensionPoint}.
*/
- public List getExtensionStack() {
+ public List<String[]> getExtensionStack() {
return extensionStack;
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java?rev=1328047&r1=1328046&r2=1328047&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java Thu
Apr 19 17:02:09 2012
@@ -180,8 +180,7 @@ public class ProjectHelper2 extends Proj
context.getImplicitTarget().execute();
// resolve extensionOf attributes
- for (Iterator i = getExtensionStack().iterator(); i.hasNext(); ) {
- String[] extensionInfo = (String[]) i.next();
+ for (String[] extensionInfo : getExtensionStack()) {
String tgName = extensionInfo[0];
String name = extensionInfo[1];
OnMissingExtensionPoint missingBehaviour =
OnMissingExtensionPoint