X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Futil%2Fio%2FCloser.java;h=278a0433b026773faf0319565dd14f02a501155e;hb=c63257e8cc0ba1a5aca9364b22171abe7279d479;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..278a043 100644
--- a/src/net/pterodactylus/util/io/Closer.java
+++ b/src/net/pterodactylus/util/io/Closer.java
@@ -1,16 +1,16 @@
 /*
  * freenet - Closer.java Copyright © 2007 David Roden
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -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;
 
@@ -31,75 +29,46 @@ import java.util.zip.ZipFile;
  * <code>null</code> before being closed, and every possible execption is
  * swallowed. That makes this class perfect for use in the finally blocks of
  * try-catch-finally blocks.
- * 
+ *
  * @author David &lsquo;Roden&rsquo; &lt;bombe@freenetproject.org&gt;
- * @version $Id$
  */
 public class Closer {
 
 	/**
-	 * Closes the given output stream.
-	 * 
-	 * @param outputStream
-	 *            The output stream to close
+	 * Closes the given closeable.
+	 *
+	 * @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.
-	 * 
-	 * @param inputStream
-	 *            The input stream to close
+	 * Closes the given socket.
+	 *
+	 * @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. */
 			}
 		}
 	}
 
 	/**
 	 * Closes the given jar file.
-	 * 
+	 *
 	 * @param jarFile
 	 *            The jar file to close
 	 */
@@ -108,13 +77,14 @@ public class Closer {
 			try {
 				jarFile.close();
 			} catch (IOException e) {
+				/* ignore. */
 			}
 		}
 	}
 
 	/**
 	 * Closes the given zip file.
-	 * 
+	 *
 	 * @param zipFile
 	 *            The zip file to close
 	 */
@@ -123,6 +93,7 @@ public class Closer {
 			try {
 				zipFile.close();
 			} catch (IOException e) {
+				/* ignore. */
 			}
 		}
 	}