From c47fe8dbcca83bb1327e08f3be7eb7ee9398a27e Mon Sep 17 00:00:00 2001 From: mdb Date: Mon, 23 Apr 2007 21:58:33 +0000 Subject: [PATCH] Retroweaver cannot handle converting things that use Closeable, so we must remain backward compatible. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2095 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/io/StreamUtil.java | 27 +++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/java/com/samskivert/io/StreamUtil.java b/src/java/com/samskivert/io/StreamUtil.java index e0fe6c0b..e27e9559 100644 --- a/src/java/com/samskivert/io/StreamUtil.java +++ b/src/java/com/samskivert/io/StreamUtil.java @@ -3,10 +3,11 @@ package com.samskivert.io; -import java.io.Closeable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.Writer; +import java.io.Reader; import com.samskivert.Log; @@ -44,15 +45,29 @@ public class StreamUtil } /** - * Convenient close for a Closeable. Use in a finally clause and love life. + * Convenient close for a Reader. Use in a finally clause and love life. */ - public static void close (Closeable c) + public static void close (Reader in) { - if (c != null) { + if (in != null) { try { - c.close(); + in.close(); } catch (IOException ioe) { - Log.warning("Error closing closeable [obj=" + c + ", cause=" + ioe + "]."); + Log.warning("Error closing 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 writer [writer=" + out + ", cause=" + ioe + "]."); } } }