From 937ed931704e3f389a3ee522c3d757bba4315505 Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 13 Apr 2007 21:00:21 +0000
Subject: [PATCH] Added close() methods for Reader and Writer.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2084 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/java/com/samskivert/io/StreamUtil.java | 38 +++++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/java/com/samskivert/io/StreamUtil.java b/src/java/com/samskivert/io/StreamUtil.java
index 58d387ec..9adfea0c 100644
--- a/src/java/com/samskivert/io/StreamUtil.java
+++ b/src/java/com/samskivert/io/StreamUtil.java
@@ -3,9 +3,11 @@
 
 package com.samskivert.io;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
 
 import com.samskivert.Log;
 
@@ -23,8 +25,7 @@ public class StreamUtil
             try {
                 in.close();
             } catch (IOException ioe) {
-                Log.warning("Error closing input stream [stream=" + in +
-                    ", cause=" + ioe + "].");
+                Log.warning("Error closing input stream [stream=" + in + ", cause=" + ioe + "].");
             }
         }
     }
@@ -38,8 +39,35 @@ public class StreamUtil
             try {
                 out.close();
             } catch (IOException ioe) {
-                Log.warning("Error closing output stream [stream=" + out +
-                    ", cause=" + ioe + "].");
+                Log.warning("Error closing output stream [stream=" + out + ", cause=" + ioe + "].");
+            }
+        }
+    }
+
+    /**
+     * Convenient close for a reader. Use in a finally clause and love life.
+     */
+    public static void close (Reader in)
+    {
+        if (in != null) {
+            try {
+                in.close();
+            } catch (IOException ioe) {
+                Log.warning("Error closing input reader [reader=" + in + ", cause=" + ioe + "].");
+            }
+        }
+    }
+
+    /**
+     * Convenient close for a writer. Use in a finally clause and love life.
+     */
+    public static void close (Writer out)
+    {
+        if (out != null) {
+            try {
+                out.close();
+            } catch (IOException ioe) {
+                Log.warning("Error closing output writer [writer=" + out + ", cause=" + ioe + "].");
             }
         }
     }