--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java	2014-08-01 22:29:57 UTC (rev 834)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringApplication.java	2014-08-02 00:29:37 UTC (rev 835)
@@ -42,9 +42,7 @@

 import java.io.PrintStream;
 import java.net.InetAddress;
 import java.text.SimpleDateFormat;

-import java.util.ArrayList;

 import java.util.Date;

-import java.util.List;

 import java.util.Vector;
 import java.util.logging.Handler;
 import java.util.logging.Level;

@@ -71,7 +69,7 @@

 import org.hps.monitoring.enums.SteeringType;
 import org.hps.monitoring.gui.model.Configuration;
 import org.hps.monitoring.gui.model.ConfigurationModel;

-import org.hps.monitoring.gui.model.HasConfigurationModel;

+import org.hps.monitoring.gui.model.RunModel;

 import org.hps.monitoring.plotting.MonitoringAnalysisFactory;
 import org.hps.monitoring.plotting.MonitoringPlotFactory;
 import org.hps.monitoring.record.EventProcessingChain;

@@ -158,6 +156,9 @@

     
     // The ConfigurationModel for updating GUI components from the global configuration.
     private ConfigurationModel configurationModel = new ConfigurationModel();

+    
+    // The RunModel for updating the RunPanel.
+    private RunModel runModel = new RunModel();

                    
     /**
      * Constructor for the monitoring application.

@@ -301,7 +302,7 @@

         mainPanel.add(connectionStatusPanel, c);
 
         // Run status panel.

-        runPanel = new RunPanel();

+        runPanel = new RunPanel(runModel);

         c = new GridBagConstraints();
         c.insets = new Insets(5, 0, 5, 0);
         c.fill = GridBagConstraints.BOTH;

@@ -1166,29 +1167,23 @@

         // Get a list of Drivers to execute from the JobManager which was
         // already configured.
         eventProcessing.add(jobManager.getDriverExecList());

-        
-        // Using an ET server or an EVIO file?
-        if (usingEtServer() || usingEvioFile()) {
-            // ET or EVIO source can be used for updating the RunPanel.
-            eventProcessing.add(runPanel.new EvioUpdater());
-        
-            // Basic ET system monitor.  
-            if (usingEtServer())
-                eventProcessing.add(new EtSystemMonitor());
-            
-        } else {
-            // Using an LCIO file source so must use a different updater for the RunPanel.
-            eventProcessing.add(runPanel.new CompositeRecordUpdater());
-        }
-                        

+                                                         

         // Using an ET server?

-        if (usingEtServer())
-            // Add ET system strip charts.

+        if (usingEtServer()) {
+            
+            // ET system monitor.
+            eventProcessing.add(new EtSystemMonitor());
+            
+            // ET system strip charts.

             eventProcessing.add(new EtSystemStripCharts());

-        

+        }
+                

         // Setup the event processing based on the above configuration.
         eventProcessing.setup();
         

+        // Add processor for updating the RunPanel.
+        eventProcessing.add(runPanel.new RunModelUpdater());
+        

         // Create the event processing thread.
         eventProcessingThread = new EventProcessingThread(eventProcessing);
         

@@ -1545,10 +1540,10 @@

         }
        
         // Log all status changes.

-        log(level, "STATUS CHANGED, "
-                + "subsystem: " + status.getSubsystem() + ", "

+        log(level, "STATUS, "
+                + "subsys: " + status.getSubsystem() + ", "

                 + "code: " + status.getStatusCode().name() + ", "                 

-                + "description: " + status.getDescription() + ", "                 
-                + "message: " + status.getMessage());

+                + "descr: " + status.getDescription() + ", "                 
+                + "mesg: " + status.getMessage());

     }
 }

\ No newline at end of file

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/AbstractModel.java	2014-08-01 22:29:57 UTC (rev 834)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/AbstractModel.java	2014-08-02 00:29:37 UTC (rev 835)
@@ -34,11 +34,11 @@

         propertyChangeSupport.firePropertyChange(evt);
     }
     

-    abstract public String[] getProperties();

+    abstract public String[] getPropertyNames();

     
     // FIXME: This method is kind of a hack.  Any other good way to do this?
     public void fireAllChanged() {

-        for (String property : getProperties()) {

+        for (String property : getPropertyNames()) {

             Method getMethod = null;
             for (Method method : getClass().getMethods()) {
                 if (method.getName().equals("get" + property)) {

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/ConfigurationModel.java	2014-08-01 22:29:57 UTC (rev 834)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/ConfigurationModel.java	2014-08-02 00:29:37 UTC (rev 835)
@@ -353,7 +353,7 @@

     }
             
     @Override

-    public String[] getProperties() {

+    public String[] getPropertyNames() {

         return CONFIG_PROPERTIES;
     }
 }

\ No newline at end of file

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/RunModel.java	                        (rev 0)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/RunModel.java	2014-08-02 00:29:37 UTC (rev 835)
@@ -0,0 +1,148 @@

+package org.hps.monitoring.gui.model;
+
+import java.util.Date;
+
+/**
+ * Backing model for run information that shows in the {@link org.hps.monitoring.gui.RunPanel}.
+ */
+public class RunModel extends AbstractModel {
+    
+    public final static String RUN_NUMBER_PROPERTY = "RunNumber"; 
+    public final static String START_DATE_PROPERTY = "StartDate";
+    public final static String END_DATE_PROPERTY = "EndDate";
+    public final static String RUN_LENGTH_PROPERTY = "RunLength"; // set at end, in seconds
+    public final static String TOTAL_EVENTS_PROPERTY = "TotalEvents"; // only set at end
+    public final static String EVENTS_RECEIVED_PROPERTY = "EventsReceived"; // events received so far
+    public final static String ELAPSED_TIME_PROPERTY = "ElapsedTime"; // updated on the fly, in seconds
+    public final static String DATA_RECEIVED_PROPERTY = "DataReceived"; // updated on the fly, in bytes
+
+    static final String[] properties = new String[] {
+        RUN_NUMBER_PROPERTY,
+        START_DATE_PROPERTY,
+        END_DATE_PROPERTY,
+        RUN_LENGTH_PROPERTY,
+        TOTAL_EVENTS_PROPERTY,
+        ELAPSED_TIME_PROPERTY,
+        DATA_RECEIVED_PROPERTY
+    };
+    
+    int runNumber;
+    Date startDate;
+    Date endDate;
+    int runLength;
+    int totalEvents;
+    int eventsReceived;
+    int elapsedTime;
+    long dataReceived;
+          
+    public String[] getPropertyNames() {
+        return properties;
+    }
+    
+    public int getRunNumber() {
+        return runNumber;
+    }
+    
+    public void setRunNumber(int runNumber) {
+        int oldValue = this.runNumber;
+        this.runNumber = runNumber;
+        this.firePropertyChange(RUN_NUMBER_PROPERTY, oldValue, this.runNumber);
+    }
+    
+    public Date getStartDate() {
+        return startDate;
+    }
+    
+    public void setStartDate(Date startDate) {
+        Date oldValue = this.startDate;
+        this.startDate = startDate;
+        this.firePropertyChange(START_DATE_PROPERTY, oldValue, this.startDate);
+    }
+    
+    public Date getEndDate() {
+        return endDate;
+    }
+    
+    public void setEndDate(Date endDate) {
+        Date oldValue = this.endDate;
+        this.endDate = endDate;
+        this.firePropertyChange(END_DATE_PROPERTY, oldValue, this.endDate);
+    }
+    
+    public int getRunLength() {
+        return runLength;
+    }
+    
+    public void setRunLength(int runLength) {
+        int oldValue = this.runLength;
+        this.runLength = runLength;
+        this.firePropertyChange(RUN_LENGTH_PROPERTY, oldValue, this.runLength);
+    }
+    
+    public void computeRunLength() {
+        if (startDate != null && endDate != null) {
+            long elapsedMillis = endDate.getTime() - startDate.getTime();
+            int elapsedSeconds = (int)((double)elapsedMillis / 1000.);
+            setElapsedTime(elapsedSeconds);
+        }
+    }
+    
+    public int getTotalEvents() {
+        return totalEvents;
+    }
+    
+    public void setTotalEvents(int totalEvents) {
+        int oldValue = this.totalEvents;
+        this.totalEvents = totalEvents;
+        this.firePropertyChange(TOTAL_EVENTS_PROPERTY, oldValue, this.totalEvents);
+    }
+    
+    public int getEventsReceived() {
+        return eventsReceived;
+    }
+    
+    public void setEventsReceived(int eventsReceived) {
+        int oldValue = this.eventsReceived;
+        this.eventsReceived = eventsReceived;
+        this.firePropertyChange(EVENTS_RECEIVED_PROPERTY, oldValue, this.eventsReceived);
+    }
+    
+    public void incrementEventsReceived() {
+        this.setEventsReceived(eventsReceived + 1);
+    }
+    
+    public int getElapsedTime() {
+        return elapsedTime;
+    }
+    
+    public void setElapsedTime(int elapsedTime) {
+        int oldValue = this.elapsedTime;
+        this.elapsedTime = elapsedTime;
+        this.firePropertyChange(ELAPSED_TIME_PROPERTY, oldValue, this.elapsedTime);
+    }
+           
+    public long getDataReceived() {
+        return dataReceived;
+    }
+    
+    public void setDataReceived(long dataReceived) {
+        long oldValue = this.dataReceived;
+        this.dataReceived = dataReceived;
+        this.firePropertyChange(DATA_RECEIVED_PROPERTY, oldValue, this.dataReceived);
+    }
+    
+    public void addDataReceived(long addDataReceived) {
+        this.setDataReceived(dataReceived + addDataReceived);
+    }
+    
+    public void reset() {
+        setDataReceived(0);
+        setElapsedTime(0);
+        setEndDate(null);
+        setEventsReceived(0);
+        setRunLength(0);
+        setRunNumber(0);
+        setStartDate(null);
+        setTotalEvents(0);
+    }
+}

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EvioProcessingStep.java	2014-08-01 22:29:57 UTC (rev 834)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EvioProcessingStep.java	2014-08-02 00:29:37 UTC (rev 835)
@@ -8,7 +8,7 @@

 import org.freehep.record.loop.RecordLoop.Command;
 import org.freehep.record.source.NoSuchRecordException;
 import org.hps.evio.EventConstants;

-import org.hps.monitoring.record.EventProcessingChain.SourceType;

+import org.hps.monitoring.enums.DataSourceType;

 import org.hps.monitoring.record.composite.CompositeRecord;
 import org.hps.monitoring.record.composite.CompositeRecordProcessor;
 import org.hps.monitoring.record.evio.EvioEventLoop;

@@ -26,7 +26,7 @@

 class EvioProcessingStep extends CompositeRecordProcessor {
    
     EvioEventLoop loop = new EvioEventLoop();

-    SourceType sourceType;

+    DataSourceType sourceType;

     EvioEventQueue evioEventQueue;
     boolean stopOnEndRun;
 

@@ -73,7 +73,7 @@

      * Set the type of event source.
      * @param sourceType The type of event source.
      */

-    void setSourceType(SourceType sourceType) {

+    void setSourceType(DataSourceType sourceType) {

         this.sourceType = sourceType;
     }
     

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecordLoopAdapter.java	2014-08-01 22:29:57 UTC (rev 834)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecordLoopAdapter.java	2014-08-02 00:29:37 UTC (rev 835)
@@ -20,6 +20,7 @@

      * @param loopEvent 
      */
     public void finish(LoopEvent loopEvent) {

+        System.out.println("CompositeRecordLoopAdapter.finish");

         for (CompositeRecordProcessor processor : processors) {
             // Call end job hook on all registered processors, which are 
             // responsible for sending the stop command to their loops.

--- java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop	2014-08-01 22:29:57 UTC (rev 834)
+++ java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop	2014-08-02 00:29:37 UTC (rev 835)
@@ -7,7 +7,7 @@

 DetectorName=HPS-TestRun-v5
 DisconnectOnError=true
 EventBuilderClassName=org.hps.evio.LCSimTestRunEventBuilder

-#logFileName=

+#LogFileName=

 LogLevel=ALL
 LogToFile=false
 #SteeringFile=

@@ -30,9 +30,7 @@

 QueueSize=0
 StationName=MY_STATION
 Verbose=false

-# Does flow mode need GUI binding?!
-#FlowMode=0

 WaitMode=TIMED

-WaitTime=10000000

+WaitTime=1000000000