More file closing fixes in util classes

Change-Id: I84e4d8581cb3cf0fd3aa01bbbab21593d1eb45f6
Reviewed-on: http://gerrit.dmdirc.com/29
Tested-by: Hudson <webmaster@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/util/TextFile.java

@@ -165,14 +165,18 @@ public class TextFile {
                     + "opened with an InputStream");
         }
         
-        final BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        BufferedWriter writer = null;
+
+        try {
+            writer = new BufferedWriter(new FileWriter(file));
         
-        for (String line : lines) {
-            writer.write(line);
-            writer.newLine();
+            for (String line : lines) {
+                writer.write(line);
+                writer.newLine();
+            }
+        } finally {
+            StreamUtil.close(writer);
         }
-        
-        writer.close();
     }
 
     /**

src/com/dmdirc/util/resourcemanager/FileResourceManager.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.util.resourcemanager;
 
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
+import com.dmdirc.util.StreamUtil;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -72,7 +71,7 @@ public final class FileResourceManager extends ResourceManager {
     /** {@inheritDoc} */
     @Override
     public byte[] getResourceBytes(final String resource) {
-        FileInputStream inputStream;
+        FileInputStream inputStream = null;
         final File file;
         
         if (resource.startsWith(basePath)) {
@@ -93,22 +92,13 @@ public final class FileResourceManager extends ResourceManager {
         
         try {
             inputStream = new FileInputStream(file);
-        } catch (FileNotFoundException ex) {
-            return new byte[0];
-        }
-        
-        try {
             inputStream.read(bytes);
         } catch (IOException ex) {
             return new byte[0];
+        } finally {
+            StreamUtil.close(inputStream);
         }
-        
-        try {
-            inputStream.close();
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to close stream");
-        }
-        
+
         return bytes;
     }
     

src/com/dmdirc/util/resourcemanager/ResourceManager.java

@@ -25,6 +25,7 @@ package com.dmdirc.util.resourcemanager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
+import com.dmdirc.util.StreamUtil;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -116,13 +117,16 @@ public abstract class ResourceManager {
      * @throws IOException if the write operation fails
      */
     public final void resourceToFile(final byte[] resource, final File file)
-    throws IOException {
-        final FileOutputStream out = new FileOutputStream(file, false);
-        
-        out.write(resource);
-        
-        out.flush();
-        out.close();
+            throws IOException {
+        FileOutputStream out = null;
+
+        try {
+            out = new FileOutputStream(file, false);
+            out.write(resource);
+            out.flush();
+        } finally {
+            StreamUtil.close(out);
+        }
     }
        
     /**

src/com/dmdirc/util/resourcemanager/ZipResourceManager.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.util.resourcemanager;
 
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
+import com.dmdirc.util.StreamUtil;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -90,7 +89,7 @@ public final class ZipResourceManager extends ResourceManager {
     @Override
     public byte[] getResourceBytes(final String resource) {
         final ZipEntry zipEntry = zipFile.getEntry(resource);
-        BufferedInputStream inputStream;
+        BufferedInputStream inputStream = null;
         
         
         if (zipEntry == null) {
@@ -104,25 +103,16 @@ public final class ZipResourceManager extends ResourceManager {
         final byte[] bytes = new byte[(int) zipEntry.getSize()];
         
         try {
-            inputStream =
-                    new BufferedInputStream(zipFile.getInputStream(zipEntry));
-        } catch (IOException ex) {
-            return new byte[0];
-        }
-        
-        try {
+            inputStream = new BufferedInputStream(zipFile.getInputStream(zipEntry));
+
             if (inputStream.read(bytes) != bytes.length) {
                 inputStream.close();
                 return new byte[0];
             }
         } catch (IOException ex) {
             return new byte[0];
-        }
-        
-        try {
-            inputStream.close();
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to close stream");
+        } finally {
+            StreamUtil.close(inputStream);
         }
         
         return bytes;