--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/AbstractFieldsPanel.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/AbstractFieldsPanel.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -9,6 +9,7 @@

 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;

+import javax.swing.JFormattedTextField;

 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;

@@ -71,8 +72,8 @@

      * @param editable The editable setting.
      * @return The JTextField component.
      */

-    protected final JTextField addField(String name, String value, String tooltip, int size, boolean editable) {
-        JTextField f = addField(name, value, size, editable);

+    protected final JFormattedTextField addField(String name, String value, String tooltip, int size, boolean editable) {
+        JFormattedTextField f = addField(name, value, size, editable);

         f.setToolTipText(tooltip);
         return f;
     }

@@ -85,7 +86,7 @@

      * @param editable The editable setting.
      * @return The JTextField component.
      */

-    protected final JTextField addField(String name, String value, int size, boolean editable) {

+    protected final JFormattedTextField addField(String name, String value, int size, boolean editable) {

         GridBagConstraints c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = currY;

@@ -99,7 +100,9 @@

         c.gridy = currY;
         c.insets = insets;
         c.anchor = GridBagConstraints.EAST;

-        JTextField field = new JTextField(value, size);

+        //JFormattedTextField field = new JFormattedTextField(value, size);
+        JFormattedTextField field = new JFormattedTextField(value);
+        field.setColumns(size);

         field.setHorizontalAlignment(JTextField.RIGHT);
         field.setEditable(editable);
         field.setBackground(Color.WHITE);

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/ConnectionSettingsPanel.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/ConnectionSettingsPanel.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -5,7 +5,6 @@

 
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;

-import javax.swing.JOptionPane;

 import javax.swing.JTextField;
 
 import org.hps.monitoring.config.Configurable;

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringCommands.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/MonitoringCommands.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -5,6 +5,14 @@

  * A few commands handled only by sub-components are not listed here.
  */
 final class MonitoringCommands {

+    
+    static final String DISCONNECT_ON_ERROR_CHANGED = "disconnectOnErrorChanged";
+    static final String STEERING_TYPE_CHANGED = "steeringTypeChanged";
+    static final String STEERING_RESOURCE_CHANGED = "steeringResourceChanged";
+    static final String LOG_TO_FILE_CHANGED = "logToFileChanged";
+    static final String AIDA_AUTO_SAVE_CHANGED = "aidaAutoSaveChanged";
+    static final String LOG_LEVEL_CHANGED = "logLevelChanged";    
+       

     static final String AIDA_AUTO_SAVE = "aidaAutoSave";
     static final String CLEAR_LOG_TABLE = "clearLogTable";
     static final String CHOOSE_LOG_FILE = "chooseLogFile";

@@ -22,8 +30,8 @@

     static final String SAVE_PLOTS = "savePlots";
     static final String SCREENSHOT = "screenshot";
     static final String SAVE_CONFIG_FILE = "saveConfigFile";

-    static final String SET_EVENT_BUILDER = "setEventBuilder";
-    static final String SET_LOG_LEVEL = "setLogLevel";

+    static final String SET_EVENT_BUILDER = "setEventBuilder";    
+

     static final String SET_STEERING_RESOURCE = "setSteeringResource";            
     static final String SELECT_CONFIG_FILE = "selectConfigFile";
     static final String SELECT_LOG_FILE = "logToFile";

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SettingsPanel.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SettingsPanel.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -83,7 +83,7 @@

      */
     void save() {
         connectionPanel.save();

-        jobPanel.save();

+        //jobPanel.save();

         dataSourcePanel.save();
     }
     

@@ -92,7 +92,7 @@

      */
     void reset() {
         connectionPanel.reset();

-        jobPanel.reset();

+        //jobPanel.reset();

         dataSourcePanel.reset();
     }
     

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SystemStatusFrame.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SystemStatusFrame.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -1,11 +1,11 @@

 package org.hps.monitoring.gui;
 

-import static org.hps.monitoring.gui.SystemStatusTableModel.ACTIVE_COL;
-import static org.hps.monitoring.gui.SystemStatusTableModel.CLEARABLE_COL;
-import static org.hps.monitoring.gui.SystemStatusTableModel.LAST_CHANGED_COL;
-import static org.hps.monitoring.gui.SystemStatusTableModel.RESET_COL;
-import static org.hps.monitoring.gui.SystemStatusTableModel.STATUS_COL;
-import static org.hps.monitoring.gui.SystemStatusTableModel.SYSTEM_COL;

+import static org.hps.monitoring.gui.model.SystemStatusTableModel.ACTIVE_COL;
+import static org.hps.monitoring.gui.model.SystemStatusTableModel.CLEARABLE_COL;
+import static org.hps.monitoring.gui.model.SystemStatusTableModel.LAST_CHANGED_COL;
+import static org.hps.monitoring.gui.model.SystemStatusTableModel.RESET_COL;
+import static org.hps.monitoring.gui.model.SystemStatusTableModel.STATUS_COL;
+import static org.hps.monitoring.gui.model.SystemStatusTableModel.SYSTEM_COL;

 
 import java.awt.Color;
 import java.awt.Component;

@@ -24,6 +24,7 @@

 import javax.swing.table.TableCellRenderer;
 
 import org.hps.monitoring.enums.StatusCode;

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

 
 /**
  * A GUI window for showing changes to {@link org.hps.monitoring.subsys.SystemStatus} objects.

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SystemStatusTableModel.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/SystemStatusTableModel.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -1,149 +0,0 @@

-package org.hps.monitoring.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.table.AbstractTableModel;
-
-import org.hps.monitoring.enums.StatusCode;
-import org.hps.monitoring.subsys.SystemStatus;
-import org.hps.monitoring.subsys.SystemStatusListener;
-
-/**
- * A <code>JTableModel</code> that has a backing list of 
- * {@link org.hps.monitoring.subsys.SystemStatus} objects.
- */
-public class SystemStatusTableModel extends AbstractTableModel implements SystemStatusListener {
-
-    static final int RESET_COL = 0;
-    static final int ACTIVE_COL = 1;
-    static final int STATUS_COL = 2;
-    static final int SYSTEM_COL = 3;
-    static final int DESCRIPTION_COL = 4;
-    static final int MESSAGE_COL = 5;
-    static final int LAST_CHANGED_COL = 6;
-    static final int CLEARABLE_COL = 7;
-            
-    static final String[] columnNames = {
-            "Reset",
-            "Active",
-            "Status",
-            "System",       
-            "Description",
-            "Message", 
-            "Last Changed",
-            "Clearable"
-    };
-    
-    List<SystemStatus> statuses = new ArrayList<SystemStatus>();
-    final SimpleDateFormat dateFormat = new SimpleDateFormat("MMMM-dd-yyyy HH:mm:ss.SSS");
-    
-    public void addSystemStatus(SystemStatus status) {
-        statuses.add(status);
-        status.addListener(this);
-        fireTableDataChanged();
-    }
-        
-    @Override
-    public int getRowCount() {
-        return statuses.size();
-    }
-
-    @Override
-    public int getColumnCount() {
-        return columnNames.length;
-    }
-    
-    @Override
-    public String getColumnName(int col) {        
-        return columnNames[col];
-    }
-
-    @Override
-    public Object getValueAt(final int rowIndex, final int columnIndex) {
-        SystemStatus status = statuses.get(rowIndex);
-        switch (columnIndex) {
-            case ACTIVE_COL:
-                return status.isActive();
-            case STATUS_COL:
-                return status.getStatusCode().name();
-            case SYSTEM_COL:
-                return status.getSubsystem().name();
-            case DESCRIPTION_COL:
-                return status.getDescription();
-            case MESSAGE_COL:
-                return status.getMessage();
-            case LAST_CHANGED_COL:
-                return new Date(status.getLastChangedMillis());
-            case RESET_COL:
-                // If the status is clearable, then it has a button that can be used to
-                // manually set the state to CLEARED.  If the status is not clearable,
-                // then nothing is rendered in this cell.
-                if (status.isClearable()) {
-                    final JButton button = new JButton();
-                    button.addActionListener(new ActionListener() {
-                        public void actionPerformed(ActionEvent e) {                            
-                            SystemStatus status = statuses.get(rowIndex);
-                            // Only clearable statuses can have this state set.  Check for this
-                            // just to be safe, even though no button is available for non-clearable
-                            // statuses.
-                            if (status.isClearable()) {
-                                StatusCode oldStatusCode = status.getStatusCode();
-                                status.setStatus(StatusCode.CLEARED, "Cleared from " + oldStatusCode.name() + " state.");
-                            }
-                        }
-                    });
-                    return button;
-                } else {
-                    return null;
-                }                
-            case CLEARABLE_COL:
-                return status.isClearable();
-            default:
-                return null;
-        }
-    }
-    
-    @Override
-    public Class getColumnClass(int column) {
-        switch (column) {
-            case ACTIVE_COL:
-                return Boolean.class;
-            case LAST_CHANGED_COL:
-                return Date.class;
-            default:
-                return String.class;
-        }                    
-    }
-    
-    @Override
-    public boolean isCellEditable(int row, int col) {
-        if (col == ACTIVE_COL)
-            return true;        
-        else 
-            return false;
-    }
-    
-    @Override
-    public void statusChanged(SystemStatus status) {
-        int rowNumber = statuses.indexOf(status);
-        this.fireTableRowsUpdated(rowNumber, rowNumber);
-    }
-    
-    public void clear() {
-        statuses.clear();
-        fireTableDataChanged();
-    }
-    
-    @Override
-    public void setValueAt(Object value, int row, int col) {
-        if (col == ACTIVE_COL) {
-            statuses.get(row).setActive((Boolean) value);
-        }
-    }    
-}

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/HasConfigurationModel.java	                        (rev 0)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/gui/model/HasConfigurationModel.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -0,0 +1,9 @@

+package org.hps.monitoring.gui.model;
+
+
+public interface HasConfigurationModel {
+    
+    void setConfigurationModel(ConfigurationModel configurationModel);
+    
+    ConfigurationModel getConfigurationModel();
+}

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EventProcessingChain.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EventProcessingChain.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -63,6 +63,7 @@

     private boolean done;
     private boolean paused;
     private boolean wasSetup;

+    private boolean stopOnErrors = true;

     
     private EtProcessingStep etStep = new EtProcessingStep();
     private EvioProcessingStep evioStep = new EvioProcessingStep();

@@ -127,6 +128,8 @@

             compositeLoop.addProcessor(lcioStep);
         }
         

+        compositeLoop.setStopOnErrors(stopOnErrors);
+        

         wasSetup = true;
     }
     

@@ -329,6 +332,17 @@

     }
     
     /**

+     * Set whether processing will stop when errors occur.
+     * Only specific types of non-fatal errors are affected by this.
+     * For instance, <code>NoSuchRecordException</code> is never 
+     * ignored and always causes processing to stop.
+     * @param stopOnErrors True if processing should stop on errors. 
+     */
+    public void setStopOnErrors(boolean stopOnErrors) {
+        this.stopOnErrors = stopOnErrors;
+    }
+    
+    /**

      * Exception thrown if the loop is not in the correct state
      * when a certain method is called.
      */

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EvioProcessingStep.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/EvioProcessingStep.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -107,6 +107,7 @@

             throw new NoSuchRecordException("No current EVIO event.");
         
         record.setEvioEvent(nextEvioEvent);

+        record.setEventNumber(nextEvioEvent.getEventNumber());

         
         // Encountered an end of run record.
         if (EventConstants.isEndEvent(nextEvioEvent))

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/LcioProcessingStep.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/LcioProcessingStep.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -93,7 +93,6 @@

             throw new NoSuchRecordException("No next LCIO event.");
         
         // Load the next LCIO event.

-        // FIXME: Why does this work even if the event source says it doesn't have a next record?!

         loop.execute(NEXT);
                       
         // The last call to the loop did not create a current record.

@@ -106,6 +105,9 @@

                 
         // Update the CompositeRecord with reference to the LCIO event.
         record.setLcioEvent(lcioEvent);

+        if (record.getEvioEvent() == null) {
+            record.setEventNumber(lcioEvent.getEventNumber());
+        }

     }
     
     /**

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecord.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecord.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -14,12 +14,23 @@

     EvioEvent evioEvent;
     EventHeader lcioEvent;
     

+    int sequenceNumber = -1;
+    int eventNumber = -1;
+    
+    public void setSequenceNumber(int sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+    
+    public void setEventNumber(int eventNumber) {
+        this.eventNumber = eventNumber;
+    }
+    

     public void setEtEvent(EtEvent etEvent) {
         this.etEvent = etEvent;
     }
     
     public void setEvioEvent(EvioEvent evioEvent) {

-        this.evioEvent = evioEvent;

+        this.evioEvent = evioEvent;        

     }
     
     public void setLcioEvent(EventHeader lcioEvent) {

@@ -37,4 +48,12 @@

     public EventHeader getLcioEvent() {
         return lcioEvent;
     }

+    
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+    
+    public int getEventNumber() {
+        return eventNumber;
+    }

 }

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecordLoop.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/record/composite/CompositeRecordLoop.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -1,6 +1,7 @@

 package org.hps.monitoring.record.composite;
 
 import org.freehep.record.loop.DefaultRecordLoop;

+import org.freehep.record.source.NoSuchRecordException;

 import org.freehep.record.source.RecordSource;
 
 /**

@@ -11,6 +12,7 @@

 
     CompositeRecordSource recordSource = new CompositeRecordSource();
     CompositeRecordLoopAdapter adapter = new CompositeRecordLoopAdapter();

+    boolean stopOnErrors = true;

     
     public CompositeRecordLoop() {
         setRecordSource(recordSource);

@@ -18,6 +20,10 @@

         addRecordListener(adapter);
     }
     

+    public void setStopOnErrors(boolean stopOnErrors) {
+        this.stopOnErrors = stopOnErrors;
+    }
+    

     /**
      * Set the <code>RecordSource</code> which provides <code>CompositeRecord</code> objects.
      */

@@ -38,7 +44,11 @@

     }
     
     protected void handleClientError(Throwable x) {

-        throw new RuntimeException("Error during event processing.", x);

+        if (stopOnErrors || x instanceof NoSuchRecordException) {
+            throw new RuntimeException("Error during event processing.", x);
+        } else {
+            x.printStackTrace();
+        }        

     }
 
     protected void handleSourceError(Throwable x) {

--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/subsys/SystemStatisticsImpl.java	2014-07-30 19:56:08 UTC (rev 832)
@@ -149,8 +149,10 @@

     @Override
     public void stop() { 
         // Kill the Timer.

-        if (timer != null)

+        if (timer != null) {

             timer.cancel();

+            timer.purge();
+        }

         
         // Set stop time.
         stopTimeMillis = System.currentTimeMillis();

--- java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop	2014-07-29 22:02:20 UTC (rev 831)
+++ java/trunk/monitoring-app/src/main/resources/org/hps/monitoring/config/default_config.prop	2014-07-30 19:56:08 UTC (rev 832)
@@ -2,17 +2,17 @@

 # Monitoring Application configuration
 
 # job settings

-autoSaveAida=true
-autoSaveAidaFileName=monitoringPlots.aida
-detectorName=HPS-TestRun-v5
-disconnectOnError=true
-eventBuilderClassName=org.hps.evio.LCSimTestRunEventBuilder
-logFileName=
-logLevel=ALL
-logToFile=false
-#steeringFile=
-steeringResource=/org/hps/steering/monitoring/TestRunMonitoring.lcsim
-steeringType=RESOURCE

+AutoSaveAida=true
+AidaFileName=monitoringPlots.aida
+DetectorName=HPS-TestRun-v5
+DisconnectOnError=true
+EventBuilderClassName=org.hps.evio.LCSimTestRunEventBuilder
+#logFileName=
+LogLevel=ALL
+LogToFile=false
+#SteeringFile=
+SteeringResource=/org/hps/steering/monitoring/TestRunMonitoring.lcsim
+SteeringType=RESOURCE

 
 # event source
 dataSourceType=ET_SERVER