diff -u -r1.34 -r1.35
--- MonitoringApplication.java	30 Apr 2012 22:27:36 -0000	1.34
+++ MonitoringApplication.java	30 Apr 2012 22:48:05 -0000	1.35
@@ -18,10 +18,6 @@

 import static org.lcsim.hps.monitoring.MonitoringCommands.setSteeringFileCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.terminalCmd;
 import static org.lcsim.hps.monitoring.MonitoringCommands.updateTimeCmd;

-import hep.aida.dev.IDevTree;
-import hep.aida.ref.remote.RemoteServer;
-import hep.aida.ref.remote.rmi.client.RmiStoreFactory;
-import hep.aida.ref.remote.rmi.server.RmiServerImpl;

 
 import java.awt.AWTException;
 import java.awt.Dimension;

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

  * calling its main() method.
  * 
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: MonitoringApplication.java,v 1.34 2012/04/30 22:27:36 jeremy Exp $

+ * @version $Id: MonitoringApplication.java,v 1.35 2012/04/30 22:48:05 jeremy Exp $

  */
 public class MonitoringApplication {
 

@@ -171,7 +167,6 @@

     {
         // Main panel for the application.
         mainPanel = new JPanel();

-        //mainPanel.setPreferredSize(new Dimension(800, 750));

         mainPanel.setLayout(new GridBagLayout());
         
         // Connection status panel.

@@ -622,7 +617,7 @@

                 
                 // Disconnect from remote AIDA session.
                 if (app.server != null) {

-                    logger.log(Level.INFO, "Closing remote AIDA server.");

+                    logger.log(Level.FINER, "Closing remote AIDA server.");

                     app.server.close();
                     app.server = null;
                     logger.log(Level.INFO, "Remote AIDA server was closed.");

@@ -1034,7 +1029,7 @@

 
         // Start up the event processing thread.
         t.start();

-        logger.log(Level.FINE, "Started event processing thread.");

+        logger.log(Level.INFO, "Started event processing thread.");

 
         // Wait for the event processing thread to finish.
         try {

@@ -1049,7 +1044,7 @@

         if (getConnectionStatus() != ConnectionStatus.DISCONNECTED)
             disconnect(eventProcessor.getStatus());
         

-        logger.log(Level.FINER, "Monitoring session ended.");

+        logger.log(Level.INFO, "Monitoring session ended.");

     }
 
     /**

@@ -1060,10 +1055,13 @@

             logger.log(Level.INFO, "Starting remote AIDA server.");
             this.server = new AIDAServer(jobPanel.getRemoteAIDAName());
             boolean ok = this.server.start();

-            if (ok)
-                logger.log(Level.INFO, "Remote AIDA server was started with name <" + jobPanel.getRemoteAIDAName() + ">.");
-            else

+            if (ok) {
+                logger.log(Level.INFO, "Remote AIDA server started with name <" + jobPanel.getRemoteAIDAName() + ">.");
+            }
+            else {
+                this.server = null;

                 logger.log(Level.SEVERE, "Failed to start remote AIDA server.");

+            }

         }
     }
 

@@ -1094,7 +1092,7 @@

      */
     private void connect() {
 

-        logger.log(Level.FINER, "Connecting to ET system.");

+        logger.log(Level.INFO, "Connecting to ET system.");

         
         // Make sure applicable menu items are enabled or disabled.
         setConnectedGuiState();

@@ -1180,7 +1178,7 @@

 
             // Disconnect from the ET system.
             // FIXME: This can block forever!  

-            // Should probably put on separate thread and wait for 10 seconds or so.

+            // Should probably put on a separate thread and wait for 10 seconds or so.

             connection.cleanup(); 
 
             // The connection is now unusable so set it to null.

@@ -1233,7 +1231,7 @@

             throw new RuntimeException("Failed to setup LCSim.", e);
         }
 

-        logger.log(Level.FINE, "LCSim setup with steering <" + steering + ">.");

+        logger.log(Level.INFO, "LCSim setup with steering <" + steering + ">.");

     }
 
     /**

@@ -1256,7 +1254,7 @@

         // Set the detector name on the event builder so it can find conditions data.
         eventBuilder.setDetectorName(getDetectorName());
         

-        logger.log(Level.INFO, "Successfully initialized the event builder.");

+        logger.log(Level.INFO, "Successfully initialized event builder <" + eventBuilderClassName + ">.");

     }       
 
     /**

@@ -1347,7 +1345,7 @@

                     logger.log(Level.FINE, "Saved log to file <" + logFile.getPath() + ">.");
                 }
                 catch (IOException e) {

-                    logger.log(Level.SEVERE, "Failed to save log to <" + logFile.getPath() + ">.");

+                    logger.log(Level.SEVERE, "Failed to save log to file <" + logFile.getPath() + ">.");

                     showDialog("Failed to save log file.");
                 }
             }