Changeset 1022

Timestamp:

Apr 6, 2009, 7:16:11 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Fixes #184. Progress bar is updated in the abstract class only.

File:

• plugins/base2/net.sf.basedb.pluginutilities/trunk/src/net/sf/basedb/plugins/AbstractRunBinaryPlugin.java (modified) (4 diffs)

plugins/base2/net.sf.basedb.pluginutilities/trunk/src/net/sf/basedb/plugins/AbstractRunBinaryPlugin.java

@@ -152 +152 @@
   {
     if (debug_output) System.err.println("execute");
-    percentDone+=1;
-    progress.display(percentDone,"Running " + about.getName());
+    if (progress != null) progress.display(5, (about.getName() +
+                                               " waiting for external binary."));
     cmd[0]=getBinaryPath(this.getClass(),cmd[0]);
     Process p = Runtime.getRuntime().exec(cmd, null, getExecDirectory());
@@ -307 +307 @@
       if (sourceBAS==null)
         sourceBAS = getSourceBioAssaySet(dc);
+      if (progress != null) progress.display(0, about.getName());
       runBinary();
+      if (progress != null) progress.display(90, "Storing result");
       storeResult(dc);
       if (debug_output)
@@ -327 +329 @@
       if (!debug_output) {
         // clean up
+        if (progress != null) progress.display(100, "Clean up");
         java.io.File[] files=getExecDirectory().listFiles();
         for (java.io.File f : files)
@@ -396 +399 @@
   private RequestInformation configureJob = null;
   private java.io.File execDirectory;
-  private int percentDone=0;
   private ProgressReporter progress=null;