Changeset 4081

Timestamp:

Dec 17, 2010, 9:32:28 AM (12 years ago)

Author:

olle

Message:

Refs #668. Class/file plugins/RunMsInspectPlugin.java in plugin/ updated with progress information during msInspect feature finding:

1. Private inner class StreamGobbler updated with new instance variable ProgressReporter myProgress, initially set to null. New constructor StreamGobbler(InputStream is, String type, OutputStream redirect, ProgressReporter progress) added, that takes a ProgressReporter argument and sets the value of instance variable myProgress to this. Public method void run() updated to call new private method void updateProgressInformation(ProgressReporter progress, String line) with the value of instance variable myProgress and the string read from the input stream.

2. Private method void msInspectSearchLocal(Request request, Response response, ProgressReporter progress, ...) updated to call new StreamGobbler constructor for the error input stream, and setting the ProgressReporter argument to the value of local variable progress.

3. New private method void updateProgressInformation(ProgressReporter progress, String line) added. It updates the progress reporter information with data parsed from the input string.

File:

• trunk/plugin/src/org/proteios/plugins/RunMsInspectPlugin.java (modified) (5 diffs)

trunk/plugin/src/org/proteios/plugins/RunMsInspectPlugin.java

@@ -77 +77 @@
     OutputStream os;
     String content = null;
+    ProgressReporter myProgress = null;
 
 
@@ -90 +91 @@
       this.type = type;
       this.os = redirect;
+    }
+
+
+    StreamGobbler(InputStream is, String type, OutputStream redirect, ProgressReporter progress)
+    {
+      this.is = is;
+      this.type = type;
+      this.os = redirect;
+      this.myProgress = progress;
     }
 
@@ -133 +143 @@
             content = content + "\n" + line;
           }
+          // Parse output for progress report
+          updateProgressInformation(myProgress, line);
         }
         if (pw != null)
@@ -455 +467 @@
       Runtime rt = Runtime.getRuntime();
       Process proc = rt.exec(cmd);
+      /*
       // any error message?
       StreamGobbler errorGobbler = new StreamGobbler(proc
         .getErrorStream(), "ERR");
+      */
+      // Parse error stream for progress info
+      // any error message?
+      StreamGobbler errorGobbler = new StreamGobbler(proc
+        .getErrorStream(), "ERR", null, progress);
       // any output?
       StreamGobbler outputGobbler = new StreamGobbler(proc
@@ -713 +731 @@
 
   /**
+   * Updates progress reporter information.
+   * 
+   * @param progress ProgressReporter The progress reporter instance to use.
+   * @param line String The information string to parse for progress information
+   */
+  private void updateProgressInformation(ProgressReporter progress, String line)
+  {
+    // Parse output for progress report
+    if (progress != null)
+    {
+      if (line.contains("complete"))
+      {
+        // msInspect typically outputs a line like "16 Dec 2010 11:02:02,965 INFO  ApplicationContext: 12.043658% complete."
+        String testStr = new String("ApplicationContext: ");
+        int index = line.indexOf(testStr);
+        if (index >= 0)
+        {
+          // Cut off start of string including testStr 
+          String percentStr = line.substring(index + testStr.length());
+          /*
+          System.out
+            .println(this.getClass().getSimpleName() + ": percentStr (1) = \"" + percentStr + "\"");
+          */
+          testStr = new String(".");
+          index = percentStr.indexOf(testStr);
+          if (index >= 0)
+          {
+            // Cut off end of string starting with testStr
+            percentStr = percentStr.substring(0, index);
+            /*
+            System.out
+              .println(this.getClass().getSimpleName() + ": percentStr (2) = \"" + percentStr + "\"");
+            */
+            // Convert percent string to int
+            int percentCompleted = 0;
+            try
+            {
+              percentCompleted = Integer.parseInt(percentStr);
+            }
+            catch (NumberFormatException e)
+            {}
+            // Total progress includes more than msInspect analysis
+            if (percentCompleted > 99)
+            {
+              percentCompleted = 99;
+            }
+            progress.display(percentCompleted, "% completed");
+          }
+        }
+      }
+    }
+  }
+
+
+  /**
    * Update command line with new option and value,
    * provided that the value differs from null and