commit 3ff4110e95e268e1f15cb334b8e7e608b74871da
author Paul King <paulk@asert.com.au> Fri Jul 31 15:02:19 2009 +0000
committer Paul King <paulk@asert.com.au> Fri Jul 31 15:02:19 2009 +0000
tree 8021006bf1ef5130b2edda4e8379c8f2d0e4cc00
parent a8ef4bb15042654668c5c6b9f909e8a268f54062

GROOVY-2733: Generify collections' related methods in GDK (last remnants from trunk)

git-svn-id: http://svn.codehaus.org/groovy/branches/GROOVY_1_6_X@17147 a5544e8c-8a19-0410-ba12-f9af4593a198

src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java

diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 851653f..76e7e1c 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -12607,8 +12607,6 @@
         };
     }
 
-    // TODO move into DOMCategory once we can make use of optional categories transparent
-
     /**
      * Makes NodeList iterable by returning a read-only Iterator which traverses
      * over each Node.
@@ -12617,15 +12615,15 @@
      * @return an Iterator for a NodeList
      * @since 1.0
      */
-    public static Iterator iterator(final NodeList nodeList) {
-        return new Iterator() {
+    public static Iterator<org.w3c.dom.Node> iterator(final NodeList nodeList) {
+        return new Iterator<org.w3c.dom.Node>() {
             private int current /* = 0 */;
 
             public boolean hasNext() {
                 return current < nodeList.getLength();
             }
 
-            public Object next() {
+            public org.w3c.dom.Node next() {
                 return nodeList.item(current++);
             }
 
@@ -12699,13 +12697,13 @@
      * @see java.io.BufferedReader#readLine()
      * @since 1.5.0
      */
-    public static Iterator iterator(Reader self) {
+    public static Iterator<String> iterator(Reader self) {
         final BufferedReader bufferedReader;
         if (self instanceof BufferedReader)
             bufferedReader = (BufferedReader) self;
         else
             bufferedReader = new BufferedReader(self);
-        return new Iterator() {
+        return new Iterator<String>() {
             String nextVal /* = null */;
             boolean nextMustRead = true;
             boolean hasNext = true;
@@ -12722,7 +12720,7 @@
                 return hasNext;
             }
 
-            public Object next() {
+            public String next() {
                 String retval = null;
                 if (nextMustRead) {
                     try {
@@ -12757,20 +12755,20 @@
      * @return an Iterator for the InputStream
      * @since 1.5.0
      */
-    public static Iterator iterator(InputStream self) {
+    public static Iterator<Byte> iterator(InputStream self) {
         return iterator(new DataInputStream(self));
     }
 
     /**
      * Standard iterator for a data input stream which iterates through the
-     * stream content a byte at a time.
+     * stream content a Byte at a time.
      *
      * @param self a DataInputStream object
      * @return an Iterator for the DataInputStream
      * @since 1.5.0
      */
-    public static Iterator iterator(final DataInputStream self) {
-        return new Iterator() {
+    public static Iterator<Byte> iterator(final DataInputStream self) {
+        return new Iterator<Byte>() {
             Byte nextVal;
             boolean nextMustRead = true;
             boolean hasNext = true;
@@ -12787,7 +12785,7 @@
                 return hasNext;
             }
 
-            public Object next() {
+            public Byte next() {
                 Byte retval = null;
                 if (nextMustRead) {
                     try {
@@ -12802,7 +12800,7 @@
             }
 
             public void remove() {
-                throw new UnsupportedOperationException("Cannot remove() from an InputStream Iterator");
+                throw new UnsupportedOperationException("Cannot remove() from a DataInputStream Iterator");
             }
         };
     }