Changeset 31636 for main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java

Timestamp:

2017-04-21T21:09:08+12:00 (7 years ago)

Author:

ak19

Message:

First phase of shifting gli code to use SafeProcess instead of Java Process. This phase takes care of all the easy cases.

File:

• main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java

@@ -15 +15 @@
 import org.greenstone.gatherer.greenstone.LocalGreenstone;
 import org.greenstone.gatherer.gui.*;
+import org.greenstone.gatherer.util.SafeProcess;
 import org.greenstone.gatherer.util.Utility;
 
@@ -105 +106 @@
     try {
         String [] env = null;
-        Process prcs = null; 
-        Runtime rt = Runtime.getRuntime();
+        SafeProcess prcs = null; 
       
         if (Utility.isWindows()) {
-                prcs = rt.exec(command);   
+        prcs = new SafeProcess(command);
         }
         else {
@@ -121 +121 @@
             env[2] = "GSDLHOME=" + Configuration.gsdl_path;
             env[3] = "GSDLOS=" + Gatherer.client_operating_system;
-            prcs = rt.exec(command, env); 
+            prcs = new SafeProcess(command, env, null);
         } 
         else {
             // Will inherit the GLI's environment, with GSDLHOME and GSDLOS set
-            prcs = rt.exec(command);
+            prcs = new SafeProcess(command);
         }
         }
-
-        InputStreamReader isr = new InputStreamReader(prcs.getErrorStream());
-        BufferedReader br = new BufferedReader(isr);
-        String line;
-        // Capture the standard error stream and seach for two particular occurences.
-        while ((line = br.readLine()) != null && !line.trim().equals("<<Finished>>")) {
-          
-        JLabel a_label = new JLabel(line);
-        a_label.setAlignmentX(Component.LEFT_ALIGNMENT);
-        info_list_pane.add(a_label);
-        }
+        
+        // special processing of Process' stderr stream: 
+        // Search the process standard error stream and seach for two particular occurences.
+        int exitVal = prcs.runProcess(null, new ProcErrStreamLineByLineHandler());
         
     } catch (Exception ioe) {
@@ -146 +139 @@
     }
 
+    private class ProcErrStreamLineByLineHandler extends SafeProcess.LineByLineHandler
+    {
+    public ProcErrStreamLineByLineHandler() {
+        super(SafeProcess.STDERR); // sets this.source
+    }
+
+    public void gotLine(String line) {
+        // Check the current line from the standard error stream and seach for two particular occurences.
+        if (!line.trim().equals("<<Finished>>")) {
+          
+        JLabel a_label = new JLabel(line);
+        a_label.setAlignmentX(Component.LEFT_ALIGNMENT);
+        ServerInfoDialog.this.info_list_pane.add(a_label);
+        }
+    }
+    public void gotException(Exception e) {
+        e.printStackTrace();
+    }
+    }
 }