X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Futil%2Fio%2FCloser.java;h=6207c12fa47293b41a0cb08fa16f7c98f6ec3bb1;hb=c53cabb68760b1c34a4af847cd83117dcf76a755;hp=126c202653d9b2f5eb71dd535b8ed8feebd1ba56;hpb=d2c62b11931d30abcd519d55db0bdfdde6ea438f;p=jSite2.git

diff --git a/src/net/pterodactylus/util/io/Closer.java b/src/net/pterodactylus/util/io/Closer.java
index 126c202..6207c12 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;
 
@@ -33,66 +31,37 @@ import java.util.zip.ZipFile;
  * try-catch-finally blocks.
  * 
  * @author David ‘Roden’ <bombe@freenetproject.org>
- * @version $Id$
  */
 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) {
+				/* ignore. */
 			}
 		}
 	}
 
 	/**
-	 * 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) {
+				/* ignore. */
 			}
 		}
 	}
@@ -108,6 +77,7 @@ public class Closer {
 			try {
 				jarFile.close();
 			} catch (IOException e) {
+				/* ignore. */
 			}
 		}
 	}
@@ -123,6 +93,7 @@ public class Closer {
 			try {
 				zipFile.close();
 			} catch (IOException e) {
+				/* ignore. */
 			}
 		}
 	}