Changeset 22063

Timestamp:

2010-05-07T15:33:37+12:00 (14 years ago)

Author:

sjm84

Message:

This now prints a processes STDIN and STDERR simultaneously

File:

• main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/Command.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/Command.java

@@ -94 +94 @@
         
         BufferedReader stdInput = new BufferedReader(new InputStreamReader(commandLineProc.getInputStream()));
-        BufferedReader errInput = new BufferedReader(new InputStreamReader(commandLineProc.getErrorStream()));
-        String s= "";
-        
-        while ((s = stdInput.readLine()) != null) {
-        messageArea.append(s + "\n");
-        messageArea.setSelectionEnd(messageArea.getDocument().getLength());
-        }  
-        
-        boolean error = false;
-        while ((s = errInput.readLine()) != null){
-        messageArea.append(s + "\n");
-        error = true;
-        }  
-        
-        if(error){
-        JOptionPane.showMessageDialog(new JFrame(), "There was an error while running the command line process");   
-        _parent.threadError();
-        return;
-        }
+
+        Thread stdPrinter = new PrinterThread(messageArea, stdInput);
+        stdPrinter.start();
+
+        BufferedReader stdError = new BufferedReader(new InputStreamReader(commandLineProc.getErrorStream()));
+
+        Thread errPrinter = new PrinterThread(messageArea, stdError);
+        errPrinter.start();
         
         int success = commandLineProc.waitFor();
@@ -158 +147 @@
     return (String)_osCommands.get("default");
     }
+
+    public class PrinterThread extends Thread
+    {
+    JTextArea _messageArea = null;
+    BufferedReader _output = null;
+
+    public PrinterThread(JTextArea messageArea, BufferedReader output)
+    {
+        _messageArea = messageArea;
+        _output = output;
+    }
+    
+    public void run()
+    {
+        String s = "";
+
+        try{
+        while ((s = _output.readLine()) != null) {
+            _messageArea.append(s + "\n");
+            _messageArea.setSelectionEnd(_messageArea.getDocument().getLength());
+        }  
+        }
+        catch(Exception ex){
+        ex.printStackTrace();
+        }
+    }
+    }
 }