From b95fdfa64f6068231d6be8740aba9e503b6f0d5d Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 13 Apr 2007 21:31:23 +0000
Subject: [PATCH] Use the handy new Closeable interface that Ray pointed out.
 Left the InputStream and OutputStream versions in to avoid breaking binary
 compatibility.

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

diff --git a/src/java/com/samskivert/io/StreamUtil.java b/src/java/com/samskivert/io/StreamUtil.java
index 9adfea0c..e0fe6c0b 100644
--- a/src/java/com/samskivert/io/StreamUtil.java
+++ b/src/java/com/samskivert/io/StreamUtil.java
@@ -3,11 +3,10 @@
 
 package com.samskivert.io;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
 
 import com.samskivert.Log;
 
@@ -45,29 +44,15 @@ public class StreamUtil
     }
 
     /**
-     * Convenient close for a reader. Use in a finally clause and love life.
+     * Convenient close for a Closeable. Use in a finally clause and love life.
      */
-    public static void close (Reader in)
+    public static void close (Closeable c)
     {
-        if (in != null) {
+        if (c != null) {
             try {
-                in.close();
+                c.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 + "].");
+                Log.warning("Error closing closeable [obj=" + c + ", cause=" + ioe + "].");
             }
         }
     }