Generify remaining raw types in the public API

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@634474 13f79535-47bb-0310-9956-ffa450edef68

Author: Niall Pemberton

src/java/org/apache/commons/io/FileUtils.java

@@ -335,7 +335,7 @@ public static Collection<File> listFiles(
      * @see org.apache.commons.io.filefilter.NameFileFilter
      * @since Commons IO 1.2
      */
-    public static Iterator iterateFiles(
+    public static Iterator<File> iterateFiles(
             File directory, IOFileFilter fileFilter, IOFileFilter dirFilter) {
         return listFiles(directory, fileFilter, dirFilter).iterator();
     }
@@ -367,7 +367,7 @@ private static String[] toSuffixes(String[] extensions) {
      * @param recursive  if true all subdirectories are searched as well
      * @return an collection of java.io.File with the matching files
      */
-    public static Collection listFiles(
+    public static Collection<File> listFiles(
             File directory, String[] extensions, boolean recursive) {
         IOFileFilter filter;
         if (extensions == null) {
@@ -392,7 +392,7 @@ public static Collection listFiles(
      * @return an iterator of java.io.File with the matching files
      * @since Commons IO 1.2
      */
-    public static Iterator iterateFiles(
+    public static Iterator<File> iterateFiles(
             File directory, String[] extensions, boolean recursive) {
         return listFiles(directory, extensions, recursive).iterator();
     }
@@ -1151,7 +1151,7 @@ public static byte[] readFileToByteArray(File file) throws IOException {
      * @throws java.io.UnsupportedEncodingException if the encoding is not supported by the VM
      * @since Commons IO 1.1
      */
-    public static List readLines(File file, String encoding) throws IOException {
+    public static List<String> readLines(File file, String encoding) throws IOException {
         InputStream in = null;
         try {
             in = openInputStream(file);
@@ -1170,7 +1170,7 @@ public static List readLines(File file, String encoding) throws IOException {
      * @throws IOException in case of an I/O error
      * @since Commons IO 1.3
      */
-    public static List readLines(File file) throws IOException {
+    public static List<String> readLines(File file) throws IOException {
         return readLines(file, null);
     }
 
@@ -1330,7 +1330,7 @@ public static void writeByteArrayToFile(File file, byte[] data) throws IOExcepti
      * @throws java.io.UnsupportedEncodingException if the encoding is not supported by the VM
      * @since Commons IO 1.1
      */
-    public static void writeLines(File file, String encoding, Collection lines) throws IOException {
+    public static void writeLines(File file, String encoding, Collection<?> lines) throws IOException {
         writeLines(file, encoding, lines, null);
     }
 
@@ -1344,7 +1344,7 @@ public static void writeLines(File file, String encoding, Collection lines) thro
      * @throws IOException in case of an I/O error
      * @since Commons IO 1.3
      */
-    public static void writeLines(File file, Collection lines) throws IOException {
+    public static void writeLines(File file, Collection<?> lines) throws IOException {
         writeLines(file, null, lines, null);
     }
 
@@ -1364,7 +1364,8 @@ public static void writeLines(File file, Collection lines) throws IOException {
      * @throws java.io.UnsupportedEncodingException if the encoding is not supported by the VM
      * @since Commons IO 1.1
      */
-    public static void writeLines(File file, String encoding, Collection lines, String lineEnding) throws IOException {
+    public static void writeLines(File file, String encoding, Collection<?> lines, String lineEnding)
+        throws IOException {
         OutputStream out = null;
         try {
             out = openOutputStream(file);
@@ -1385,7 +1386,7 @@ public static void writeLines(File file, String encoding, Collection lines, Stri
      * @throws IOException in case of an I/O error
      * @since Commons IO 1.3
      */
-    public static void writeLines(File file, Collection lines, String lineEnding) throws IOException {
+    public static void writeLines(File file, Collection<?> lines, String lineEnding) throws IOException {
         writeLines(file, null, lines, lineEnding);
     }
 

src/java/org/apache/commons/io/FilenameUtils.java

@@ -1056,15 +1056,15 @@ public static boolean isExtension(String filename, String[] extensions) {
      * @param extensions  the extensions to check for, null checks for no extension
      * @return true if the filename is one of the extensions
      */
-    public static boolean isExtension(String filename, Collection extensions) {
+    public static boolean isExtension(String filename, Collection<String> extensions) {
         if (filename == null) {
             return false;
         }
         if (extensions == null || extensions.isEmpty()) {
             return (indexOfExtension(filename) == -1);
         }
         String fileExt = getExtension(filename);
-        for (Iterator it = extensions.iterator(); it.hasNext();) {
+        for (Iterator<String> it = extensions.iterator(); it.hasNext();) {
             if (fileExt.equals(it.next())) {
                 return true;
             }

src/java/org/apache/commons/io/IOUtils.java

@@ -471,7 +471,7 @@ public static String toString(byte[] input, String encoding)
      * @throws IOException if an I/O error occurs
      * @since Commons IO 1.1
      */
-    public static List readLines(InputStream input) throws IOException {
+    public static List<String> readLines(InputStream input) throws IOException {
         InputStreamReader reader = new InputStreamReader(input);
         return readLines(reader);
     }
@@ -493,7 +493,7 @@ public static List readLines(InputStream input) throws IOException {
      * @throws IOException if an I/O error occurs
      * @since Commons IO 1.1
      */
-    public static List readLines(InputStream input, String encoding) throws IOException {
+    public static List<String> readLines(InputStream input, String encoding) throws IOException {
         if (encoding == null) {
             return readLines(input);
         } else {
@@ -1003,15 +1003,15 @@ public static void write(StringBuffer data, OutputStream output,
      * @throws IOException if an I/O error occurs
      * @since Commons IO 1.1
      */
-    public static void writeLines(Collection lines, String lineEnding,
+    public static void writeLines(Collection<?> lines, String lineEnding,
             OutputStream output) throws IOException {
         if (lines == null) {
             return;
         }
         if (lineEnding == null) {
             lineEnding = LINE_SEPARATOR;
         }
-        for (Iterator it = lines.iterator(); it.hasNext(); ) {
+        for (Iterator<?> it = lines.iterator(); it.hasNext(); ) {
             Object line = it.next();
             if (line != null) {
                 output.write(line.toString().getBytes());
@@ -1036,7 +1036,7 @@ public static void writeLines(Collection lines, String lineEnding,
      * @throws IOException if an I/O error occurs
      * @since Commons IO 1.1
      */
-    public static void writeLines(Collection lines, String lineEnding,
+    public static void writeLines(Collection<?> lines, String lineEnding,
             OutputStream output, String encoding) throws IOException {
         if (encoding == null) {
             writeLines(lines, lineEnding, output);
@@ -1047,7 +1047,7 @@ public static void writeLines(Collection lines, String lineEnding,
             if (lineEnding == null) {
                 lineEnding = LINE_SEPARATOR;
             }
-            for (Iterator it = lines.iterator(); it.hasNext(); ) {
+            for (Iterator<?> it = lines.iterator(); it.hasNext(); ) {
                 Object line = it.next();
                 if (line != null) {
                     output.write(line.toString().getBytes(encoding));
@@ -1068,15 +1068,15 @@ public static void writeLines(Collection lines, String lineEnding,
      * @throws IOException if an I/O error occurs
      * @since Commons IO 1.1
      */
-    public static void writeLines(Collection lines, String lineEnding,
+    public static void writeLines(Collection<?> lines, String lineEnding,
             Writer writer) throws IOException {
         if (lines == null) {
             return;
         }
         if (lineEnding == null) {
             lineEnding = LINE_SEPARATOR;
         }
-        for (Iterator it = lines.iterator(); it.hasNext(); ) {
+        for (Iterator<?> it = lines.iterator(); it.hasNext(); ) {
             Object line = it.next();
             if (line != null) {
                 writer.write(line.toString());