Renamed shutdownXxx methods to closeQuietly(Xxx).

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

Author: hen

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

@@ -116,7 +116,7 @@
  * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
  * @author Matthew Hawthorne
  * @author <a href="mailto:jeremias@apache.org">Jeremias Maerki</a>
- * @version $Id: FileUtils.java,v 1.20 2003/12/25 11:05:59 jeremias Exp $
+ * @version $Id: FileUtils.java,v 1.21 2003/12/29 03:28:53 bayard Exp $
  */
 public class FileUtils {
 
@@ -322,8 +322,8 @@ public static boolean contentEquals(final File file1, final File file2)
             return IOUtils.contentEquals(input1, input2);
 
         } finally {
-            IOUtils.shutdownStream(input1);
-            IOUtils.shutdownStream(input2);
+            IOUtils.closeQuietly(input1);
+            IOUtils.closeQuietly(input2);
         }
     }
 
@@ -429,10 +429,10 @@ public static void copyFile(final File source, final File destination)
             try {
                 CopyUtils.copy(input, output);
             } finally {
-                IOUtils.shutdownStream(output);
+                IOUtils.closeQuietly(output);
             }
         } finally {
-            IOUtils.shutdownStream(input);
+            IOUtils.closeQuietly(input);
         }
 
         if (source.length() != destination.length()) {
@@ -482,10 +482,10 @@ public static void copyURLToFile(final URL source, final File destination)
             try {
                 CopyUtils.copy(input, output);
             } finally {
-                IOUtils.shutdownStream(output);
+                IOUtils.closeQuietly(output);
             }
         } finally {
-            IOUtils.shutdownStream(input);
+            IOUtils.closeQuietly(input);
         }
     }
 
@@ -595,7 +595,7 @@ public static String readFileToString(
         try {
             return IOUtils.toString(in, encoding);
         } finally {
-            IOUtils.shutdownStream(in);
+            IOUtils.closeQuietly(in);
         }
     }
 
@@ -621,7 +621,7 @@ public static void writeStringToFile(final File file,
         try {
             out.write(data.getBytes(encoding));
         } finally {
-            IOUtils.shutdownStream(out);
+            IOUtils.closeQuietly(out);
         }
     }
 

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

@@ -145,7 +145,7 @@
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
- * @version CVS $Revision: 1.7 $ $Date: 2003/11/22 20:19:29 $
+ * @version CVS $Revision: 1.8 $ $Date: 2003/12/29 03:28:53 $
  */
 public final class IOUtils
 {
@@ -162,7 +162,7 @@ public IOUtils() {}
      *
      * @param input A (possibly null) Reader
      */
-    public static void shutdownReader( final Reader input )
+    public static void closeQuietly( final Reader input )
     {
         if( input == null )
         {
@@ -184,7 +184,7 @@ public static void shutdownReader( final Reader input )
      *
      * @param output A (possibly null) Writer
      */
-    public static void shutdownWriter( final Writer output )
+    public static void closeQuietly( final Writer output )
     {
         if( output == null )
         {
@@ -205,7 +205,7 @@ public static void shutdownWriter( final Writer output )
      * Equivalent to {@link OutputStream#close()}, except any exceptions will be ignored.
      * @param output A (possibly null) OutputStream
      */
-    public static void shutdownStream( final OutputStream output )
+    public static void closeQuietly( final OutputStream output )
     {
         if( output == null )
         {
@@ -226,7 +226,7 @@ public static void shutdownStream( final OutputStream output )
      * Equivalent to {@link InputStream#close()}, except any exceptions will be ignored.
      * @param input A (possibly null) InputStream
      */
-    public static void shutdownStream( final InputStream input )
+    public static void closeQuietly( final InputStream input )
     {
         if( input == null )
         {

src/test/org/apache/commons/io/testtools/FileBasedTestCase.java

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/testtools/FileBasedTestCase.java,v 1.3 2003/11/22 20:09:23 jeremias Exp $
- * $Revision: 1.3 $
- * $Date: 2003/11/22 20:09:23 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/testtools/FileBasedTestCase.java,v 1.4 2003/12/29 03:28:53 bayard Exp $
+ * $Revision: 1.4 $
+ * $Date: 2003/12/29 03:28:53 $
  *
  * ====================================================================
  * The Apache Software License, Version 1.1
@@ -104,7 +104,7 @@ protected void createFile(final File file, final long size)
         try {
             generateTestData(output, size);
         } finally {
-            IOUtils.shutdownStream(output);
+            IOUtils.closeQuietly(output);
         }
     }