Use auto closeables.

Change-Id: Ied0c613f8dd3edfbe43abedcdfcf95e1138ad04c
Reviewed-on: http://gerrit.dmdirc.com/3885
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

audio/src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -28,6 +28,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 
+import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.UnsupportedAudioFileException;
 
@@ -85,7 +86,7 @@ public final class AudioPlayer implements Runnable {
      */
     public static boolean isValid(final File file) {
         final AudioType type = getAudioType(file);
-        return (type != AudioType.INVALID);
+        return type != AudioType.INVALID;
     }
 
     /**
@@ -96,14 +97,11 @@ public final class AudioPlayer implements Runnable {
      * @return AudioType for this file.
      */
     public static AudioType getAudioType(final File file) {
-        AudioType type;
-        try {
-            AudioSystem.getAudioInputStream(file);
-            type = AudioType.WAV;
+        try (AudioInputStream unused = AudioSystem.getAudioInputStream(file)) {
+            return AudioType.WAV;
         } catch (UnsupportedAudioFileException | IOException e) {
-            type = AudioType.INVALID;
+            return AudioType.INVALID;
         }
-        return type;
     }
 
     /**

dcop/src/com/dmdirc/addons/dcop/DcopCommandLineExecutor.java

@@ -46,25 +46,20 @@ public class DcopCommandLineExecutor implements DcopExecutor {
             final String app,
             final String object,
             final String function) {
-        final ArrayList<String> result = new ArrayList<>();
-
-        final InputStreamReader reader;
-        final BufferedReader input;
-        final Process process;
+        final List<String> result = new ArrayList<>();
 
         try {
-            process = Runtime.getRuntime().exec(new String[]{"dcop", app, object, function});
-
-            reader = new InputStreamReader(process.getInputStream());
-            input = new BufferedReader(reader);
+            final Process process =
+                    Runtime.getRuntime().exec(new String[]{"dcop", app, object, function});
 
-            String line;
-            while ((line = input.readLine()) != null) {
-                result.add(line);
+            try (InputStreamReader reader = new InputStreamReader(process.getInputStream());
+                    BufferedReader input = new BufferedReader(reader)) {
+                String line;
+                while ((line = input.readLine()) != null) {
+                    result.add(line);
+                }
             }
 
-            reader.close();
-            input.close();
             process.destroy();
         } catch (IOException ex) {
             // Do nothing

dcop/src/com/dmdirc/addons/dcop/DcopPlugin.java

@@ -59,26 +59,20 @@ public final class DcopPlugin extends BaseCommandPlugin {
     @Exported
     @Deprecated
     public static List<String> getDcopResult(final String command) {
-        final ArrayList<String> result = new ArrayList<>();
-
-        final InputStreamReader reader;
-        final BufferedReader input;
-        final Process process;
+        final List<String> result = new ArrayList<>();
 
         try {
-            process = Runtime.getRuntime().exec(command);
-
-            reader = new InputStreamReader(process.getInputStream());
-            input = new BufferedReader(reader);
+            final Process process = Runtime.getRuntime().exec(command);
 
-            String line;
+            try (InputStreamReader reader = new InputStreamReader(process.getInputStream());
+                    BufferedReader input = new BufferedReader(reader)) {
+                String line;
 
-            while ((line = input.readLine()) != null) {
-                result.add(line);
+                while ((line = input.readLine()) != null) {
+                    result.add(line);
+                }
             }
 
-            reader.close();
-            input.close();
             process.destroy();
         } catch (IOException ex) {
             // Do nothing

mediasource_mplayer/src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java

@@ -93,30 +93,25 @@ public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource
      * @return Information about the currently playing track
      */
     public static List<String> getInfo() {
-        final ArrayList<String> result = new ArrayList<>();
-
-        final InputStreamReader reader;
-        final BufferedReader input;
-        final Process process;
+        final List<String> result = new ArrayList<>();
 
         try {
-            final String[] command = new String[]{"/bin/bash", "-c",
+            final String[] command = {"/bin/bash", "-c",
                 "/usr/bin/lsof -c gmplayer |"
                 + " grep -Ev '/dev|/lib|/var|/usr|/SYS|DIR|/tmp|pipe|socket|"
                 + "\\.xession|fontconfig' | tail -n 1 | sed -r 's/ +/ /g' |"
                 + " cut -d ' ' -f 9- | sed -r 's/^.*\\/(.*?)$/\\1/'"};
-            process = Runtime.getRuntime().exec(command);
+            final Process process = Runtime.getRuntime().exec(command);
 
-            reader = new InputStreamReader(process.getInputStream());
-            input = new BufferedReader(reader);
+            try (InputStreamReader reader = new InputStreamReader(process.getInputStream());
+                    BufferedReader input = new BufferedReader(reader)) {
 
-            String line;
-            while ((line = input.readLine()) != null) {
-                result.add(line);
+                String line;
+                while ((line = input.readLine()) != null) {
+                    result.add(line);
+                }
             }
 
-            reader.close();
-            input.close();
             process.destroy();
         } catch (IOException ex) {
             ex.printStackTrace();