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

Timestamp:

2017-05-08T21:18:21+12:00 (7 years ago)

Author:

ak19

Message:

GS3 source code now updated to use SafeProcess instead of Process (calling Runtime.exec() directly). The use of SafeProcess in RunTarget and BrowserLauncher has been tested on Linux. GDBMWrapper, MapRetrieve and admin/guiext's Command.java are not tested. For GDBMWrapper, because it's in a bit of code that works with txtgz databases. MapRetrive.java and Command.java are untested because I don't know how to test them.

File:

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

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

@@ -12 +12 @@
 import javax.swing.JTextArea;
 import javax.swing.JOptionPane;
+
+import org.greenstone.util.SafeProcess;
 
 public class Command implements Runnable
@@ -57 +59 @@
         
     File workingDirectory = new File(_parent.getParent().getParent().getExtensionDirectory());
-    Process commandLineProc = null;
+    SafeProcess commandLineProc = null;
     try{
         commandLineProc = null;
+        String[] args = new String[3];
         
         if(System.getProperty("os.name").contains("Windows")){
-        String[] args = new String[3];
         args[0] = "cmd.exe";
         args[1] = "/C";
@@ -75 +77 @@
         messageArea.append("\nExecuting \"" + allArgs + "\" on the command line\n");
 
-        commandLineProc = Runtime.getRuntime().exec(args, null, workingDirectory);
+        //commandLineProc = Runtime.getRuntime().exec(args, null, workingDirectory);
         }
         else{
-        String[] args = new String[3];
         args[0] = "sh";
         args[1] = "-c";
@@ -90 +91 @@
 
         messageArea.append("\nExecuting \"" + allArgs + "\" on the command line\n");
-        commandLineProc = Runtime.getRuntime().exec(args, null, workingDirectory);
-        }
-        
+        //commandLineProc = Runtime.getRuntime().exec(args, null, workingDirectory);
+        }
+
+        commandLineProc = new SafeProcess(args, null, workingDirectory); 
+
+        /*
         BufferedReader stdInput = new BufferedReader(new InputStreamReader(commandLineProc.getInputStream()));
 
@@ -104 +108 @@
         
         int success = commandLineProc.waitFor();
-        
+        */
+
+        // Replacing the above and its use of the PrinterThread inner class with SafeProcess.java:
+        SafeProcess.LineByLineHandler outLineHandler = new ProcessLineHandler(messageArea, SafeProcess.STDOUT);
+        SafeProcess.LineByLineHandler errLineHandler = new ProcessLineHandler(messageArea, SafeProcess.STDERR);         
+
+        int success = commandLineProc.runProcess(outLineHandler, errLineHandler);
+
         if(success != 0){
         System.err.println("Command line process \"" + command  + "\" returned unsuccessfully with the value \"" + success + "\"");
@@ -148 +159 @@
     }
 
+    /*
     public class PrinterThread extends Thread
     {
@@ -173 +185 @@
         }
     }
+    }*/
+
+    public class ProcessLineHandler extends SafeProcess.LineByLineHandler
+    {
+    // These members need to be final in order to synchronize on them
+    private final JTextArea _messageArea;
+
+    public ProcessLineHandler(JTextArea messageArea, int src)
+    {
+        super(src); // will set this.source to STDERR or STDOUT
+        _messageArea = messageArea;
+    }
+
+    public void gotLine(String line) { // first non-null line
+
+        // messageArea needs to be synchronized, since both the process'
+        // stderr and stdout will be attempting to append to it
+
+        synchronized(_messageArea) {
+        _messageArea.append(line + "\n");
+        _messageArea.setSelectionEnd(_messageArea.getDocument().getLength());
+        }
+    }
+    public void gotException(Exception e) {
+        e.printStackTrace();
+    }
+
     }
 }