diff -N EventButtonsPanel.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ EventButtonsPanel.java	3 May 2012 16:59:28 -0000	1.1
@@ -0,0 +1,88 @@

+package org.lcsim.hps.monitoring;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+public class EventButtonsPanel extends JPanel {
+    
+    JButton nextEventsButton;
+    JButton pauseButton;
+    JButton connectButton;
+    
+    EventButtonsPanel() {
+        
+        Insets insets = new Insets(1, 1, 1, 1);
+        
+        GridBagLayout layout = new GridBagLayout();
+        setLayout(layout);
+        
+        GridBagConstraints c = new GridBagConstraints();
+        c.gridx = 0;
+        c.gridy = 0;
+        c.insets = insets;
+        connectButton = new JButton("Connect");
+        connectButton.setEnabled(true);
+        connectButton.setActionCommand(MonitoringCommands.connectCmd);
+        add(connectButton, c);
+        
+        c = new GridBagConstraints();        
+        c.gridx = 1;
+        c.gridy = 0;
+        c.insets = insets;
+        pauseButton = new JButton("Pause");
+        pauseButton.setActionCommand(MonitoringCommands.pauseCmd);
+        pauseButton.setEnabled(false);
+        add(pauseButton, c);
+        
+        c = new GridBagConstraints();        
+        c.gridx = 2;
+        c.gridy = 0;
+        c.insets = insets;
+        nextEventsButton = new JButton("Next Event");
+        nextEventsButton.setEnabled(false);
+        nextEventsButton.setActionCommand(MonitoringCommands.nextCmd);
+        add(nextEventsButton, c);
+    }
+    
+    void toggleConnectButton() {
+        if (connectButton.getText().equals("Connect")) {
+            connectButton.setText("Disconnect");
+            connectButton.setActionCommand(MonitoringCommands.disconnectCmd);
+        }
+        else {
+            connectButton.setText("Connect");
+            connectButton.setActionCommand(MonitoringCommands.connectCmd);
+        }
+    }
+        
+    void addActionListener(ActionListener listener) {
+        nextEventsButton.addActionListener(listener);
+        pauseButton.addActionListener(listener);
+        connectButton.addActionListener(listener);
+    }
+    
+    void enablePauseButton(boolean e) {
+        this.pauseButton.setEnabled(e);
+    }
+    
+    void enableNextEventsButton(boolean e) {
+        this.nextEventsButton.setEnabled(e);
+    }
+    
+    void setPauseModeState(boolean enable) {
+        this.nextEventsButton.setEnabled(enable);
+        if (enable) {
+            pauseButton.setText("Resume");
+            pauseButton.setActionCommand(MonitoringCommands.resumeCmd);
+        }
+        else {
+            pauseButton.setText("Pause");
+            pauseButton.setActionCommand(MonitoringCommands.pauseCmd);
+        }
+    }
+}

\ No newline at end of file

diff -u -r1.5 -r1.6
--- ConnectionStatusPanel.java	30 Apr 2012 13:36:55 -0000	1.5
+++ ConnectionStatusPanel.java	3 May 2012 16:59:28 -0000	1.6
@@ -8,18 +8,19 @@

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

+import javax.swing.SwingUtilities;

 
 class ConnectionStatusPanel extends JPanel {

-	
-	JTextField statusField;
-		
-	ConnectionStatusPanel() {
-		
-	    setLayout(new GridBagLayout());
-		
-		Insets insets = new Insets(5,2,1,2);
-		
-		GridBagConstraints c = new GridBagConstraints();

+
+    JTextField statusField;
+
+    ConnectionStatusPanel() {
+
+        setLayout(new GridBagLayout());
+
+        Insets insets = new Insets(5,2,1,2);
+
+        GridBagConstraints c = new GridBagConstraints();

         c.gridx = 0;
         c.gridy = 0;
         c.insets = insets;

@@ -38,14 +39,18 @@

         statusField.setEditable(false);
         statusField.setBackground(Color.WHITE);
         add(statusField, c);

-        

+

         setStatus(ConnectionStatus.DISCONNECTED);

-	}
-	
-	void setStatus(int idx) {
-		if (idx < 0 || idx > (ConnectionStatus.NUMBER_STATUSES - 1)) {
-			throw new IllegalArgumentException("Invalid index value.  Must be between 0 and " + (ConnectionStatus.NUMBER_STATUSES - 1) + ".");
-		}
-		statusField.setText(ConnectionStatus.toString(idx));
-	}

+    }
+
+    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) + ".");
+        }
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                statusField.setText(ConnectionStatus.toString(status));
+            }
+        });
+    }

 }

\ No newline at end of file

diff -u -r1.1 -r1.2
--- EtEventProcessor.java	29 Apr 2012 18:11:26 -0000	1.1
+++ EtEventProcessor.java	3 May 2012 16:59:28 -0000	1.2
@@ -1,5 +1,7 @@

 package org.lcsim.hps.monitoring;
 

+import java.util.logging.Level;
+

 import org.jlab.coda.et.EtEvent;
 import org.jlab.coda.et.exception.EtTimeoutException;
 

@@ -35,29 +37,23 @@

     
     // Set maximum number of events to process.
     void setMaxEvents(int maxEvents);

-   
-    // Interface for notification of start, end, and error during event processing.
-    // FIXME: Should the callback methods get an EtEvent or event number?
-    interface EtEventListener {
-        
-        // Called at beginning of event processing job.
-        void begin();
-        
-        // Called at start of processing one event.
-        void startOfEvent();
-        
-        // Called at end of processing one event.
-        void endOfEvent();
-        
-        // Called when an error occurs during single event processing.
-        void errorOnEvent();
-        
-        // Called at end of event processing job.
-        void finish();
-    }

+    // Change to pause mode which allows pausing between events.
+    void pauseMode(boolean p);
+    
+    // Continue with next events if in pause mode.
+    void nextEvents();
+    
+    // Set the log level.
+    void setLogLevel(Level level);
+    
+    boolean done();
+    
+    boolean blocked();
+           

     // Exception that is thrown when an error occurs during event processing.
     static class EventProcessingException extends Exception {

+

         EventProcessingException(Exception e) {
             super(e);
         }

diff -u -r1.13 -r1.14
--- EventPanel.java	30 Apr 2012 04:17:58 -0000	1.13
+++ EventPanel.java	3 May 2012 16:59:28 -0000	1.14
@@ -1,17 +1,15 @@

 package org.lcsim.hps.monitoring;
 

-import java.awt.Color;
-import java.awt.GridBagConstraints;

 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.text.DecimalFormat;

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

-import javax.swing.JLabel;
-import javax.swing.JPanel;

 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 

-class EventPanel extends JPanel { 

+class EventPanel extends FieldsPanel { 

 
     private JTextField eventCounterField; // number of events in this job
     private JTextField elapsedTimeField; // elapsed time between job start

@@ -21,7 +19,11 @@

     private JTextField sessionSuppliedField; // number of events supplied in this session; ignored by reset command
     private JTextField totalSuppliedField; // number of events supplied since the application started
     private JTextField maxEventsField; // maximum number of events to process before disconenct

-    private DecimalFormat rateFormat = new DecimalFormat("#.##");

+    private JTextField runNumberField; // Run number from CODA Pre Start event.
+    private JTextField runStartField; // Start of run date from CODA Pre Start event.
+    private JTextField runEventsField; // Number of events in run.
+    private JTextField runStopField; // End of run date from CODA End Event.
+    

     private static final int defaultEventRefresh = 1;
     private int eventRefresh = defaultEventRefresh;
     private int eventCount;

@@ -30,190 +32,27 @@

     private int totalSupplied;
     private boolean updateEvent = true;
     

+    private final static DecimalFormat rateFormat = new DecimalFormat("#.##");
+    final static SimpleDateFormat dateFormat = new SimpleDateFormat("MMMM-dd-yyyy HH:mm:ss");
+ 

     EventPanel() {

-
-        setLayout(new GridBagLayout());
-        
-        Insets insets = new Insets(1, 1, 1, 1);

-        GridBagConstraints c = new GridBagConstraints();
-
-        // Panel for labels and values.
-        c.gridx = 0;
-        c.gridy = 0;
-        c.insets = insets;
-        JPanel fieldsPanel = new JPanel();
-        fieldsPanel.setLayout(new GridBagLayout());
-        add(fieldsPanel, c);
-
-        // Panel for control buttons.
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 1;        
-        c.insets = insets;
-        JPanel buttonsPanel = new JPanel();
-        buttonsPanel.setLayout(new GridBagLayout());
-        add(buttonsPanel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 0;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel eventLabel = new JLabel("Events Processed:");
-        eventLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(eventLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 0;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        eventCounterField = new JTextField("0", 10);
-        eventCounterField.setHorizontalAlignment(JTextField.RIGHT);
-        eventCounterField.setEditable(false);
-        eventCounterField.setBackground(Color.WHITE);
-        fieldsPanel.add(eventCounterField, c);

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

-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 1;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel timeLabel = new JLabel("Elapsed Time [seconds]:");
-        timeLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(timeLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 1;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        elapsedTimeField = new JTextField("0", 10);
-        elapsedTimeField.setHorizontalAlignment(JTextField.RIGHT);
-        elapsedTimeField.setEditable(false);
-        elapsedTimeField.setBackground(Color.WHITE);
-        fieldsPanel.add(elapsedTimeField, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 2;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel avgRateLabel = new JLabel("Average Event Rate [Hz]:");
-        avgRateLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(avgRateLabel, c);

+        setLayout(new GridBagLayout());

-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 2;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        avgEventRateField = new JTextField("0", 6);
-        avgEventRateField.setHorizontalAlignment(JTextField.RIGHT);
-        avgEventRateField.setEditable(false);        
-        avgEventRateField.setBackground(Color.WHITE);
-        fieldsPanel.add(avgEventRateField, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 3;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel refreshLabel = new JLabel("Event Refresh:");
-        refreshLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(refreshLabel, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 3;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        refreshField = new JTextField(Integer.toString(eventRefresh), 8);
-        refreshField.setHorizontalAlignment(JTextField.RIGHT);
-        refreshField.setEditable(false);
-        refreshField.setBackground(Color.WHITE);
-        fieldsPanel.add(refreshField, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 4;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel badEventsLabel = new JLabel("Bad Events:");
-        badEventsLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(badEventsLabel, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 4;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        badEventsField = new JTextField("0", 8);
-        badEventsField.setHorizontalAlignment(JTextField.RIGHT);
-        badEventsField.setEditable(false);
-        badEventsField.setBackground(Color.WHITE);
-        fieldsPanel.add(badEventsField, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 5;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel sessionSuppliedLabel = new JLabel("Session Supplied Events:");
-        sessionSuppliedLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(sessionSuppliedLabel, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 5;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        sessionSuppliedField = new JTextField("0", 8);
-        sessionSuppliedField.setHorizontalAlignment(JTextField.RIGHT);
-        sessionSuppliedField.setEditable(false);
-        sessionSuppliedField.setBackground(Color.WHITE);
-        fieldsPanel.add(sessionSuppliedField, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 6;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel totalSuppliedLabel = new JLabel("Total Supplied Events:");
-        totalSuppliedLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(totalSuppliedLabel, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 6;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        totalSuppliedField = new JTextField("0", 8);
-        totalSuppliedField.setHorizontalAlignment(JTextField.RIGHT);
-        totalSuppliedField.setEditable(false);
-        totalSuppliedField.setBackground(Color.WHITE);
-        fieldsPanel.add(totalSuppliedField, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 7;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel maxEventsLabel = new JLabel("Max Events:");
-        maxEventsLabel.setHorizontalAlignment(JLabel.LEFT);
-        fieldsPanel.add(maxEventsLabel, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 7;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        maxEventsField = new JTextField("-1", 8);
-        maxEventsField.setHorizontalAlignment(JTextField.RIGHT);
-        maxEventsField.setEditable(false);
-        maxEventsField.setBackground(Color.WHITE);
-        fieldsPanel.add(maxEventsField, c);

+        elapsedTimeField = addField("Elapsed Time [seconds]", "0", 10);
+        eventCounterField = addField("Events Processed", "0", 10);
+        avgEventRateField = addField("Average Events Per Second", "0", 6);
+        badEventsField = addField("Event Errors", "0", 8); 
+        runNumberField = addField("Run Number", "", 8);
+        runStartField = addField("Run Started", "", 22);
+        runStopField = addField("Run Stopped", "", 22);
+        runEventsField = addField("Events in Run", "", 10);
+        sessionSuppliedField = addField("Session Supplied Events", "0", 8);
+        totalSuppliedField = addField("Total Supplied Events", "0", 8);
+        refreshField = addField("Event Refresh", Integer.toString(eventRefresh), 8);
+        maxEventsField = addField("Max Events", "-1", 8);

     }
             
     int getEventRefresh() {

@@ -232,6 +71,40 @@

         });
     }
     

+    void setRunNumber(final int runNumber) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                runNumberField.setText(Integer.toString(runNumber));
+            }
+        });
+    }
+    
+    void setRunEventCount(final int eventCount) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                runEventsField.setText(Integer.toString(eventCount));
+            }
+        });
+    }
+    
+    void setRunStartTime(final long millis) {
+        final Date d = new Date(millis);
+        SwingUtilities.invokeLater(new Runnable() {
+           public void run() {
+               runStartField.setText(dateFormat.format(d));
+           }
+        });
+    }
+    
+    void setRunEndTime(final long millis) {
+        final Date d = new Date(millis);
+        SwingUtilities.invokeLater(new Runnable() {
+           public void run() {
+               runStopField.setText(dateFormat.format(d));
+           }
+        });
+    }
+    

     private void checkUpdateEvent() {
         updateEvent = ((eventCount % getEventRefresh()) == 0);
     }

@@ -275,9 +148,9 @@

     
     void updateAverageEventRate(long jobStartTime) {
         if (updateEvent) {

-            double jobTime = System.currentTimeMillis() - jobStartTime;

+            final double jobTime = System.currentTimeMillis() - jobStartTime;

             if (jobTime > 0) {

-                double jobSeconds = jobTime / 1000;

+                final double jobSeconds = jobTime / 1000;

                 final double eventsPerSecond = eventCount / jobSeconds;
                 SwingUtilities.invokeLater(new Runnable() {
                     public void run() {

@@ -305,54 +178,53 @@

         });                
     }
         

-	synchronized void reset() {

+    synchronized void reset() {

         resetEventCount();
         resetBadEventCount();
         resetAverageEventRate();
         resetElapsedTime();
     }
 	    

-	private void resetEventCount() {
-		eventCount = 0;
-		SwingUtilities.invokeLater(new Runnable() {

+    private void resetEventCount() {
+        eventCount = 0;
+        SwingUtilities.invokeLater(new Runnable() {

             public void run() {
                 eventCounterField.setText("0");
             }
         });  		

-	}

+    }

-	private void resetElapsedTime() {
-	    SwingUtilities.invokeLater(new Runnable() {
-	        public void run() {
-	            elapsedTimeField.setText("0");
-	        }
-	    });
-	}   

+    private void resetElapsedTime() {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                elapsedTimeField.setText("0");
+            }
+        });
+    }   

-	private void resetAverageEventRate() {
-	    SwingUtilities.invokeLater(new Runnable() {

+    private void resetAverageEventRate() {
+        SwingUtilities.invokeLater(new Runnable() {

             public void run() {
                 avgEventRateField.setText("0");
             }
         });	

-	}

+    }
+
+    private void resetBadEventCount() {
+        this.badEventCount = 0;
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                badEventsField.setText("0");
+            }
+        });
+    }

-	private void resetBadEventCount() {
-		this.badEventCount = 0;
-		SwingUtilities.invokeLater(new Runnable() {
-		    public void run() {
-		        badEventsField.setText("0");
-		    }
-		});
-	}
-	
-	void resetSessionSupplied() {
-	    this.sessionSupplied = 0;
-	    SwingUtilities.invokeLater(new Runnable() {

+    void resetSessionSupplied() {
+        this.sessionSupplied = 0;
+        SwingUtilities.invokeLater(new Runnable() {

             public void run() {
                 sessionSuppliedField.setText("0");
             }
         });

-	    
-	}	

+    }	

 }

\ No newline at end of file

diff -u -r1.10 -r1.11
--- JobPanel.java	30 Apr 2012 22:27:36 -0000	1.10
+++ JobPanel.java	3 May 2012 16:59:28 -0000	1.11
@@ -1,22 +1,19 @@

 package org.lcsim.hps.monitoring;
 

-import java.awt.Color;
-import java.awt.GridBagConstraints;

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

-import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.InputStream;

+import java.util.logging.Level;

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

-import javax.swing.JLabel;

 import javax.swing.JOptionPane;

-import javax.swing.JPanel;

 import javax.swing.JTextField;

+import javax.swing.SwingUtilities;

-class JobPanel extends JPanel implements ActionListener {

+class JobPanel extends FieldsPanel {

 
     private JComboBox steeringComboBox;
     private JTextField steeringField;

@@ -28,228 +25,49 @@

     JTextField logFileField;
     JCheckBox remoteAidaCheckBox;
     JTextField aidaNameField;

+    JCheckBox pauseModeCheckBox;
+    JComboBox logLevelComboBox;

 
     private String defaultEventBuilderClassName = "";
 

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

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

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

+    
+    String[] logLevels = new String[] {
+        Level.ALL.toString(),
+        Level.FINEST.toString(),
+        Level.FINER.toString(),
+        Level.FINE.toString(),
+        Level.CONFIG.toString(),
+        Level.INFO.toString(),
+        Level.WARNING.toString(),
+        Level.SEVERE.toString(),
+        Level.OFF.toString()};

 
     JobPanel() {
 

-        setLayout(new GridBagLayout());
-
-        Insets insets = new Insets(1, 1, 1, 1);

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

-        GridBagConstraints c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 0;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel lcsimSteeringTypeLabel = new JLabel("Steering Type:");
-        lcsimSteeringTypeLabel.setHorizontalAlignment(JLabel.LEFT);
-        lcsimSteeringTypeLabel.setToolTipText("Type of LCSim steering file, either resource or local file.");
-        add(lcsimSteeringTypeLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 0;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        steeringComboBox  = new JComboBox(steeringTypes);
-        steeringComboBox.setSelectedIndex(NONE);
-        steeringComboBox.setBackground(Color.WHITE);
-        add(steeringComboBox, c);

+        setLayout(new GridBagLayout());

-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 1;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel lcsimSteeringLabel = new JLabel("Steering File:");
-        lcsimSteeringLabel.setHorizontalAlignment(JLabel.LEFT);
-        lcsimSteeringLabel.setToolTipText("Resource in jar pointing to LCSim steering file.");
-        add(lcsimSteeringLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 1;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        steeringField = new JTextField("", 30);
-        steeringField.setHorizontalAlignment(JTextField.RIGHT);
-        steeringField.setBackground(Color.WHITE);

+        pauseModeCheckBox = addCheckBox("Pause mode", false, true);
+        disconnectOnErrorCheckBox = addCheckBox("Disconnect on error", true, true);
+        disconnectWarningCheckBox = addCheckBox("Warn before disconnect", false, 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);

-        steeringField.addActionListener(this);
-        add(steeringField, c);		
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 2;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel detectorLabel = new JLabel("Detector Name:");
-        detectorLabel.setHorizontalAlignment(JLabel.LEFT);
-        detectorLabel.setToolTipText("Name of detector in LCSim conditions system.");
-        add(detectorLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 2;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        detectorNameField = new JTextField("", 20);
-        detectorNameField.setHorizontalAlignment(JTextField.RIGHT);
-        detectorNameField.setBackground(Color.WHITE);
-        add(detectorNameField, c);   
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 3;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel eventBuilderLabel = new JLabel("Event Builder Class:");
-        eventBuilderLabel.setHorizontalAlignment(JLabel.LEFT);
-        eventBuilderLabel.setToolTipText("Class used to convert to LCSim events from EVIO.");
-        add(eventBuilderLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 3;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        eventBuilderField = new JTextField("", 30);
-        eventBuilderField.setHorizontalAlignment(JTextField.RIGHT);
-        eventBuilderField.setBackground(Color.WHITE);
-        eventBuilderField.addActionListener(this);

+        detectorNameField = addField("Detector Name", 20);
+        eventBuilderField = addField("Event Builder Class", 30);

         eventBuilderField.setActionCommand(MonitoringCommands.eventBuilderCmd);

-        add(eventBuilderField, c);

+        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);

-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 4;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel jobComboBoxLabel = new JLabel("Log to File:");
-        jobComboBoxLabel.setHorizontalAlignment(JLabel.LEFT);
-        add(jobComboBoxLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 4;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        logCheckBox = new JCheckBox();
-        logCheckBox.setEnabled(false);
-        add(logCheckBox, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 5;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel logFileBoxLabel = new JLabel("Log File:");
-        logFileBoxLabel.setHorizontalAlignment(JLabel.LEFT);
-        logFileBoxLabel.setToolTipText("Full path of log file.");        
-        add(logFileBoxLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 5;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        logFileField = new JTextField("", 30);
-        logFileField.setHorizontalAlignment(JLabel.RIGHT);
-        logFileField.setEditable(false);
-        logFileField.setBackground(Color.WHITE);
-        add(logFileField, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 6;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel disconnectWarningLabel = new JLabel("Warn before disconnect:");
-        disconnectWarningLabel.setHorizontalAlignment(JLabel.LEFT);
-        disconnectWarningLabel.setToolTipText("Whether or not to warn with a dialog box before disconnect.");
-        add(disconnectWarningLabel, c);        
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 6;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;             
-        disconnectWarningCheckBox = new JCheckBox();
-        disconnectWarningCheckBox.setSelected(false);
-        add(disconnectWarningCheckBox, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 7;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel disconnectOnErrorLabel = new JLabel("Disconnect on error:");
-        disconnectOnErrorLabel.setHorizontalAlignment(JLabel.LEFT);
-        disconnectOnErrorLabel.setToolTipText("Whether or not to disconnect if there is an error in event processing.");
-        add(disconnectOnErrorLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 7;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;             
-        disconnectOnErrorCheckBox = new JCheckBox();
-        disconnectOnErrorCheckBox.setSelected(true);
-        add(disconnectOnErrorCheckBox, c);        
-        
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 8;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel remoteAidaLabel = new JLabel("Enable remote AIDA:");
-        remoteAidaLabel.setHorizontalAlignment(JLabel.LEFT);
-        remoteAidaLabel.setToolTipText("Enable remote AIDA server for viewing plots in realtime using JAS.");
-        add(remoteAidaLabel, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 8;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;     
-        remoteAidaCheckBox = new JCheckBox();
-        remoteAidaCheckBox.setSelected(false);
-        add(remoteAidaCheckBox, c);
-        
-        c = new GridBagConstraints();
-        c.gridx = 0;
-        c.gridy = 9;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.WEST;
-        JLabel aidaNameLabel = new JLabel("Remote AIDA name:");
-        aidaNameLabel.setHorizontalAlignment(JLabel.LEFT);
-        aidaNameLabel.setToolTipText("AIDA session name for connecting in JAS.");
-        add(aidaNameLabel, c);
-
-        c = new GridBagConstraints();
-        c.gridx = 1;
-        c.gridy = 9;
-        c.insets = insets;
-        c.anchor = GridBagConstraints.EAST;
-        aidaNameField = new JTextField("", 15);
-        aidaNameField.setHorizontalAlignment(JLabel.RIGHT);
-        aidaNameField.setText("hps");
-        add(aidaNameField, c);
-    }
-
-    public void actionPerformed(ActionEvent e) {
-        if (MonitoringCommands.steeringCmd == e.getActionCommand()) {
-            editSteering();
-        } 
-        else if (MonitoringCommands.eventBuilderCmd == e.getActionCommand()) {
-            editEventBuilder();
-        }

     }
     
     boolean isAIDAServerEnabled() {

@@ -260,7 +78,7 @@

         return aidaNameField.getText();
     }
 

-    private void editSteering() {

+    void editSteering() {

         String steering = steeringField.getText();
         int steeringType = steeringComboBox.getSelectedIndex();		
         if (RESOURCE == steeringType) {

@@ -268,7 +86,7 @@

             InputStream is = getClass().getResourceAsStream(steering);
             if (is == null) {
                 JOptionPane.showMessageDialog(this, "The LCSim steering resource does not exist.");

-                disableSteering();

+                //disableSteering();

             }
         } 
         else if (FILE == steeringType) {

@@ -276,7 +94,7 @@

             File f = new File(steering);
             if (!f.exists()) {
                 JOptionPane.showMessageDialog(this, "The LCSim steering file does not exist.");

-                disableSteering();

+                //disableSteering();

             }
         } 
         else if (NONE == steeringType) {

@@ -286,12 +104,14 @@

         }
     }
 

+    /*

     private void disableSteering() {
         JOptionPane.showMessageDialog(this, "No valid steering file was selected, so job will run without LCSim.");
         steeringComboBox.setSelectedIndex(NONE);
     }

+    */

-    private void editEventBuilder() {

+    void editEventBuilder() {

         String eventBuilderClassName = eventBuilderField.getText();
         try {
             // Test that the event builder class can be created successfully.

@@ -313,7 +133,11 @@

     }
 
     private void resetEventBuilder() {

-        eventBuilderField.setText(defaultEventBuilderClassName);

+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                eventBuilderField.setText(defaultEventBuilderClassName);
+            }
+        });

     }
 
     String getEventBuilderClassName() {

@@ -324,20 +148,30 @@

         }
     }
 

-    void setSteeringFile(String steeringFile) {
-        steeringField.setText(steeringFile);
-        steeringComboBox.setSelectedIndex(FILE);
-        this.actionPerformed(new ActionEvent(this, 0, MonitoringCommands.steeringCmd));

+    void setSteeringFile(final String steeringFile) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                steeringField.setText(steeringFile);
+                steeringComboBox.setSelectedIndex(FILE);
+            }
+        });

     }
 

-    void setSteeringResource(String steeringResource) {
-        steeringField.setText(steeringResource);
-        steeringComboBox.setSelectedIndex(RESOURCE);
-        this.actionPerformed(new ActionEvent(this, 0, MonitoringCommands.steeringCmd));

+    void setSteeringResource(final String steeringResource) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                steeringField.setText(steeringResource);
+                steeringComboBox.setSelectedIndex(RESOURCE);
+            }
+        });

     }
 

-    void setDetectorName(String detectorName) {
-        detectorNameField.setText(detectorName);

+    void setDetectorName(final String detectorName) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                detectorNameField.setText(detectorName);
+            }
+        });

     }
 
     String getSteering() {

@@ -359,9 +193,13 @@

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

-    void setDefaultEventBuilder(String defaultEventBuilderClassName) {

+    void setDefaultEventBuilder(final String defaultEventBuilderClassName) {

         this.defaultEventBuilderClassName = defaultEventBuilderClassName;

-        eventBuilderField.setText(this.defaultEventBuilderClassName);

+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                eventBuilderField.setText(defaultEventBuilderClassName);
+            }
+        });

     }
 
     void enableJobPanel(boolean enable) {

@@ -371,5 +209,25 @@

         eventBuilderField.setEnabled(enable);
         remoteAidaCheckBox.setEnabled(enable);
         aidaNameField.setEnabled(enable);

+        pauseModeCheckBox.setEnabled(enable);

     }	

+    
+    void addActionListener(ActionListener listener) {
+        steeringField.addActionListener(listener);
+        eventBuilderField.addActionListener(listener);
+        //pauseModeCheckBox.addActionListener(listener);
+        logLevelComboBox.addActionListener(listener);
+    }
+
+    boolean pauseMode() {
+        return this.pauseModeCheckBox.isSelected();
+    }
+    
+    void setPauseMode(boolean p) {
+        this.pauseModeCheckBox.setSelected(p);
+    }
+    
+    Level getLogLevel() {
+        return Level.parse((String)this.logLevelComboBox.getSelectedItem());
+    }

 }

\ No newline at end of file