Changeset 29016 for main/trunk

Timestamp:

2014-05-01T20:01:59+12:00 (10 years ago)

Author:

ak19

Message:

Cosmetic changes: 1. renamed inner StreamGobbler classes. 2. Reverting accidental commit of debugging statements in OpenCollectionDialog.java

Location:

main/trunk/gli/src/org/greenstone/gatherer/gui

Files:

• FormatConversionDialog.java (modified) (6 diffs)
• OpenCollectionDialog.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java

@@ -295 +295 @@
      * Then the cmdline program exits by printing the result of the conversion.
      *
-     * Explicitly sending EOFs from java is no longer necessary, as the SendStreamGobbler 
+     * Explicitly sending EOFs from java is no longer necessary, as the OutputStreamGobbler 
      * Thread takes care of closing the process stream.
      *
@@ -330 +330 @@
 
         // send inputstr to process
-        SendStreamGobbler inputGobbler = new SendStreamGobbler(prcs.getOutputStream(), inputstr);
+        OutputStreamGobbler inputGobbler = new OutputStreamGobbler(prcs.getOutputStream(), inputstr);
         
         // monitor for any error messages
-            ReadStreamGobbler errorGobbler = new ReadStreamGobbler(prcs.getErrorStream(), true);
+            InputStreamGobbler errorGobbler = new InputStreamGobbler(prcs.getErrorStream(), true);
             
             // monitor for the expected output line(s)
-            ReadStreamGobbler outputGobbler = new ReadStreamGobbler(prcs.getInputStream());
+            InputStreamGobbler outputGobbler = new InputStreamGobbler(prcs.getInputStream());
 
             // kick them off
@@ -947 +947 @@
 
     // http://www.javaworld.com/article/2071275/core-java/when-runtime-exec---won-t.html?page=2
-    class ReadStreamGobbler extends Thread
+    class InputStreamGobbler extends Thread
     {
     InputStream is = null;
@@ -954 +954 @@
     
     
-    public ReadStreamGobbler(InputStream is)
+    public InputStreamGobbler(InputStream is)
     {
         this.is = is;
@@ -960 +960 @@
     }
 
-    public ReadStreamGobbler(InputStream is, boolean split_newlines)
+    public InputStreamGobbler(InputStream is, boolean split_newlines)
     {
         this.is = is;
@@ -992 +992 @@
     }
     
-    class SendStreamGobbler extends Thread
+    class OutputStreamGobbler extends Thread
     {
     OutputStream os = null;
     String inputstr = "";
 
-    public SendStreamGobbler(OutputStream os, String inputstr)
+    public OutputStreamGobbler(OutputStream os, String inputstr)
     {
         this.os = os;

main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -444 +444 @@
             // the workspace needs to be refreshed (Documents in Greenstone Collections)
 
-        System.err.print("@@@ User chose to press: ");
-        if(result == CANCEL_OPTION) {
-        System.err.println("cancel");
-        } else {
-        System.err.println("ok");
-        }
     }
     }