diff -u -r1.9 -r1.10
--- MonitoringExample.java	4 Apr 2012 23:26:07 -0000	1.9
+++ MonitoringExample.java	6 Apr 2012 00:11:06 -0000	1.10
@@ -1,6 +1,7 @@

 package org.lcsim.hps.monitoring;
 
 import java.io.File;

+import java.io.IOException;

 import java.io.InputStream;
 import java.nio.ByteBuffer;
 

@@ -14,11 +15,13 @@

 import org.jlab.coda.et.enums.Modify;
 import org.jlab.coda.et.exception.EtTimeoutException;
 import org.jlab.coda.jevio.EvioEvent;

+import org.jlab.coda.jevio.EvioException;

 import org.jlab.coda.jevio.EvioReader;
 import org.lcsim.event.EventHeader;
 import org.lcsim.hps.evio.LCSimEventBuilder;

-import org.lcsim.hps.evio.MCEventBuilder;

+import org.lcsim.hps.evio.LCSimTestRunEventBuilder;

 import org.lcsim.hps.monitoring.ConnectionStatusPanel.ConnectionStatus;

+import org.lcsim.hps.monitoring.MonitoringApplication.JobParameters;

 import org.lcsim.job.JobControlManager;
 import org.lcsim.util.DriverAdapter;
 

@@ -35,11 +38,10 @@

     static final String detectorName = "HPS-Test-JLAB-v4pt0";
 
     // Default steering resource.

-    static final String steering = "/org/lcsim/hps/steering/TestRunMonitoring.lcsim";

+    static final String steering = "/org/lcsim/hps/steering/TestRunMonitoring.lcsim";    

     
     // Default event builder.

-    static final String eventBuilderClassName = MCEventBuilder.class.getCanonicalName();
-    //static final String eventBuilderClassName = LCSimTestRunEventBuilder.class.getCanonicalName();

+    static final String eventBuilderClassName = LCSimTestRunEventBuilder.class.getCanonicalName();

     
     // The LCSim job manager for running Drivers.
     JobControlManager jobManager;

@@ -52,6 +54,9 @@

     
     // The ET connection parameters.
     EtConnection et;

+    
+    // LCSim event builder.
+    LCSimEventBuilder eventBuilder = null;

                        
     public MonitoringExample() 
     {}

@@ -77,88 +82,35 @@

     	createMonitoringApplication();
     	
     	// Push default settings to JobPanel.

-    	JobPanel jobPanel = app.getJobPanel();
-    	jobPanel.setDetectorName(detectorName);
-    	jobPanel.setSteeringResource(steering);
-    	jobPanel.setDefaultEventBuilder(eventBuilderClassName);
-    	
-    	// Get ConnectionPanel which will have user connection settings.
-		ConnectionPanel connectionPanel = app.getConnectionPanel();
-		    	

+    	JobParameters jobParams = new JobParameters();
+    	jobParams.detectorName = detectorName;
+    	jobParams.steeringResource = steering;
+    	jobParams.eventBuilderClassName = eventBuilderClassName;
+    	app.setJobParameters(jobParams);
+    	    			    	

     	// GUI loop.  The 'Exit' command will cause the applicatino to quit.
     	while (true) {
     		
     		// Wait for connection request from GUI.

-    		while (!connectionPanel.connectRequested()) {

+    		while (!app.connectionRequested()) {

     			try { Thread.sleep(1000); } catch (InterruptedException e)  {};
     		}        

-    		ConnectionParameters cn = connectionPanel.getConnectionParameters();

+    		ConnectionParameters cn = app.getConnectionParameters();

     		    		    		
     		// Make sure applicable menu items are enabled or disabled.

-    		app.connect();
-
-    		// Set the GUI status.
-    		app.getConnectionStatusPanel().setStatus(ConnectionStatus.CONNECTING);
-    		    							

+    		app.setConnected();
+    		
+    		// Setup LCSim.
+    		try {
+    			setupLCSim();
+    		} catch (Exception e) {
+    			app.error(e, "Failed to setup LCSim.  You will be disconnected.");
+				continue;
+    		}
+    		

     		// Try block is mostly for EtExceptions and friends.
     		try {        	

-    			
-    			// Setup connection to ET system.
-    			et = EtConnection.createEtConnection(cn);
-    			EtSystem sys = et.getEtSystem();
-    			EtAttachment att = et.getEtAttachment();
-    			    			    			    		
-    			// Setup the EventBuilder to create LCSim events from EVIO data.
-    			String eventBuilderClassName = app.getJobPanel().getEventBuilderClassName();
-    			LCSimEventBuilder eventBuilder = null;
-				try {
-					eventBuilder = (LCSimEventBuilder)Class.forName(eventBuilderClassName).newInstance();
-				} catch (Exception e) {					
-					app.showDialog("Failed to create event builder.  Job will run without LCSim.");
-				}			
-								
-				// Reset the DriverAdapter.
-				driverAdapter = null;
-				
-				// Check for valid LCSim setup.
-    			if (jobPanel.validSteering() && (eventBuilder != null)) {
-    				
-    				// Get steering resource or file.
-    				String steering = jobPanel.getSteering();
-    				
-    				// Try to setup LCSim.  If it fails, we get disconnected.
-    				try {
-    					// Create job manager and configure based on steering type of resource or file.
-    					jobManager = new JobControlManager();
-    					jobManager.checkInputFiles(false);
-    					if (app.getJobPanel().getSteeringType() == JobPanel.RESOURCE) {
-    						InputStream is = this.getClass().getResourceAsStream(steering);
-    						jobManager.setup(is);
-    					} else if (app.getJobPanel().getSteeringType() == JobPanel.FILE) {
-    						jobManager.setup(new File(steering));
-    					} 
-
-    					// Set job manager in GUI so resetting Drivers works.
-    					app.setJobControlManager(jobManager);
-
-    					// Make a DriverAdapter for wrapping the event loop calls.
-    					driverAdapter = jobManager.getDriverAdapter();
-
-    					// Call wrapper to startOfData() on DriverAdapter.
-    					driverAdapter.configure(null);
-
-    					// Set the detector name on the event builder so it can find conditions data.
-    					eventBuilder.setDetectorName(jobPanel.getDetectorName());
-    				} catch (Exception e) {
-    					error(e, "Failed to setup LCSim.  You will be disconnected.");
-    					continue;
-    				}
-    			}
-    			
-    			// Start job timer.
-    			EventPanel eventPanel = app.getEventPanel();
-    			eventPanel.updateJobStartTime();
-

+    			    			    			    			    			        			

     			// Array of events.
     			EtEvent[] mevs = null;
     			

@@ -166,17 +118,18 @@

     			Mode waitMode = cn.waitMode;
     			int waitTime = cn.waitTime;
     			int chunk = cn.chunk;

-    			    			
-    			// Set status to connected.
-    			app.getConnectionStatusPanel().setStatus(ConnectionStatus.CONNECTED);

-    			// Reset the event panel in case there have been multiple jobs.
-    			try {
-    				app.getEventPanel().reset();
-    			} catch (Exception e) {
-    				System.err.println(e.getMessage());
-    			}
-

+    			// Setup connection to ET system.
+    			et = EtConnection.createEtConnection(cn);
+    			EtSystem sys = et.getEtSystem();
+    			EtAttachment att = et.getEtAttachment();
+    			
+    			// Set reference to EtConnection in GUI.
+    			app.setEtConnection(et);
+    			
+    			// Starts the job in the GUI, which is set of events processed in one session.
+    			app.startJob();
+    			

     			// EtEvent loop.
     			while (true) { 
     				try {

@@ -186,23 +139,16 @@

     					
     					// Loop over retrieved EtEvents.
     					for (EtEvent mev : mevs) {

-
-    						// Update GUI's event count.
-    						eventPanel.updateEventCount();                    
-    						
-    						// Get EvioEvent and check for errors.
-    						ByteBuffer buf = mev.getDataBuffer();
-    						EvioReader reader = new EvioReader(buf);
-    						EvioEvent evioEvent = null;
-    						try {
-    							evioEvent = reader.parseNextEvent();
-    						} catch (java.nio.BufferUnderflowException e) {
-    							e.printStackTrace();
-    						}

+    						                        					
+    						// Create EvioEvent from EtEvent and skip if failed.
+    						EvioEvent evioEvent = createEvioEvent(mev);

     						if (evioEvent == null) {

-    							eventPanel.updateBadEventCount();

+    							app.badEvent();

     							continue;

-    						}    						

+    						}
+    						
+    						// Start of event GUI hook.
+    						app.startEvent();

     						    							    						
     						// Create LCSim event from EVIO data.
     						EventHeader lcsimEvent = eventBuilder.makeLCSimEvent(evioEvent);

@@ -213,55 +159,97 @@

     						} catch (Exception e) {
     							e.printStackTrace();
     						}

-
-    						// Update the average event rate.
-    						eventPanel.updateAverageEventRate();                    
-
-    						// Update elapsed time.
-    						eventPanel.updateElapsedTime();

+    						
+    						// End of event GUI hook.
+    						app.endEvent();

     					}
 
     					// Put events back into the ET system.
     					sys.putEvents(att, mevs);   
     					
     					// User requested disconnect in GUI. 

-    					if (connectionPanel.disconnectRequested()) {
-    						disconnect(ConnectionStatus.DISCONNECTING);

+    					if (app.disconnectRequested()) {    						
+    						app.disconnect(ConnectionStatus.DISCONNECTING);

     						break;
     					}
     				// The session timed out.
     				} catch (EtTimeoutException e) {

-    					disconnect(ConnectionStatus.TIMED_OUT);

+    					app.disconnect(ConnectionStatus.TIMED_OUT);

     					break;
     				}
     			}
     		// Top-level exception catcher.
     		} catch (Exception e) {

-    			error(e, null);

+    			app.error(e, null);

     		}
     	}      
     }
 

-	private void error(Exception e, String mesg) {
-		e.printStackTrace();		
-		if (mesg != null)
-			app.showDialog(mesg);
-		else
-			app.showDialog(e.getMessage());
-		et.cleanup();
-		Runtime.getRuntime().removeShutdownHook(et.getShutdownCallback());
-		app.disconnect();
-	}
-	
-	private void disconnect(int status) {
-		app.getConnectionStatusPanel().setStatus(status);
-		if (status == ConnectionStatus.TIMED_OUT) {
-			app.showDialog("ET session timed out.  You will be disconnected.");	

+	private EvioEvent createEvioEvent(EtEvent etEvent) throws IOException, EvioException {
+		ByteBuffer buf = etEvent.getDataBuffer();
+		EvioReader reader = new EvioReader(buf);
+		EvioEvent evioEvent = null;
+		try {
+			evioEvent = reader.parseNextEvent();
+		} catch (java.nio.BufferUnderflowException e) {
+			e.printStackTrace();

 		}

-		if (driverAdapter != null)
-			driverAdapter.finish(null);
-		et.cleanup();
-		Runtime.getRuntime().removeShutdownHook(et.getShutdownCallback());
-		app.disconnect();

+		return evioEvent;

 	}

+
+	private void setupLCSim() {
+								
+		// Reset the DriverAdapter.
+		driverAdapter = null;
+		
+		if (!app.validSteering())
+			throw new RuntimeException("Invalid steering file or resource.");
+			
+		// Get steering resource or file.
+		String steering = app.getSteering();
+
+		// Try to setup LCSim.  If it fails, we get disconnected.
+		try {				
+			// Create job manager and configure based on steering type of resource or file.
+			jobManager = new JobControlManager();
+			jobManager.checkInputFiles(false);
+			if (app.getSteeringType() == JobPanel.RESOURCE) {
+				InputStream is = this.getClass().getResourceAsStream(steering);
+				jobManager.setup(is);
+			} else if (app.getSteeringType() == JobPanel.FILE) {
+				jobManager.setup(new File(steering));
+			} 
+
+			// Set job manager in GUI so resetting Drivers works.
+			app.setJobControlManager(jobManager);
+
+			// Make a DriverAdapter for wrapping the event loop calls.
+			driverAdapter = jobManager.getDriverAdapter();
+			
+			// Call startOfData() on DriverAdapter, which initializes conditions system.
+			driverAdapter.configure(null);
+
+			// Set reference to DriverAdapter in GUI so it can disconnect cleanly.
+			app.setDriverAdapter(driverAdapter);
+			
+		} catch (Exception e) {
+			throw new RuntimeException("Failed to setup LCSim.", e);
+		}
+		
+		// Reset reference to event builder.
+		eventBuilder = null;
+		
+		// Setup the EventBuilder class.
+		String eventBuilderClassName = app.getEventBuilderClassName();
+		try {
+			eventBuilder = (LCSimEventBuilder)Class.forName(eventBuilderClassName).newInstance();
+		} catch (Exception e) {			
+			throw new RuntimeException("Failed to create LCSimEventBuilder class.", e);
+		}			
+		if (eventBuilder == null)
+			throw new RuntimeException("LCSimEventBuilder points to null");
+		
+		// Set the detector name on the event builder so it can find conditions data.
+		eventBuilder.setDetectorName(app.getDetectorName());
+	}	

 }

\ No newline at end of file