Fix changes to StreamReader/StreamUtils.

Depends-On: Ia24b29f2fcd414d7b27bad52cc6fad6312179de5
Change-Id: Ie4bd081e56c12afe66a0f333a36e7f87b1736048
Reviewed-on: http://gerrit.dmdirc.com/4068
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

dcc/src/com/dmdirc/addons/dcc/kde/KDialogProcess.java

@@ -22,11 +22,12 @@
 
 package com.dmdirc.addons.dcc.kde;
 
-import com.dmdirc.util.io.StreamReader;
+import com.dmdirc.util.io.StreamUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Hold a Process and stream readers for a KDialog Process.
@@ -37,10 +38,10 @@ public class KDialogProcess {
     private static final boolean IS_BIN = new File("/bin/kdialog").exists();
     /** Does KDialog exist? */
     private static final boolean HAS_KDIALOG = IS_BIN || new File("/usr/bin/kdialog").exists();
-    /** Stream for the stdout stream for this process. */
-    private final StreamReader stdOutputStream;
-    /** Stream for the stderr stream for this process. */
-    private final StreamReader stdErrorStream;
+    /** Output from the output stream. */
+    private final List<String> stdOutput;
+    /** Output from the error stream. */
+    private final List<String> stdError;
     /** The actual process for this process. */
     private final Process process;
 
@@ -56,10 +57,10 @@ public class KDialogProcess {
         System.arraycopy(params, 0, exec, 1, params.length);
         exec[0] = IS_BIN ? "/bin/kdialog" : "/usr/bin/kdialog";
         process = Runtime.getRuntime().exec(exec);
-        stdOutputStream = new StreamReader(process.getInputStream(), new ArrayList<String>());
-        stdErrorStream = new StreamReader(process.getErrorStream(), new ArrayList<String>());
-        stdOutputStream.start();
-        stdErrorStream.start();
+        stdOutput = new ArrayList<>();
+        stdError = new ArrayList<>();
+        StreamUtils.readStreamIntoList(process.getInputStream(), stdOutput);
+        StreamUtils.readStreamIntoList(process.getErrorStream(), stdError);
     }
 
     /**
@@ -85,8 +86,8 @@ public class KDialogProcess {
      *
      * @return The StreamReader for this KDialogProcess's stdout stream
      */
-    public StreamReader getStdOutStream() {
-        return stdOutputStream;
+    public List<String> getStdOut() {
+        return stdOutput;
     }
 
     /**
@@ -94,8 +95,8 @@ public class KDialogProcess {
      *
      * @return The StreamReader for this KDialogProcess's stderr stream
      */
-    public StreamReader getStdErrStream() {
-        return stdErrorStream;
+    public List<String> getStdErr() {
+        return stdError;
     }
 
     /**

dcc/src/com/dmdirc/addons/dcc/kde/KFileChooser.java

@@ -198,14 +198,14 @@ public class KFileChooser extends JFileChooser {
 
         if (kdp.getProcess().exitValue() == 0) {
             if (isMultiSelectionEnabled()) {
-                final List<String> list = kdp.getStdOutStream().getList();
+                final List<String> list = kdp.getStdOut();
                 final File[] fileList = new File[list.size()];
                 for (int i = 0; i < list.size(); ++i) {
                     fileList[i] = new File(list.get(i));
                 }
                 setSelectedFiles(fileList);
             } else {
-                setSelectedFile(new File(kdp.getStdOutStream().getList().get(0)));
+                setSelectedFile(new File(kdp.getStdOut().get(0)));
             }
             return JFileChooser.APPROVE_OPTION;
         } else {
@@ -246,7 +246,7 @@ public class KFileChooser extends JFileChooser {
         }
 
         if (kdp.getProcess().exitValue() == 0) {
-            setSelectedFile(new File(kdp.getStdOutStream().getList().get(0)));
+            setSelectedFile(new File(kdp.getStdOut().get(0)));
             return JFileChooser.APPROVE_OPTION;
         } else {
             return JFileChooser.ERROR_OPTION;

exec/src/com/dmdirc/addons/exec/ExecCommand.java

@@ -33,7 +33,7 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.CommandUtils;
-import com.dmdirc.util.io.StreamReader;
+import com.dmdirc.util.io.StreamUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -88,13 +88,8 @@ public class ExecCommand extends Command {
                         ? null : new LinkedList<String>();
                 final List<String> errorOutput = args.isSilent()
                         ? null : new LinkedList<String>();
-                final StreamReader inputReader = new StreamReader(
-                        p.getInputStream(), execOutput);
-                final StreamReader errorReader = new StreamReader(
-                        p.getErrorStream(), errorOutput);
-
-                inputReader.run();
-                errorReader.run();
+                StreamUtils.readStreamIntoList(p.getInputStream(), execOutput);
+                StreamUtils.readStreamIntoList(p.getErrorStream(), errorOutput);
                 if (!args.isSilent()) {
                     for (String line : execOutput) {
                         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, line);

freedesktop_notifications/src/com/dmdirc/addons/freedesktop_notifications/FDManager.java

@@ -33,7 +33,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.implementations.PluginFilesHelper;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.io.StreamReader;
+import com.dmdirc.util.io.StreamUtils;
 
 import com.google.common.base.Strings;
 import com.google.common.html.HtmlEscapers;
@@ -110,8 +110,8 @@ public class FDManager implements ConfigChangeListener {
         try {
             final Process myProcess = Runtime.getRuntime().exec(args);
             final StringBuffer data = new StringBuffer();
-            new StreamReader(myProcess.getErrorStream()).start();
-            new StreamReader(myProcess.getInputStream(), data).start();
+            StreamUtils.readStream(myProcess.getErrorStream());
+            StreamUtils.readStreamIntoStringBuffer(myProcess.getInputStream(), data);
             try {
                 myProcess.waitFor();
             } catch (InterruptedException e) {

mediasource_windows/src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

@@ -27,7 +27,7 @@ import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.implementations.PluginFilesHelper;
-import com.dmdirc.util.io.StreamReader;
+import com.dmdirc.util.io.StreamUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -76,8 +76,8 @@ public class WindowsMediaSourcePlugin extends BasePlugin
                 player,
                 method});
             final StringBuffer data = new StringBuffer();
-            new StreamReader(myProcess.getErrorStream()).start();
-            new StreamReader(myProcess.getInputStream(), data).start();
+            StreamUtils.readStream(myProcess.getErrorStream());
+            StreamUtils.readStreamIntoStringBuffer(myProcess.getInputStream(), data);
             try {
                 myProcess.waitFor();
             } catch (InterruptedException e) {