diff -u -r1.6 -r1.7
--- ConnectionStatusPanel.java	3 May 2012 16:59:28 -0000	1.6
+++ ConnectionStatusPanel.java	10 May 2012 21:14:53 -0000	1.7
@@ -1,30 +1,41 @@

 package org.lcsim.hps.monitoring;
 
 import java.awt.Color;

+import java.awt.Dimension;
+import java.awt.Font;

 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;

+import java.text.SimpleDateFormat;
+import java.util.Date;

+import javax.swing.BorderFactory;

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

+import javax.swing.border.EtchedBorder;

 
 class ConnectionStatusPanel extends JPanel {
 
     JTextField statusField;

+    JTextField dateField;
+    
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("MMMM-dd-yyyy HH:mm:ss");

 
     ConnectionStatusPanel() {

-

+        

         setLayout(new GridBagLayout());

-
-        Insets insets = new Insets(5,2,1,2);

+        Insets insets = new Insets(10, 5, 5, 10);
+        setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));        
+        Font font = new Font("Arial", Font.PLAIN, 14);

 
         GridBagConstraints c = new GridBagConstraints();
         c.gridx = 0;
         c.gridy = 0;
         c.insets = insets;
         c.anchor = GridBagConstraints.WEST;

+        c.weightx = c.weighty = 1.0;

         JLabel statusLabel = new JLabel("Connection Status:");
         statusLabel.setHorizontalAlignment(JLabel.LEFT);
         add(statusLabel, c);

@@ -34,22 +45,47 @@

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

-        statusField = new JTextField("", 20);

+        c.weightx = c.weighty = 1.0;
+        statusField = new JTextField("", 15);

         statusField.setHorizontalAlignment(JTextField.CENTER);
         statusField.setEditable(false);
         statusField.setBackground(Color.WHITE);

+        statusField.setFont(font);

         add(statusField, c);

-

+        
+        c = new GridBagConstraints();
+        c.gridx = 2;
+        c.gridy = 0;
+        c.insets = insets;
+        c.anchor = GridBagConstraints.CENTER;
+        c.weightx = c.weighty = 1.0;
+        JLabel atLabel = new JLabel("@");
+        add(atLabel, c);
+        
+        c = new GridBagConstraints();
+        c.gridx = 3;
+        c.gridy = 0;
+        c.insets = insets;
+        c.anchor = GridBagConstraints.WEST;
+        c.weightx = c.weighty = 1.0;
+        dateField = new JTextField("", 15);
+        dateField.setEditable(false);
+        dateField.setBackground(Color.WHITE);
+        dateField.setHorizontalAlignment(JTextField.RIGHT);
+        dateField.setFont(font);
+        add(dateField, c);
+        

         setStatus(ConnectionStatus.DISCONNECTED);
     }
 
     void setStatus(final int status) {
         if (status < 0 || status > (ConnectionStatus.NUMBER_STATUSES - 1)) {

-            throw new IllegalArgumentException("Invalid index value.  Must be between 0 and " + (ConnectionStatus.NUMBER_STATUSES - 1) + ".");

+            throw new IllegalArgumentException("Invalid status argument: " + status);

         }
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 statusField.setText(ConnectionStatus.toString(status));

+                dateField.setText(dateFormat.format(new Date()));

             }
         });
     }

diff -u -r1.14 -r1.15
--- EventPanel.java	3 May 2012 16:59:28 -0000	1.14
+++ EventPanel.java	10 May 2012 21:14:53 -0000	1.15
@@ -37,7 +37,7 @@

  
     EventPanel() {
         

-        super(new Insets(0, 0, 0, 0), false);

+        super(new Insets(5, 5, 5, 5), false);

 
         setLayout(new GridBagLayout());
 

@@ -110,7 +110,7 @@

     }
     
     /**

-     * At end of job, all 

+     * At end of job, final event totals are pushed to the GUI. 

      */
     void endJob() {
         incrementEventCounts();

diff -u -r1.11 -r1.12
--- JobPanel.java	3 May 2012 16:59:28 -0000	1.11
+++ JobPanel.java	10 May 2012 21:14:53 -0000	1.12
@@ -9,31 +9,34 @@

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

+import javax.swing.JFileChooser;

 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
 class JobPanel extends FieldsPanel {
 

-    private JComboBox steeringComboBox;
-    private JTextField steeringField;

     private JTextField detectorNameField;

+    private JCheckBox disconnectWarningCheckBox;    
+    private JCheckBox disconnectOnErrorCheckBox;

     private JTextField eventBuilderField;

-    JCheckBox disconnectWarningCheckBox;	
-    JCheckBox disconnectOnErrorCheckBox;
-    JCheckBox logCheckBox;
-    JTextField logFileField;
-    JCheckBox remoteAidaCheckBox;
-    JTextField aidaNameField;
-    JCheckBox pauseModeCheckBox;
-    JComboBox logLevelComboBox;

+    private JComboBox steeringTypeComboBox;
+    private JTextField steeringFileField;
+    private JComboBox steeringResourcesComboBox;
+    private JCheckBox logCheckBox;
+    private JTextField logFileField;
+    private JCheckBox remoteAidaCheckBox;
+    private JTextField remoteAidaNameField;
+    private JCheckBox pauseModeCheckBox;
+    private JComboBox logLevelComboBox;
+    private JTextField aidaSaveField;
+    private JCheckBox aidaSaveCheckBox;

 
     private String defaultEventBuilderClassName = "";
 

-    private final static String[] steeringTypes = {"RESOURCE", "FILE", "NONE"};	

+    private final static String[] steeringTypes = {"RESOURCE", "FILE"};

     final static int RESOURCE = 0;
     final static int FILE = 1;

-    final static int NONE = 2;

     
     String[] logLevels = new String[] {
         Level.ALL.toString(),

@@ -48,69 +51,93 @@

 
     JobPanel() {
 

-        super(new Insets(1, 1, 1, 1), true);
-

+        super(new Insets(4, 0, 0, 4), true);

         setLayout(new GridBagLayout());
 
         pauseModeCheckBox = addCheckBox("Pause mode", false, true);

-        disconnectOnErrorCheckBox = addCheckBox("Disconnect on error", true, true);
-        disconnectWarningCheckBox = addCheckBox("Warn before disconnect", false, true);

+        disconnectOnErrorCheckBox = addCheckBox("Disconnect on error", false, true);
+        disconnectWarningCheckBox = addCheckBox("Warn before disconnect", true, true);

         logLevelComboBox = addComboBox("Log Level", this.logLevels);
         logLevelComboBox.setActionCommand(MonitoringCommands.logLevelCmd);

-        steeringComboBox = addComboBox("Steering Type", steeringTypes);  
-        steeringField = addField("Steering File", 30);
-        steeringField.setActionCommand(MonitoringCommands.steeringCmd);

+        steeringTypeComboBox = addComboBox("Steering Type", steeringTypes);  
+        steeringFileField = addField("Steering File", 30);        
+        steeringResourcesComboBox = addComboBox("Steering File Resource", SteeringFileUtil.getAvailableSteeringFileResources());

         detectorNameField = addField("Detector Name", 20);
         eventBuilderField = addField("Event Builder Class", 30);
         eventBuilderField.setActionCommand(MonitoringCommands.eventBuilderCmd);
         logCheckBox = addCheckBox("Log to File", false, false);
         logFileField = addField("Log File", "", "Full path to log file.", 30, false);

-        remoteAidaCheckBox = addCheckBox("Enabled remote AIDA", false, true);
-        aidaNameField = addField("Remote AIDA name", "", 15, true);
-

+        aidaSaveCheckBox = addCheckBox("Save AIDA at End of Job", false, false);
+        aidaSaveField = addField("AIDA Auto Save File Name", "", 30, false);
+        remoteAidaCheckBox = addCheckBox("Enable remote AIDA", false, true);
+        remoteAidaNameField = addField("Remote AIDA name", "", 15, true);
+        
+        // Set default job settings.
+        setJobSettings(new JobSettings());

     }
     

-    boolean isAIDAServerEnabled() {
-        return remoteAidaCheckBox.isSelected();
-    }

+    void enableJobPanel(boolean enable) {
+        detectorNameField.setEnabled(enable);
+        eventBuilderField.setEnabled(enable);
+        pauseModeCheckBox.setEnabled(enable);
+        remoteAidaCheckBox.setEnabled(enable);
+        remoteAidaNameField.setEnabled(enable);
+        steeringTypeComboBox.setEnabled(enable);
+        steeringFileField.setEnabled(enable);   
+        steeringResourcesComboBox.setEnabled(enable);
+    }   

-    String getRemoteAIDAName() {
-        return aidaNameField.getText();

+    void addActionListener(ActionListener listener) {
+        steeringFileField.addActionListener(listener);
+        eventBuilderField.addActionListener(listener);
+        logLevelComboBox.addActionListener(listener);
+    }
+        
+    void chooseAidaAutoSaveFile() {
+        JFileChooser fc = new JFileChooser();
+        fc.setDialogTitle("Choose AIDA Auto Save File");
+        int r = fc.showSaveDialog(this);
+        if (r == JFileChooser.APPROVE_OPTION) {
+            File file = fc.getSelectedFile();
+            String fileName = file.getPath();
+            int extIndex = fileName.lastIndexOf(".");
+            if ((extIndex == -1) || !(fileName.substring(extIndex + 1, fileName.length())).toLowerCase().equals("aida")) {
+                fileName = fileName + ".aida";
+            }
+            final String fileName2 = fileName;
+            SwingUtilities.invokeLater(new Runnable() {
+                public void run() {
+                    aidaSaveCheckBox.setSelected(true);
+                    aidaSaveField.setText(fileName2);
+                }
+            });
+        }

     }
 

-    void editSteering() {
-        String steering = steeringField.getText();
-        int steeringType = steeringComboBox.getSelectedIndex();		

+    boolean checkSteering() {
+        String steering = steeringFileField.getText();
+        int steeringType = steeringTypeComboBox.getSelectedIndex();		

         if (RESOURCE == steeringType) {
             // Check that steering resource exists.
             InputStream is = getClass().getResourceAsStream(steering);
             if (is == null) {

-                JOptionPane.showMessageDialog(this, "The LCSim steering resource does not exist.");
-                //disableSteering();

+                return false;
+            } else {
+                return true;

             }

-        } 
-        else if (FILE == steeringType) {

+        } else if (FILE == steeringType) {

             // Check that steering file exists.
             File f = new File(steering);
             if (!f.exists()) {

-                JOptionPane.showMessageDialog(this, "The LCSim steering file does not exist.");
-                //disableSteering();

+                return false;
+            } else {
+                return true;

             }

-        } 
-        else if (NONE == steeringType) {
-            if (!("".equals(steeringField.getText().trim()))) {
-                JOptionPane.showMessageDialog(this, "Select resource or file type in above combo box to enable LCSim.");
-            }
-        }
-    }
-
-    /*
-    private void disableSteering() {
-        JOptionPane.showMessageDialog(this, "No valid steering file was selected, so job will run without LCSim.");
-        steeringComboBox.setSelectedIndex(NONE);

+        } else {
+            throw new IllegalArgumentException("The steeringType is invalid: " + steeringType);
+        }               

     }

-    */
-

+ 

     void editEventBuilder() {
         String eventBuilderClassName = eventBuilderField.getText();
         try {

@@ -141,27 +168,21 @@

     }
 
     String getEventBuilderClassName() {

-        if (!"".equals(eventBuilderField.getText().trim())) {
-            return eventBuilderField.getText();
-        } else {
-            return null;
-        }

+        return eventBuilderField.getText();

     }
 
     void setSteeringFile(final String steeringFile) {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {

-                steeringField.setText(steeringFile);
-                steeringComboBox.setSelectedIndex(FILE);

+                steeringFileField.setText(steeringFile);

             }
         });
     }

-
-    void setSteeringResource(final String steeringResource) {

+    
+    void setSteeringResource(final String s) {

         SwingUtilities.invokeLater(new Runnable() {
             public void run() {

-                steeringField.setText(steeringResource);
-                steeringComboBox.setSelectedIndex(RESOURCE);

+                steeringResourcesComboBox.setSelectedItem(s);

             }
         });
     }

@@ -175,24 +196,25 @@

     }
 
     String getSteering() {

-        if (steeringComboBox.getSelectedIndex() != NONE)
-            return steeringField.getText();
-        else

+        if (getSteeringType() == FILE) {
+            return steeringFileField.getText();
+        }
+        else if (getSteeringType() == RESOURCE) {
+            return (String) steeringResourcesComboBox.getSelectedItem();
+        }
+        else {

             return null;

+        }

     }
 
     int getSteeringType() {

-        return steeringComboBox.getSelectedIndex();

+        return steeringTypeComboBox.getSelectedIndex();

     }
 
     String getDetectorName() {
         return detectorNameField.getText();
     }
 

-    boolean validSteering() {
-        return !("".equals(steeringField.getText().trim())) && (this.steeringComboBox.getSelectedIndex() != NONE);
-    }
-

     void setDefaultEventBuilder(final String defaultEventBuilderClassName) {
         this.defaultEventBuilderClassName = defaultEventBuilderClassName;
         SwingUtilities.invokeLater(new Runnable() {

@@ -202,32 +224,200 @@

         });
     }
 

-    void enableJobPanel(boolean enable) {
-        steeringComboBox.setEnabled(enable);
-        steeringField.setEnabled(enable);
-        detectorNameField.setEnabled(enable);
-        eventBuilderField.setEnabled(enable);
-        remoteAidaCheckBox.setEnabled(enable);
-        aidaNameField.setEnabled(enable);
-        pauseModeCheckBox.setEnabled(enable);
-    }	

+    boolean pauseMode() {
+        return this.pauseModeCheckBox.isSelected();
+    }

-    void addActionListener(ActionListener listener) {
-        steeringField.addActionListener(listener);
-        eventBuilderField.addActionListener(listener);
-        //pauseModeCheckBox.addActionListener(listener);
-        logLevelComboBox.addActionListener(listener);

+    void enablePauseMode(final boolean p) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                pauseModeCheckBox.setSelected(p);
+            }
+        });

     }
 

-    boolean pauseMode() {
-        return this.pauseModeCheckBox.isSelected();

+    Level getLogLevel() {
+        return Level.parse((String) logLevelComboBox.getSelectedItem());

     }
     

-    void setPauseMode(boolean p) {
-        this.pauseModeCheckBox.setSelected(p);

+    boolean disconnectOnError() {
+        return disconnectOnErrorCheckBox.isSelected();

     }
     

-    Level getLogLevel() {
-        return Level.parse((String)this.logLevelComboBox.getSelectedItem());

+    boolean warnBeforeDisconnect() {
+        return disconnectWarningCheckBox.isSelected();
+    }
+    
+    boolean logToFile() {
+        return logCheckBox.isSelected();
+    }
+    
+    String getLogFileName() {
+        return logFileField.getText();
+    }    
+    
+    boolean isAidaServerEnabled() {
+        return remoteAidaCheckBox.isSelected();
+    }
+    
+    boolean isAidaAutoSaveEnabled() {
+        return aidaSaveCheckBox.isSelected();
+    }
+    
+    String getAidaAutoSaveFileName() {
+        return aidaSaveField.getText();
+    }
+    
+    String getRemoteAidaName() {
+        return remoteAidaNameField.getText();

     }

+                    
+    private void setDisconnectOnError(final boolean b) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                disconnectOnErrorCheckBox.setSelected(b);
+            }
+        });        
+    }
+    
+    private void setWarnBeforeDisconnect(final boolean b) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                disconnectWarningCheckBox.setSelected(b);
+            }
+        });            
+    }
+    
+    private void setSteeringType(final int t) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                steeringTypeComboBox.setSelectedIndex(t);
+            }
+        });        
+    }
+    
+    private void setLogLevel(final Level level) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                logLevelComboBox.setSelectedItem(level.toString());
+            }
+        });               
+    }
+    
+    private void setEventBuilder(final String c) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                eventBuilderField.setText(c);
+            }
+        });        
+    }
+    
+    void setLogToFile(final boolean b) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                logCheckBox.setSelected(b);
+            }
+        });        
+    }
+    
+    void setLogFile(final String s) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                logFileField.setText(s);
+            }
+        });
+    }
+    
+    private void enableAidaAutoSave(final boolean b) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                aidaSaveCheckBox.setSelected(b);
+            }
+        });
+    }
+    
+    private void setAidaAutoSaveFileName(final String s) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                aidaSaveField.setText(s);
+            }
+        });
+    }
+    
+    private void enableRemoteAida(final boolean b) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                remoteAidaCheckBox.setSelected(b);
+            }
+        });
+    }
+    
+    private void setRemoteAidaName(final String s) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                remoteAidaNameField.setText(s);
+            }
+        });
+    }
+    
+    private String getSelectedSteeringResource() {
+        return (String) steeringResourcesComboBox.getSelectedItem();
+    }
+    
+    private String getSteeringFile() {
+        return steeringFileField.getText();
+    }
+            
+    /**
+     * Gather JobSettings parameters from GUI and return a JobSettings object.
+     * @return The JobSettings from the JobPanel.
+     */
+    JobSettings getJobSettings() {
+        JobSettings settings = new JobSettings();
+        settings.pauseMode = pauseMode();
+        settings.disconnectOnError = disconnectOnError();
+        settings.warnBeforeDisconnect = warnBeforeDisconnect();
+        settings.logLevel = getLogLevel();
+        settings.steeringType = getSteeringType();
+        settings.steeringFile = getSteeringFile();
+        settings.steeringResource = getSelectedSteeringResource();
+        settings.detectorName = getDetectorName();
+        settings.eventBuilderClassName = getEventBuilderClassName();
+        settings.logToFile = logToFile();
+        settings.logFileName = getLogFileName();
+        settings.autoSaveAida = isAidaAutoSaveEnabled();
+        settings.autoSaveAidaFileName = getAidaAutoSaveFileName();
+        settings.remoteAidaName = getRemoteAidaName();
+        settings.enableRemoteAida = remoteAidaCheckBox.isSelected();
+        return settings;
+    }
+               
+    /**
+     * Set the JobPanel parameters from a JobSettings object.
+     * @param settings The JobSettings to load.
+     */
+    void setJobSettings(JobSettings settings) {
+        enablePauseMode(settings.pauseMode);
+        setDisconnectOnError(settings.disconnectOnError);
+        setWarnBeforeDisconnect(settings.warnBeforeDisconnect);
+        setLogLevel(settings.logLevel);
+        setSteeringType(settings.steeringType);
+        setSteeringFile(settings.steeringFile);
+        setSteeringResource(settings.steeringResource);
+        setDetectorName(settings.detectorName);
+        setEventBuilder(settings.eventBuilderClassName);
+        setLogToFile(settings.logToFile);        
+        setLogFile(settings.logFileName);
+        enableAidaAutoSave(settings.autoSaveAida);
+        setAidaAutoSaveFileName(settings.autoSaveAidaFileName);
+        enableRemoteAida(settings.enableRemoteAida);
+        setRemoteAidaName(settings.remoteAidaName);
+    }
+    
+    /**
+     * Reset the JobPanel to its defaults.
+     */
+    void resetJobSettings() {
+        setJobSettings(new JobSettings());
+    }    

 }

\ No newline at end of file

diff -u -r1.9 -r1.10
--- MonitoringCommands.java	3 May 2012 16:59:28 -0000	1.9
+++ MonitoringCommands.java	10 May 2012 21:14:53 -0000	1.10
@@ -17,21 +17,24 @@

     static final String resetEventsCmd = "resetEvents";
     static final String savePlotsCmd = "savePlots";
     static final String resetDriversCmd = "resetDrivers";

-    static final String steeringCmd = "steering";

     static final String eventBuilderCmd = "eventBuilder";
     static final String refreshCmd = "eventRefresh";
     static final String exitCmd = "exit";

-    static final String logCmd = "logFile";
-    static final String terminalCmd = "logTerminal";

+    static final String logToFileCmd = "logToFile";
+    static final String logToTerminalCmd = "logToTerminal";

     static final String screenshotCmd = "screenshot";
     static final String eventRefreshCmd = "eventRefreshEdit";
     static final String updateTimeCmd = "updateTime";
     static final String setSteeringFileCmd = "setSteeringFile";
     static final String setMaxEventsCmd = "setMaxEvents";

-    static final String saveLogCmd = "saveLogRecords";
-    static final String clearLogCmd = "clearLogRecords";

+    static final String saveLogTableCmd = "saveLogTable";
+    static final String clearLogTableCmd = "clearLogTable";    

     static final String pauseCmd = "pause";
     static final String resumeCmd = "resume";
     static final String nextCmd = "next";
     static final String logLevelCmd = "logLevel";

+    static final String aidaAutoSaveCmd = "aidaAutoSave";
+    static final String saveJobSettingsCmd = "saveJobSettings";
+    static final String loadJobSettingsCmd = "loadJobSettings";
+    static final String resetJobSettingsCmd = "resetJobSettings";

 }

\ No newline at end of file