Java 1.5, continued

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1376015 13f79535-47bb-0310-9956-ffa450edef68
whushine · Aug 22, 2012 · 1eec081 · 1eec081
1 parent b01acc4
commit 1eec081
Show file tree

Hide file tree

Showing 89 changed files with 687 additions and 772 deletions.
diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java
@@ -163,6 +163,7 @@ boolean set(
             String property, Object value, PropertyHelper propertyHelper);
     }
 
+    //TODO PropertyEnumerator Delegate type, would improve PropertySet
 
     //  --------------------------------------------------------
     //

diff --git a/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java b/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
@@ -113,10 +113,10 @@ public ManifestTask() {
      */
     public void addConfiguredSection(Manifest.Section section)
          throws ManifestException {
-        Enumeration attributeKeys = section.getAttributeKeys();
+        Enumeration<String> attributeKeys = section.getAttributeKeys();
         while (attributeKeys.hasMoreElements()) {
             Attribute attribute = section.getAttribute(
-                (String) attributeKeys.nextElement());
+                attributeKeys.nextElement());
             checkAttribute(attribute);
         }
         nestedManifest.addConfiguredSection(section);
@@ -249,9 +249,9 @@ public void execute() throws BuildException {
         }
 
         //look for and print warnings
-        for (Enumeration e = nestedManifest.getWarnings();
+        for (Enumeration<String> e = nestedManifest.getWarnings();
                 e.hasMoreElements();) {
-            log("Manifest warning: " + (String) e.nextElement(),
+            log("Manifest warning: " + e.nextElement(),
                     Project.MSG_WARN);
         }
         try {

diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -263,7 +263,7 @@ public FileSelector[] getSelectors(Project p) {
      *
      * @return an enumerator that goes through each of the selectors
      */
-    public Enumeration selectorElements() {
+    public Enumeration<FileSelector> selectorElements() {
         return fileset.selectorElements();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,6 +163,7 @@ boolean set( @@
                 String property, Object value, PropertyHelper propertyHelper);
         }
+        //TODO PropertyEnumerator Delegate type, would improve PropertySet
         //  --------------------------------------------------------
         //
@@ Expand Down @@