From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 7 Apr 2008 07:03:52 +0000 (+0000)
Subject: exchange a couple of types with Closeable
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=5fc85a727c84d03982ae0f0f85d17b93a71e40f8;p=jSite2.git

exchange a couple of types with Closeable

git-svn-id: http://trooper/svn/projects/jSite/trunk@629 c3eda9e8-030b-0410-8277-bc7414b0a119
---

diff --git a/src/net/pterodactylus/util/io/Closer.java b/src/net/pterodactylus/util/io/Closer.java
index 126c202..81d179c 100644
--- a/src/net/pterodactylus/util/io/Closer.java
+++ b/src/net/pterodactylus/util/io/Closer.java
@@ -18,11 +18,9 @@
 
 package net.pterodactylus.util.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 java.net.Socket;
 import java.util.jar.JarFile;
 import java.util.zip.ZipFile;
 
@@ -38,60 +36,30 @@ import java.util.zip.ZipFile;
 public class Closer {
 
 	/**
-	 * Closes the given output stream.
+	 * Closes the given closeable.
 	 * 
-	 * @param outputStream
-	 *            The output stream to close
+	 * @param closeable
+	 *            The closeable to close
 	 */
-	public static void close(OutputStream outputStream) {
-		if (outputStream != null) {
+	public static void close(Closeable closeable) {
+		if (closeable != null) {
 			try {
-				outputStream.close();
+				closeable.close();
 			} catch (IOException ioe1) {
 			}
 		}
 	}
 
 	/**
-	 * Closes the given input stream.
+	 * Closes the given socket.
 	 * 
-	 * @param inputStream
-	 *            The input stream to close
+	 * @param socket
+	 *            The socket to close
 	 */
-	public static void close(InputStream inputStream) {
-		if (inputStream != null) {
+	public static void close(Socket socket) {
+		if (socket != null) {
 			try {
-				inputStream.close();
-			} catch (IOException ioe1) {
-			}
-		}
-	}
-
-	/**
-	 * Closes the given writer.
-	 * 
-	 * @param writer
-	 *            The writer to close
-	 */
-	public static void close(Writer writer) {
-		if (writer != null) {
-			try {
-				writer.close();
-			} catch (IOException ioe1) {
-			}
-		}
-	}
-
-	/**
-	 * Closes the given reader.
-	 * 
-	 * @param reader
-	 *            The reader to close
-	 */
-	public static void close(Reader reader) {
-		if (reader != null) {
-			try {
-				reader.close();
+				socket.close();
 			} catch (IOException ioe1) {
 			}
 		}