[Swift-commit] r5825 - in trunk/src/org/griphyn/vdl/karajan/monitor: monitors/ansi processors

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-07-12 11:20:48 -0500 (Thu, 12 Jul 2012)
New Revision: 5825

Modified:
   trunk/src/org/griphyn/vdl/karajan/monitor/monitors/ansi/SummaryPane.java
   trunk/src/org/griphyn/vdl/karajan/monitor/processors/SummaryProcessor.java
Log:
fixed incorrect non-zero values when a state is missing from the progress ticker output line

Modified: trunk/src/org/griphyn/vdl/karajan/monitor/monitors/ansi/SummaryPane.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/monitor/monitors/ansi/SummaryPane.java	2012-07-11 20:35:21 UTC (rev 5824)
+++ trunk/src/org/griphyn/vdl/karajan/monitor/monitors/ansi/SummaryPane.java	2012-07-12 16:20:48 UTC (rev 5825)
@@ -34,7 +34,7 @@
 public class SummaryPane extends Container {
     private SystemState state;
 
-    private static final String[] STATES = new String[] { "Initializing", "Selecting site",
+    public static final String[] STATES = new String[] { "Initializing", "Selecting site",
             "Stage in", "Submitting", "Submitted", "Active", "Stage out",
             "Failed", "Replicating", "Finished successfully" };
     

Modified: trunk/src/org/griphyn/vdl/karajan/monitor/processors/SummaryProcessor.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/monitor/processors/SummaryProcessor.java	2012-07-11 20:35:21 UTC (rev 5824)
+++ trunk/src/org/griphyn/vdl/karajan/monitor/processors/SummaryProcessor.java	2012-07-12 16:20:48 UTC (rev 5825)
@@ -25,6 +25,7 @@
 import org.griphyn.vdl.karajan.monitor.SystemState;
 import org.griphyn.vdl.karajan.monitor.items.StatefulItemClass;
 import org.griphyn.vdl.karajan.monitor.items.SummaryItem;
+import org.griphyn.vdl.karajan.monitor.monitors.ansi.SummaryPane;
 
 public class SummaryProcessor extends AbstractMessageProcessor {
 
@@ -47,6 +48,9 @@
 		    }
 		}
 		String[] pairs = msg.split("  ");
+		for (String key : SummaryPane.STATES) {
+		    s.setCount(key, 0);
+		}
 		for (String pair : pairs) {
 		    if (pair.equals("")) {
 		        continue;