Changes in / [30:20] in tmcsimulator

Location:

/trunk

Files:

• src/tmcsim/cadsimulator/Coordinator.java (modified) (23 diffs)
• src/tmcsim/cadsimulator/viewer/CADSimulatorViewer.java (modified) (4 diffs)
• src/tmcsim/cadsimulator/viewer/actions/ExitAction.java (modified) (1 diff)
• src/tmcsim/paramicscommunicator/ParamicsFileWriter.java (modified) (2 diffs)
• src/tmcsim/paramicscommunicator/ParamicsCommunicator.java (modified) (5 diffs)
• src/tmcsim/paramicscommunicator/ParamicsFileReader.java (modified) (2 diffs)
• src/tmcsim/paramicscommunicator/gui/ParamicsCommunicatorGUI.java (modified) (6 diffs)
• test/tmcsim/cadsimulator/CADSimulatorFixture.java (modified) (3 diffs)
• test/tmcsim/cadsimulator/CADSimulatorNetworkTest.java (deleted)
• IDE_metadata/Eclipse (modified) (1 prop)
• IDE_metadata/Eclipse/build.xml (modified) (1 diff)
• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (1 diff)
• config/paramics_communicator_logging.properties (modified) (1 diff)
• config/cad_simulator_paramics_config.properties (modified) (1 diff)

/trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ +1 @@
+
 package tmcsim.cadsimulator;
 
+import java.awt.List;
 import java.io.File;
 import java.rmi.RemoteException;
@@ -14 +16 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import javax.swing.JList;
+import javax.swing.Timer;
 import javax.swing.table.DefaultTableModel;
 import javax.xml.parsers.SAXParserFactory;
+
 import tmcsim.cadmodels.CADRoutedMessage;
 import tmcsim.cadmodels.CMSInfo;
@@ -37 +43 @@
 import tmcsim.client.cadclientgui.data.Incident;
 import tmcsim.client.cadclientgui.data.IncidentEvent;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.CARDFILE;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.EditCommand;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_ACTIVITIES;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_ADD_INFO;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_CALLBACK;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_CALLER;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_EDIT_LOG;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_GEN_INFO;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_INFO;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_LOC;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_PROBLEM;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_RESP;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_TABLE;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_TIMES;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_VAL;
-import tmcsim.client.cadclientgui.enums.CADDataEnums.TABLE;
+import tmcsim.client.cadclientgui.enums.CADDataEnums.*;
 import tmcsim.client.cadclientgui.enums.CADScriptTags.UNIT_TAGS;
 import tmcsim.client.cadclientgui.enums.IncidentEnums;
 import tmcsim.client.cadclientgui.enums.UnitStatusEnums;
-import tmcsim.common.CADEnums.PARAMICS_STATUS;
-import tmcsim.common.CADEnums.SCRIPT_STATUS;
+import tmcsim.client.cadclientgui.screens.ScreenManager;
+import tmcsim.common.CCTVInfo;
 import tmcsim.common.ObserverMessage;
 import tmcsim.common.ScriptException;
 import tmcsim.common.SimulationException;
 import tmcsim.common.XMLIncident;
+import tmcsim.common.CADEnums.PARAMICS_STATUS;
+import tmcsim.common.CADEnums.SCRIPT_STATUS;
 import tmcsim.interfaces.CADClientInterface;
 import tmcsim.interfaces.CoordinatorInterface;
@@ -67 +60 @@
 
 /**
- * Coordinator is used to control and manage interactions between all CAD
- * Simulator Managers. The Coordinator is also registered as an RMI Object to
- * allow remote control and access to simulation data. A
+ * Coordinator is used to control and manage interactions between all CAD 
+ * Simulator Managers.  The Coordinator is also registered as an RMI Object
+ * to allow remote control and access to simulation data.   A 
  * SimulationManagerInterface Object is used to provide communication to a
- * remotely connected SimulationManager. Observers may register with the
+ * remotely connected SimulationManager.  Observers may register with the
  * Coordinator to listen for simulation data updates.
  *
@@ -80 +73 @@
  * @see SimulationControlManager
  * @author Matthew Cechini
- * @version
+ * @version 
  */
 @SuppressWarnings("serial")
 public class Coordinator extends UnicastRemoteObject
-        implements CoordinatorInterface
-{
-
-    /**
-     * Error logger.
-     */
+    implements CoordinatorInterface {
+
+    /** Error logger. */
     private Logger coorLogger = Logger.getLogger("tmcsim.cadsimulator");
-    /**
-     * List of all Observers that have been registered with the Coordinator. Due
-     * to being a remote object, Coordinator cannot extend the Observable class.
+    
+    /**
+     * List of all Observers that have been registered with the Coordinator.  Due
+     * to being a remote object, Coordinator cannot extend the Observable class. 
      * Therefore, the list is managed manually.
      */
     private Vector<Observer> observerList = null;
-    /**
-     * Interface object for RMI communication with the Simulation Manager. Only
-     * one Simulation Manager may be connected at a time. When there is no
-     * connected Manager, this object is set to null.
+    
+    /**
+     * Interface object for RMI communication with the Simulation Manager.  Only one Simulation Manager
+     * may be connected at a time.  When there is no connected Manager, this object is set to null.
      */
     private static SimulationManagerInterface managerInt = null;
+    
     private static LinkedList<CADClientInterface> clientList;
+            
     private static CADData cadData;
+    
     private static CardfileData cardfileData;
-
-    /**
-     * Constructor. Call UnicastRemoteObject constructor and call
+    
+    /**
+     * Constructor.  Call UnicastRemoteObject constructor and call 
      * initializeSimulation.
      *
      * @throws RemoteException
      */
-    public Coordinator() throws RemoteException
-    {
+    public Coordinator() throws RemoteException {           
         super();
         clientList = new LinkedList<CADClientInterface>();
         cadData = new CADData();
-        cardfileData = new CardfileData();
-        try
-        {
+      cardfileData = new CardfileData();
+        try {
             CardfileReader cfr = new CardfileReader("scripts/Cardfile.xml", cardfileData);
-        } catch (Exception e)
-        {
+        } catch (Exception e) {
             System.out.println("Could not load cardfile script");
         }
-
+        
         observerList = new Vector<Observer>();
     }
-
-    public void registerForCallback(CADClientInterface client) throws RemoteException
-    {
+    
+    public void registerForCallback(CADClientInterface client) throws RemoteException{
         clientList.add(client);
         CADSimulator.theViewer.connectClient();
-    }
-
-    public void unregisterForCallback(CADClientInterface client) throws RemoteException
-    {
+    }   
+    
+    public void unregisterForCallback(CADClientInterface client) throws RemoteException{
         clientList.remove(client);
         CADSimulator.theViewer.disconnectClient();
     }
-
-    public void registerForCallback(SimulationManagerInterface simManInt) throws RemoteException
-    {
+    
+    public void registerForCallback(SimulationManagerInterface simManInt) throws RemoteException{
         managerInt = simManInt;
         CADSimulator.theViewer.setSimManagerStatus(true);
-    }
-
-    public void unregisterForCallback(SimulationManagerInterface simManInt) throws RemoteException
-    {
+    }   
+    
+    public void unregisterForCallback(SimulationManagerInterface simManInt) throws RemoteException {
         managerInt = null;
         CADSimulator.theViewer.setSimManagerStatus(false);
-    }
-
-    public void startSimulation() throws RemoteException, ScriptException
-    {
-
-        coorLogger.logp(Level.INFO, "Coordinator", "startSimulation",
-                "starting...");
-        if (!CADSimulator.theIncidentMgr.areIncidentsLoaded())
-        {
+    }     
+    
+    public void startSimulation() throws RemoteException, ScriptException {
+
+        if(!CADSimulator.theIncidentMgr.areIncidentsLoaded())
             throw new ScriptException(ScriptException.NO_SCRIPT_LOADED);
-        } else if (CADSimulator.theParamicsSimMgr.isConnected())
-        {
-            Runnable startRun = new Runnable()
-            {
-                public void run()
-                {
-                    try
-                    {
+        else if(CADSimulator.theParamicsSimMgr.isConnected()) {
+            Runnable startRun = new Runnable() {
+                public void run() {
+                    try {
                         setScriptStatus(SCRIPT_STATUS.ATMS_SYNCHRONIZATION);
-
+                        
                         long currentATMSTime = CADSimulator.theATMSMgr.getCurrentTime();
-                        long sleepTime = ((60 * 1000) - (currentATMSTime % (60 * 1000))) % (30 * 1000);
-
-                        coorLogger.logp(Level.INFO, "Coordinator", "StartSimulation",
-                                "Sleeping for " + sleepTime / 1000 + " seconds.");
+                        long sleepTime       = ((60 * 1000) - (currentATMSTime % (60 * 1000))) % (30 * 1000);               
+
+                        coorLogger.logp(Level.INFO, "Coordinator", "StartSimulation", 
+                                "Sleeping for " + sleepTime/1000 + " seconds.");
                         Thread.sleep(sleepTime);
-
-                        //currentATMSTime += sleepTime;
-                        //ParamicsCommunicator.getInstance().serverTime.setTimeInMillis(currentATMSTime);
-                    } catch (Exception e)
-                    {
+    
+                        //currentATMSTime += sleepTime;                 
+                        //ParamicsCommunicator.getInstance().serverTime.setTimeInMillis(currentATMSTime);                                       
+                    }
+                    catch (Exception e) {
                         setScriptStatus(SCRIPT_STATUS.SCRIPT_RUNNING);
-
-                        coorLogger.logp(Level.SEVERE, "Coordinator", "StartSimulation:run",
+                        
+                        coorLogger.logp(Level.SEVERE, "Coordinator", "StartSimulation:run", 
                                 "Unable to connect to ATMS server.", e);
-                    } finally
-                    {
+                    }
+                    finally {
                         CADSimulator.theSimulationCntrlMgr.startSimulation();
                         CADSimulator.theParamicsSimMgr.startSimulation();
-                        CADSimulator.theSoundPlayer.setAudioEnabled(true);
-                        coorLogger.logp(Level.INFO, "Coordinator", "StartSimulation:run",
-                                "Simulation has started.");
+                        CADSimulator.theSoundPlayer.setAudioEnabled(true);      
                     }
                 }
             };
-
+        
             Thread startThread = new Thread(startRun);
             startThread.start();
-        } else
-        {
+        }
+        else {
             CADSimulator.theSimulationCntrlMgr.startSimulation();
             CADSimulator.theSoundPlayer.setAudioEnabled(true);
         }
     }
-
-    public void pauseSimulation() throws RemoteException
-    {
+    
+    
+    public void pauseSimulation() throws RemoteException {      
         CADSimulator.theSimulationCntrlMgr.pauseSimulation();
         CADSimulator.theSoundPlayer.setAudioEnabled(false);
     }
-
-    public void resetSimulation() throws RemoteException
-    {
-
+    
+
+    public void resetSimulation() throws RemoteException {      
+        
         CADSimulator.theIncidentMgr.resetIncidents();
         cadData.resetSimulation();
-
+        
         CADSimulator.theSoundPlayer.setAudioEnabled(false);
         CADSimulator.theSoundPlayer.deQueueAll();
-
+        
         CADSimulator.theViewer.setTime(0);
-
+        
         setScriptStatus(SCRIPT_STATUS.SCRIPT_STOPPED_NOT_STARTED);
-
+        
         CMSDiversionDB.getInstance().resetDiversions();
-
+        
         CADSimulator.theSimulationCntrlMgr.resetSimulation();
         CADSimulator.theParamicsSimMgr.resetSimulation();
-
-        notifyObservers(new ObserverMessage(ObserverMessage.messageType.RESET_SIMULATION, null));
-
-    }
-
-    public void gotoSimulationTime(final long newSimTime) throws RemoteException
-    {
-
+        
+        notifyObservers(new ObserverMessage(ObserverMessage.messageType.RESET_SIMULATION, null));      
+
+    }
+
+        
+    public void gotoSimulationTime(final long newSimTime) throws RemoteException {
+                
         boolean audioWasEnabled = CADSimulator.theSoundPlayer.getAudioEnabled();
-
+        
         CADSimulator.theSoundPlayer.setAudioEnabled(false);
-
-        long tempTime = 0;
-        while (tempTime < newSimTime)
-        {
+        
+        long tempTime = 0;      
+        while(tempTime < newSimTime) {
             tempTime++;
 
             CADSimulator.theIncidentMgr.tick(tempTime);
-        }
+        }       
         CADSimulator.theSoundPlayer.setAudioEnabled(audioWasEnabled);
-
+        
 
         CADSimulator.theSimulationCntrlMgr.gotoSimulationTime(newSimTime);
-
-        Runnable gotoRun = new Runnable()
-        {
-            public void run()
-            {
+        
+        Runnable gotoRun = new Runnable() {
+        
+            public void run() {
                 CADSimulator.theViewer.setTime(newSimTime);
-
-                if (managerInt != null)
-                {
-                    try
-                    {
+                
+                if(managerInt != null) {
+                    try {
                         managerInt.tick(newSimTime);
-                    } catch (RemoteException re)
-                    {
+                    }
+                    catch (RemoteException re) {
                         //Simulation Manager has disappeared
                         managerInt = null;
                         CADSimulator.theViewer.setSimManagerStatus(false);
-
-                        coorLogger.logp(Level.SEVERE, "Coordinator", "gotoSimulationTime:run",
+                        
+                        coorLogger.logp(Level.SEVERE, "Coordinator", "gotoSimulationTime:run", 
                                 "Connection to Simulation Manager has been dropped.", re);
                     }
                 }
-            }
+            }           
         };
-
+        
         Thread gotoThread = new Thread(gotoRun);
-        gotoThread.start();
-
-    }
-
-    /**
-     * Sets the current script status. A thread is started to notify the
-     * CADSimulatorViewer and SimulationManager with the new status.
-     */
-    public void setScriptStatus(final SCRIPT_STATUS status)
-    {
-
-        Runnable updateRun = new Runnable()
-        {
-            public void run()
-            {
+        gotoThread.start();     
+        
+    }
+    
+
+    /**
+     * Sets the current script status.  A thread is started to notify
+     * the CADSimulatorViewer and SimulationManager with the new status.
+     */
+    public void setScriptStatus(final SCRIPT_STATUS status) {
+        
+        Runnable updateRun = new Runnable() {
+        
+            public void run() {
 
                 CADSimulator.theViewer.setScriptStatus(status);
-
-                if (managerInt != null)
-                {
-                    try
-                    {
+        
+                if(managerInt != null) {
+                    try {                           
                         managerInt.setScriptStatus(status);
-                    } catch (RemoteException re)
-                    {
+                    }
+                    catch (RemoteException re) {
                         //Simulation Manager has disappeared
                         managerInt = null;
                         CADSimulator.theViewer.setSimManagerStatus(false);
 
-                        coorLogger.logp(Level.SEVERE, "Coordinator", "setScriptStatus:run",
+                        coorLogger.logp(Level.SEVERE, "Coordinator", "setScriptStatus:run", 
                                 "Connection to Simulation Manager has been dropped.", re);
-                    }
+                    }                   
                 }
             }
         };
-
+        
         Thread updateThread = new Thread(updateRun);
         updateThread.start();
-    }
-
-    /**
-     * Sets the current paramics status. A thread is started to notify the
-     * CADSimulatorViewer and SimulationManager with the new status.
-     */
-    public void setParamicsStatus(final PARAMICS_STATUS status)
-    {
-
-        Runnable updateRun = new Runnable()
-        {
-            public void run()
-            {
+    }   
+    
+    /**
+     * Sets the current paramics status.  A thread is started to notify
+     * the CADSimulatorViewer and SimulationManager with the new status.
+     */
+    public void setParamicsStatus(final PARAMICS_STATUS status) {
+
+        Runnable updateRun = new Runnable(){
+        
+            public void run() {
                 CADSimulator.theViewer.setParamicsStatus(status);
-
-                if (managerInt != null)
-                {
-                    try
-                    {
+                
+                if(managerInt != null) {
+                    try {                           
                         managerInt.setParamicsStatus(status);
-                    } catch (RemoteException re)
-                    {
+                    }
+                    catch (RemoteException re) {
                         //Simulation Manager has disappeared
                         managerInt = null;
                         CADSimulator.theViewer.setSimManagerStatus(false);
 
-                        coorLogger.logp(Level.SEVERE, "Coordinator", "setParamicsStatus:run",
+                        coorLogger.logp(Level.SEVERE, "Coordinator", "setParamicsStatus:run", 
                                 "Connection to Simulation Manager has been dropped.", re);
-                    }
-                }
+                    }                   
+                }   
+            }       
+        };
+        
+        Thread updateThread = new Thread(updateRun);
+        updateThread.start();       
+    
+    }
+    
+    public void connectToParamics() throws RemoteException {
+        CADSimulator.theParamicsSimMgr.connectToParamics();
+    }
+    public void disconnectFromParamics() throws RemoteException {
+        CADSimulator.theParamicsSimMgr.disconnectFromParamics();
+    }
+    
+    public void loadParamicsNetwork(int networkID) throws RemoteException, SimulationException {
+        CADSimulator.theParamicsSimMgr.loadParamicsNetwork(networkID);
+    }   
+    
+    public PARAMICS_STATUS getParamicsStatus() throws RemoteException {
+        return CADSimulator.theParamicsSimMgr.getParamicsStatus();
+    }
+    
+    public int getParamicsNetworkLoaded() throws RemoteException {
+        return CADSimulator.theParamicsSimMgr.getParamicsNetworkLoaded();
+    }
+
+    public long getCurrentSimulationTime() throws RemoteException {
+        return CADSimulator.theSimulationCntrlMgr.getCurrentSimTime();  
+    }   
+        
+    public void triggerIncident(Integer incidentNumber) throws RemoteException, ScriptException {
+        
+        if(!CADSimulator.theSimulationCntrlMgr.simulationStarted())
+            throw new ScriptException(ScriptException.SIM_NOT_STARTED);
+        else if(!CADSimulator.theIncidentMgr.areIncidentsLoaded())
+            throw new ScriptException(ScriptException.NO_SCRIPT_LOADED);
+
+        CADSimulator.theIncidentMgr.triggerIncident(incidentNumber, 
+                CADSimulator.theSimulationCntrlMgr.getCurrentSimTime());
+    }
+    
+    public void deleteIncident(Integer incidentNumber) throws RemoteException, ScriptException {
+        CADSimulator.theIncidentMgr.deleteIncident(incidentNumber);
+        
+        if(CADSimulator.theIncidentMgr.getIncidentList().size() == 0) {
+            setScriptStatus(SCRIPT_STATUS.NO_SCRIPT);
+        }
+        
+        if(managerInt != null) {
+            try {                           
+                managerInt.incidentRemoved(incidentNumber);
             }
-        };
-
-        Thread updateThread = new Thread(updateRun);
-        updateThread.start();
-
-    }
-
-    public void connectToParamics() throws RemoteException
-    {
-        CADSimulator.theParamicsSimMgr.connectToParamics();
-    }
-
-    public void disconnectFromParamics() throws RemoteException
-    {
-        CADSimulator.theParamicsSimMgr.disconnectFromParamics();
-    }
-
-    public void loadParamicsNetwork(int networkID) throws RemoteException, SimulationException
-    {
-        CADSimulator.theParamicsSimMgr.loadParamicsNetwork(networkID);
-    }
-
-    public PARAMICS_STATUS getParamicsStatus() throws RemoteException
-    {
-        return CADSimulator.theParamicsSimMgr.getParamicsStatus();
-    }
-
-    public int getParamicsNetworkLoaded() throws RemoteException
-    {
-        return CADSimulator.theParamicsSimMgr.getParamicsNetworkLoaded();
-    }
-
-    public long getCurrentSimulationTime() throws RemoteException
-    {
-        return CADSimulator.theSimulationCntrlMgr.getCurrentSimTime();
-    }
-
-    public void triggerIncident(Integer incidentNumber) throws RemoteException, ScriptException
-    {
-
-        if (!CADSimulator.theSimulationCntrlMgr.simulationStarted())
-        {
-            throw new ScriptException(ScriptException.SIM_NOT_STARTED);
-        } else if (!CADSimulator.theIncidentMgr.areIncidentsLoaded())
-        {
-            throw new ScriptException(ScriptException.NO_SCRIPT_LOADED);
-        }
-
-        CADSimulator.theIncidentMgr.triggerIncident(incidentNumber,
-                CADSimulator.theSimulationCntrlMgr.getCurrentSimTime());
-    }
-
-    public void deleteIncident(Integer incidentNumber) throws RemoteException, ScriptException
-    {
-        CADSimulator.theIncidentMgr.deleteIncident(incidentNumber);
-
-        if (CADSimulator.theIncidentMgr.getIncidentList().size() == 0)
-        {
-            setScriptStatus(SCRIPT_STATUS.NO_SCRIPT);
-        }
-
-        if (managerInt != null)
-        {
-            try
-            {
-                managerInt.incidentRemoved(incidentNumber);
-            } catch (RemoteException re)
-            {
+            catch (RemoteException re) {
                 //Simulation Manager has disappeared
                 managerInt = null;
                 CADSimulator.theViewer.setSimManagerStatus(false);
 
-                coorLogger.logp(Level.SEVERE, "Coordinator", "deleteIncident",
+                coorLogger.logp(Level.SEVERE, "Coordinator", "deleteIncident", 
                         "Connection to Simulation Manager has been dropped.", re);
+            }                   
+        }   
+    }
+    
+    public void rescheduleIncident(Integer incidentNumber, long newTime) 
+        throws RemoteException, ScriptException {
+        
+        if (newTime < CADSimulator.theSimulationCntrlMgr.getCurrentSimTime()) {
+            throw new ScriptException(ScriptException.TIME_PASSED);
+        }
+        
+        CADSimulator.theIncidentMgr.rescheduleIncident(incidentNumber, newTime);
+    }
+    
+    public void addIncident(Incident newIncident) throws RemoteException {
+
+        CADSimulator.theIncidentMgr.addIncident(newIncident);
+        
+        if(managerInt != null) {
+            try {                           
+                managerInt.incidentAdded(newIncident);
             }
-        }
-    }
-
-    public void rescheduleIncident(Integer incidentNumber, long newTime)
-            throws RemoteException, ScriptException
-    {
-
-        if (newTime < CADSimulator.theSimulationCntrlMgr.getCurrentSimTime())
-        {
-            throw new ScriptException(ScriptException.TIME_PASSED);
-        }
-
-        CADSimulator.theIncidentMgr.rescheduleIncident(incidentNumber, newTime);
-    }
-
-    public void addIncident(Incident newIncident) throws RemoteException
-    {
-
-        CADSimulator.theIncidentMgr.addIncident(newIncident);
-
-        if (managerInt != null)
-        {
-            try
-            {
-                managerInt.incidentAdded(newIncident);
-            } catch (RemoteException re)
-            {
+            catch (RemoteException re) {
                 //Simulation Manager has disappeared
                 managerInt = null;
                 CADSimulator.theViewer.setSimManagerStatus(false);
 
-                coorLogger.logp(Level.SEVERE, "Coordinator", "addIncident",
+                coorLogger.logp(Level.SEVERE, "Coordinator", "addIncident", 
                         "Connection to Simulation Manager has been dropped.", re);
-            }
-        }
-    }
-
-    public void loadScriptFile(File scriptFile) throws RemoteException, ScriptException
-    {
-
-
-        try
-        {
+            }                   
+        }       
+    }
+    
+
+    public void loadScriptFile(File scriptFile) throws RemoteException, ScriptException {       
+        
+        
+        try {
             CADSimulator.theIncidentMgr.clearIncidents();
             cadData.clearData();
-
+            
             ScriptHandler sh = new ScriptHandler();
-
+            
             SAXParserFactory.newInstance().newSAXParser().parse(scriptFile, sh);
-
+            
             cadData.setIncidentsFromXML(sh.getIncidents());
             cadData.setUnitsFromXML(sh.getUnits());
             refreshClients();
             CADSimulator.theIncidentMgr.addIncidents(sh.getIncidents());
-
-            resetSimulation();
-        } catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-    }
-
-    public Vector<Incident> getIncidentList() throws RemoteException
-    {
+            
+            resetSimulation();     
+        }
+        catch (Exception e) {e.printStackTrace();}
+
+    }   
+
+    public Vector<Incident> getIncidentList() throws RemoteException {
         return CADSimulator.theIncidentMgr.getIncidentList();
     }
-
-    public TreeMap<Integer, Vector<IncidentEvent>> getTriggeredEvents() throws RemoteException
-    {
+    
+    public TreeMap<Integer, Vector<IncidentEvent>> getTriggeredEvents() throws RemoteException {
         return CADSimulator.theIncidentMgr.getTriggeredEvents();
     }
 
-    public SCRIPT_STATUS getScriptStatus() throws RemoteException
-    {
-        if (CADSimulator.theIncidentMgr.areIncidentsLoaded())
-        {
-            if (CADSimulator.theSimulationCntrlMgr.simulationStarted())
-            {
+    public SCRIPT_STATUS getScriptStatus() throws RemoteException {
+        if(CADSimulator.theIncidentMgr.areIncidentsLoaded()) {
+            if(CADSimulator.theSimulationCntrlMgr.simulationStarted()) 
                 return SCRIPT_STATUS.SCRIPT_RUNNING;
-            } else
-            {
-                for (Incident inc : CADSimulator.theIncidentMgr.getIncidentList())
-                {
-                    if (inc.hasOccured() == true)
-                    {
+            else {
+                for(Incident inc : CADSimulator.theIncidentMgr.getIncidentList()) {
+                    if(inc.hasOccured() == true) 
                         return SCRIPT_STATUS.SCRIPT_PAUSED_STARTED;
-                    }
                 }
                 return SCRIPT_STATUS.SCRIPT_STOPPED_NOT_STARTED;
@@ -517 +451 @@
         return SCRIPT_STATUS.NO_SCRIPT;
     }
-
-    /**
-     * Route a message to a CAD terminal. If the new message is an incident
-     * update, the current message text will be the requested incident's log
-     * number. Set the message's text to the XML representation of the requested
-     * IncidentInquiry object. Notify observers with the new message.
+    
+    /**
+     * Route a message to a CAD terminal.  If the new message is
+     * an incident update, the current message text will be the
+     * requested incident's log number.  Set the message's text 
+     * to the XML representation of the requested IncidentInquiry 
+     * object.  Notify observers with the new message.
      *
      * @param newMessage Routed message received from CAD Client.
      */
-    public void routeMessage(CADRoutedMessage newMessage)
-    {
-
+    public void routeMessage(CADRoutedMessage newMessage) {
+        
         //if this is an incidentUpdate
         /*
          * TODO  Is this a priority??
-         if(newMessage.incidentUpdate) {
-         IncidentInquiryModel tempII = new IncidentInquiryModel(
-         newMessage.fromPosition,
-         CADScreenNum.ONE,
-         Integer.parseInt(newMessage.message));
-
-         for(IncidentInquiryModel_obj iimo : getIncidentInquiryModelObjects(
-         Integer.parseInt(newMessage.message))) {
-         tempII.addModelObject(iimo);
-         }
-
-         XMLWriter tempWriter = new XMLWriter();
-         tempII.toXML(tempWriter);
-         newMessage.message = tempWriter.getString();
-         }
-         */
-
+        if(newMessage.incidentUpdate) {
+            IncidentInquiryModel tempII = new IncidentInquiryModel(
+                    newMessage.fromPosition,
+                    CADScreenNum.ONE, 
+                    Integer.parseInt(newMessage.message));
+            
+            for(IncidentInquiryModel_obj iimo : getIncidentInquiryModelObjects(
+                    Integer.parseInt(newMessage.message))) {
+                tempII.addModelObject(iimo);
+            }
+            
+            XMLWriter tempWriter = new XMLWriter();
+            tempII.toXML(tempWriter);
+            newMessage.message = tempWriter.getString();
+        }
+        */
+            
         notifyObservers(new ObserverMessage(ObserverMessage.messageType.ROUTED_MESSAGE,
                 newMessage));
 
-    }
-
-    public TreeSet<String> getCMSIDs() throws RemoteException
-    {
+    }   
+   
+ 
+    public TreeSet<String> getCMSIDs() throws RemoteException {     
         return new TreeSet<String>(CMSDiversionDB.getInstance().getAllDiversions().keySet());
     }
-
-    public CMSInfo getCMSDiversionInfo(String theCMSID) throws RemoteException
-    {
+    
+    public CMSInfo getCMSDiversionInfo(String theCMSID) throws RemoteException {        
         return CMSDiversionDB.getInstance().getDiversion(theCMSID);
-    }
-
-    public void applyDiversions(CMSInfo theDiversion) throws RemoteException
-    {
+    }    
+    
+    public void applyDiversions(CMSInfo theDiversion) throws RemoteException {
         CMSDiversionDB.getInstance().updateDiversions(theDiversion);
         CADSimulator.theParamicsSimMgr.updateDiversion(theDiversion);
-    }
-
-    /**
-     * Method updates the simulation with the new Incident information. The
-     * parameter IncidentInquiryModel_obj Object is used to create a new
-     * IncidentEvent Object which is finalized and sent to the IncidentManager
-     * for simulation updating.
-     *
+    }    
+   
+    /**
+     * Method updates the simulation with the new Incident information.
+     * The parameter IncidentInquiryModel_obj Object is used to create 
+     * a new IncidentEvent Object which is finalized and sent to the
+     * IncidentManager for simulation updating. 
+     * 
      * @param update IncidentInquiryModel_obj containing CAD line update
      * @see IncidentManager
      */
-    public void commandLineUpdate(IncidentInquiryModel_obj modelInfo)
-    {
-
+    public void commandLineUpdate(IncidentInquiryModel_obj modelInfo) {
+                
         long currentSimTime = CADSimulator.theSimulationCntrlMgr.getCurrentSimTime();
-
+        
         IncidentEvent triggeredEvent = new IncidentEvent(currentSimTime);
-        triggeredEvent.eventInfo = modelInfo;
-
+        triggeredEvent.eventInfo     = modelInfo;
+        
         triggeredEvent.finalizeEvent(currentSimTime, CADSimulator.getCADTime());
 
-        CADSimulator.theIncidentMgr.updateIncident(modelInfo.getLogNumber(), triggeredEvent);
-
+        CADSimulator.theIncidentMgr.updateIncident(modelInfo.getLogNumber(), triggeredEvent); 
+        
         updateIncidentInGUI(modelInfo.getLogNumber(), triggeredEvent);
-
-    }
-
-    /**
-     * If the Simulation has started, spawn a thread to update the
-     * CADSimulatorViewer, SimulationManager, and IncidentManager with the new
-     * simulation time. If the current time is a 30 second interval, notify the
+        
+    }
+    
+    
+    /**
+     * If the Simulation has started, spawn a thread to update the 
+     * CADSimulatorViewer, SimulationManager, and IncidentManager with the new 
+     * simulation time. If the current time is a 30 second interval, notify the 
      * ParamicsControlManager to send an IncidentUpdate.
-     *
+     * 
      * @see SimulationControlManager
      * @see ParamicsControlManager
      * @see IncidentManager
      */
-    public void tick()
-    {
-        if (CADSimulator.theSimulationCntrlMgr.simulationStarted())
-        {
-
+    public void tick() {
+        if(CADSimulator.theSimulationCntrlMgr.simulationStarted()) {
+            
             final long currentSimTime = CADSimulator.theSimulationCntrlMgr.getCurrentSimTime();
-
-            Runnable timeRun = new Runnable()
-            {
-                public void run()
-                {
+            
+            Runnable timeRun = new Runnable() {
+            
+                public void run() {
                     CADSimulator.theViewer.setTime(currentSimTime);
-
+                    
                     //send an update every 30 seconds
-                    if (currentSimTime % 30 == 0)
-                    {
+                    if(currentSimTime % 30 == 0)
                         CADSimulator.theParamicsSimMgr.sendIncidentUpdate(currentSimTime);
-                    }
-
-                    if (managerInt != null)
-                    {
-                        try
-                        {
+                    
+                    if(managerInt != null) {
+                        try {
                             managerInt.tick(currentSimTime);
-                        } catch (RemoteException re)
-                        {
+                        }
+                        catch (RemoteException re) {
                             //Simulation Manager has disappeared
                             managerInt = null;
                             CADSimulator.theViewer.setSimManagerStatus(false);
 
-                            coorLogger.logp(Level.SEVERE, "Coordinator", "tick:run",
+                            coorLogger.logp(Level.SEVERE, "Coordinator", "tick:run", 
                                     "Connection to Simulation Manager has been dropped.", re);
                         }
                     }
-
+                    
                     CADSimulator.theIncidentMgr.tick(currentSimTime);
-                }
+                }           
             };
-
+            
             Thread timeThread = new Thread(timeRun);
-            timeThread.start();
-        }
-    }
+            timeThread.start();                     
+        }
+    }   
+    
 
     /**
      * Method notifies observers with an IncidentSummaryModel_obj to signify
-     * that a new Incident has started. Then spawn a thread to notify the
+     * that a new Incident has started.  Then spawn a thread to notify the
      * SimulationManager with the Incident's log number has started.
-     *
+     * 
      * @param completedEvent Completed IncidentEvent.
      */
-    public void incidentStarted(final IncidentEvent completedEvent)
-    {
+    public void incidentStarted(final IncidentEvent completedEvent) {
         notifyObservers(new ObserverMessage(ObserverMessage.messageType.INCIDENT_SUMMARY,
-                new IncidentSummaryModel_obj(completedEvent.eventInfo.getHeader())));
-
+                new IncidentSummaryModel_obj(completedEvent.eventInfo.getHeader())));    
+        
         incidentStartedInGUI(completedEvent.eventInfo.getLogNumber());
-
-        Runnable startRun = new Runnable()
-        {
-            public void run()
-            {
-                if (managerInt != null)
-                {
-                    try
-                    {
+        
+        Runnable startRun = new Runnable() {                            
+            public void run() {
+                if(managerInt != null) {
+                    try {                           
                         managerInt.incidentStarted(completedEvent.eventInfo.getLogNumber());
-                    } catch (RemoteException re)
-                    {
+                    }
+                    catch (RemoteException re) {
                         //Simulation Manager has disappeared
                         managerInt = null;
                         CADSimulator.theViewer.setSimManagerStatus(false);
 
-                        coorLogger.logp(Level.SEVERE, "Coordinator", "updateIncidents",
+                        coorLogger.logp(Level.SEVERE, "Coordinator", "updateIncidents", 
                                 "Connection to Simulation Manager has been dropped.", re);
+                    }                       
+                }                   
+            }                   
+        };      
+        
+        Thread startThread = new Thread(startRun);
+        startThread.start();
+    }      
+
+    /**
+     * Method notifies observers with the IncidentEvent Object to signify
+     * that a new IncidentEvent has completed.  All XMLIncident Objects
+     * in the completed IncidentEvent is sent to the ParamicsControlManager
+     * for transmission to Paramics.  All CCTVInfo Objects are sent to the
+     * MediaManager for media control.  A thread is then spawned to notify the
+     * SimulationManager with the completed IncidentEvent.
+     * 
+     * @param completedEvent Completed IncidentEvent.
+     * @see ParamicsControlManager
+     * @see MediaManager
+     */
+    public void incidentUpdated(final IncidentEvent completedEvent) {
+        notifyObservers(new ObserverMessage(ObserverMessage.messageType.INCIDENT_INQUIRY,
+                completedEvent.eventInfo));     
+        
+        for(XMLIncident xmlInc : completedEvent.XMLIncidents)
+            CADSimulator.theParamicsSimMgr.updateIncident(xmlInc);
+
+        
+        /*for(CCTVInfo info : completedEvent.cctvInfos) {
+            CADSimulator.theMediaMgr.triggerIncident(info, 
+                    completedEvent.eventInfo.getLogNumber());
+        }*/
+        
+        Runnable displayRun = new Runnable() {                  
+            public void run() {
+                if(managerInt != null) {
+                    try {
+                        managerInt.eventOccured(
+                                completedEvent.eventInfo.getLogNumber(), 
+                                completedEvent);
                     }
+                    catch (RemoteException re) {
+                        //Simulation Manager has disappeared
+                        managerInt = null;
+                        CADSimulator.theViewer.setSimManagerStatus(false);
+
+                        coorLogger.logp(Level.SEVERE, "Coordinator", "updateIncidents:run", 
+                                "Connection to Simulation Manager has been dropped.", re);
+                    }                   
                 }
             }
         };
 
-        Thread startThread = new Thread(startRun);
-        startThread.start();
-    }
-
-    /**
-     * Method notifies observers with the IncidentEvent Object to signify that a
-     * new IncidentEvent has completed. All XMLIncident Objects in the completed
-     * IncidentEvent is sent to the ParamicsControlManager for transmission to
-     * Paramics. All CCTVInfo Objects are sent to the MediaManager for media
-     * control. A thread is then spawned to notify the SimulationManager with
-     * the completed IncidentEvent.
-     *
-     * @param completedEvent Completed IncidentEvent.
-     * @see ParamicsControlManager
-     * @see MediaManager
-     */
-    public void incidentUpdated(final IncidentEvent completedEvent)
-    {
-        notifyObservers(new ObserverMessage(ObserverMessage.messageType.INCIDENT_INQUIRY,
-                completedEvent.eventInfo));
-
-        for (XMLIncident xmlInc : completedEvent.XMLIncidents)
-        {
-            CADSimulator.theParamicsSimMgr.updateIncident(xmlInc);
-        }
-
-
-        /*for(CCTVInfo info : completedEvent.cctvInfos) {
-         CADSimulator.theMediaMgr.triggerIncident(info,
-         completedEvent.eventInfo.getLogNumber());
-         }*/
-
-        Runnable displayRun = new Runnable()
-        {
-            public void run()
-            {
-                if (managerInt != null)
-                {
-                    try
-                    {
-                        managerInt.eventOccured(
-                                completedEvent.eventInfo.getLogNumber(),
-                                completedEvent);
-                    } catch (RemoteException re)
-                    {
-                        //Simulation Manager has disappeared
-                        managerInt = null;
-                        CADSimulator.theViewer.setSimManagerStatus(false);
-
-                        coorLogger.logp(Level.SEVERE, "Coordinator", "updateIncidents:run",
-                                "Connection to Simulation Manager has been dropped.", re);
-                    }
-                }
-            }
-        };
-
         Thread displayThread = new Thread(displayRun);
-        displayThread.start();
-    }
-
+        displayThread.start();        
+    }      
+    
     /**
      * @see IncidentManager
      */
-    public boolean incidentExists(Integer logNumber)
-    {
+    public boolean incidentExists(Integer logNumber) {
         return CADSimulator.theIncidentMgr.incidentExists(logNumber);
     }
@@ -756 +669 @@
      * @see IncidentManager
      */
-    public Vector<IncidentBoardModel_obj> getIncidentBoardModelObjects()
-    {
+    public Vector<IncidentBoardModel_obj> getIncidentBoardModelObjects() {
         return CADSimulator.theIncidentMgr.getIncidentBoardModelObjects();
-    }
+    }       
 
     /**
      * @see IncidentManager
      */
-    public Vector<IncidentInquiryModel_obj> getIncidentInquiryModelObjects(Integer logNumber)
-    {
+    public Vector<IncidentInquiryModel_obj> getIncidentInquiryModelObjects(Integer logNumber) {
         return CADSimulator.theIncidentMgr.getIncidentInquiryModelObjects(logNumber);
-    }
+    }    
 
     /**
      * @see IncidentManager
      */
-    public Vector<IncidentSummaryModel_obj> getIncidentSummaryModelObjects()
-    {
+    public Vector<IncidentSummaryModel_obj> getIncidentSummaryModelObjects() {
         return CADSimulator.theIncidentMgr.getIncidentSummaryModelObjects();
-    }
-
+    }     
+    
+  
     /**
      * Adds an observer to the list of observers.
@@ -782 +693 @@
      * @param o New observer object.
      */
-    public void addObserver(Observer o)
-    {
-        observerList.add(o);
-    }
-
-    /**
-     * Removes an observer from the list of observers. If the observer is not
-     * found, this method returns false, else true is returned for a successful
-     * removal.
+    public void addObserver(Observer o) {
+        observerList.add(o);    
+    }
+    
+    /** 
+     * Removes an observer from the list of observers.  If the observer
+     * is not found, this method returns false, else true is returned for
+     * a successful removal. 
      *
      * @param o Observer to be removed.
      * @returns True if remove was successful, false if not.
-     */
-    public boolean removeObserver(Observer o)
-    {
+     */     
+    public boolean removeObserver(Observer o) {
         return observerList.remove(o);
     }
-
-    /**
-     * Notify all registered observers with the parameter ObserverMessage
-     * object.
+    
+    /**
+     * Notify all registered observers with the parameter ObserverMessage object.
      *
      * @param newMsg The ObserverMessage to be sent.
      */
-    private void notifyObservers(ObserverMessage newMsg)
-    {
-        for (Observer o : observerList)
-        {
-            o.update(null, newMsg);
-        }
-    }
-
-    public void refreshClients() throws RemoteException
-    {
-        for (int i = 0; i < clientList.size(); i++)
-        {
+    private void notifyObservers(ObserverMessage newMsg) {
+        for(Observer o : observerList) 
+            o.update(null, newMsg); 
+    }
+    
+    public void refreshClients() throws RemoteException{
+        for(int i = 0; i < clientList.size(); i++){
             clientList.get(i).refresh();
         }
     }
-
+    
     /**
      * Checks the CADData for an existing incident with id
-     *
      * @param id the incident id
      * @return true if CADData contains such an incident, otherwise false.
      * @throws RemoteException
      */
-    public boolean checkForValidIncidentID(int id) throws RemoteException
-    {
+     public boolean checkForValidIncidentID(int id) throws RemoteException{
         return cadData.checkForValidId(id);
-    }
-
-    /**
+     }
+    
+     
+     /**
      * Uses an Incident's masterInc to lookup its ID.
-     *
      * @param masterInc the Incident to look up
      * @return the same Incident's ID, -1 if invalid masterInc
      * @throws RemoteException
      */
-    public int getIncidentId(String masterInc) throws RemoteException
-    {
-        return cadData.getIncidentId(masterInc);
-    }
-
+     public int getIncidentId(String masterInc) throws RemoteException{
+         return cadData.getIncidentId(masterInc);
+     }
+    
     /**
      * Returns a table model out of CADData based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @throws RemoteException
-     */
-    public DefaultTableModel getCadDataTable(TABLE tag) throws RemoteException
-    {
-        if (tag.equals(TABLE.ASSIGNED_INCIDENTS))
-        {
+     * @param tag a CADDataEnums tag
+     * @throws RemoteException
+     */
+    public DefaultTableModel getCadDataTable(TABLE tag) throws RemoteException{
+        if(tag.equals(TABLE.ASSIGNED_INCIDENTS)){
             return cadData.tableForAssignedIncidents();
-        } else if (tag.equals(TABLE.UNIT_STATUS))
-        {
+        }
+        else if(tag.equals(TABLE.UNIT_STATUS)){
             return cadData.tableForUnitStatus();
-        } else if (tag.equals(TABLE.PENDING_INCIDENTS))
-        {
+        }
+        else if(tag.equals(TABLE.PENDING_INCIDENTS)){
             return cadData.tableForPendingIncidents();
-        } else if (tag.equals(TABLE.INCIDENT_EDITOR))
-        {
+        }
+        else if(tag.equals(TABLE.INCIDENT_EDITOR)){
             return cadData.tableForIncidentEditor();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataTable");
         }
     }
-
+    
     /**
      * Returns the specified incident's table based on the tag.
-     *
      * @param tag a CADDataEnums tag
      * @param incidentId the incident's ID to look up
@@ -880 +776 @@
      * @throws RemoteException
      */
-    public DefaultTableModel getCadDataIncidentTable(INC_TABLE tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_TABLE.COMMENTS_NOTES))
-        {
-            return cadData.getIncident(incidentId).getCommentsNotesTable();
-        }
-        return null;
-    }
-
+    public DefaultTableModel getCadDataIncidentTable(INC_TABLE tag, int incidentId) throws RemoteException{
+     if(tag.equals(INC_TABLE.COMMENTS_NOTES)){
+         return cadData.getIncident(incidentId).getCommentsNotesTable();
+     }
+     return null;
+    }
+    
     /**
      * Adds a row of data to a specified incident's table based on the tag.
-     *
      * @param tag a CADDataEnums tag
      * @param incidentId the incident's ID to look up
@@ -897 +790 @@
      * @throws RemoteException
      */
-    public void addCadDataIncidentTable(INC_TABLE tag, int incidentId, String[] fields) throws RemoteException
-    {
-        if (tag.equals(INC_TABLE.COMMENTS_NOTES))
-        {
-            cadData.getIncident(incidentId).addToCommentsNotesTable(fields);
-        }
-    }
-
+    public void addCadDataIncidentTable(INC_TABLE tag, int incidentId, String[] fields) throws RemoteException{
+     if(tag.equals(INC_TABLE.COMMENTS_NOTES)){
+         cadData.getIncident(incidentId).addToCommentsNotesTable(fields);
+     }
+    }
+    
     /**
      * Adds a row to the specified data table based on the incoming fields.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void addCadDataTableRow(TABLE tag, String field1, String field2, String field3, String field4) throws RemoteException
-    {
-    }
-
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+     public void addCadDataTableRow(TABLE tag, String field1, String field2, String field3, String field4) throws RemoteException{
+         
+     }
+    
+     
+     
     /**
      * Returns an object out of Incident based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public Object getCadDataIncVal(INC_VAL tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_VAL.LOG_NUM))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public Object getCadDataIncVal(INC_VAL tag, int incidentId) throws RemoteException{
+    if(tag.equals(INC_VAL.LOG_NUM)){
             return cadData.getIncident(incidentId).getLogNum();
-        } else if (tag.equals(INC_VAL.MASTER_INC))
-        {
+        }
+        else if(tag.equals(INC_VAL.MASTER_INC)){
             return cadData.getIncident(incidentId).getMasterInc();
-        } else if (tag.equals(INC_VAL.OAU))
-        {
+        }
+        else if(tag.equals(INC_VAL.OAU)){
             return cadData.getIncident(incidentId).getOau();
-        } else if (tag.equals(INC_VAL.P))
-        {
+        }
+        else if(tag.equals(INC_VAL.P)){
             return cadData.getIncident(incidentId).getP();
-        } else if (tag.equals(INC_VAL.DESCRIPTION))
-        {
+        }
+        else if(tag.equals(INC_VAL.DESCRIPTION)){
             return cadData.getIncident(incidentId).getDescription();
-        } else if (tag.equals(INC_VAL.RP))
-        {
+        }
+        else if(tag.equals(INC_VAL.RP)){
             return cadData.getIncident(incidentId).getRp();
-        } else if (tag.equals(INC_VAL.RP_TYPE))
-        {
+        }
+        else if(tag.equals(INC_VAL.RP_TYPE)){
             return cadData.getIncident(incidentId).getRpType();
-        } else if (tag.equals(INC_VAL.ALI))
-        {
+        }
+        else if(tag.equals(INC_VAL.ALI)){
             return cadData.getIncident(incidentId).getAli();
-        } else if (tag.equals(INC_VAL.MEDIA))
-        {
+        }
+        else if(tag.equals(INC_VAL.MEDIA)){
             return cadData.getIncident(incidentId).getMedia();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncVal");
         }
     }
-
+    
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncVal(INC_VAL tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_VAL.OAU))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncVal(INC_VAL tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_VAL.OAU)){
             cadData.getIncident(incidentId).setOau(value);
-        } else if (tag.equals(INC_VAL.P))
-        {
+        }
+        else if(tag.equals(INC_VAL.P)){
             cadData.getIncident(incidentId).setP(value);
-        } else if (tag.equals(INC_VAL.DESCRIPTION))
-        {
+        }
+        else if(tag.equals(INC_VAL.DESCRIPTION)){
             cadData.getIncident(incidentId).setDescription(value);
-        } else if (tag.equals(INC_VAL.RP))
-        {
+        }
+        else if(tag.equals(INC_VAL.RP)){
             cadData.getIncident(incidentId).setRp(value);
-        } else if (tag.equals(INC_VAL.RP_TYPE))
-        {
+        }
+        else if(tag.equals(INC_VAL.RP_TYPE)){
             cadData.getIncident(incidentId).setRpType(value);
-        } else if (tag.equals(INC_VAL.ALI))
-        {
+        }
+        else if(tag.equals(INC_VAL.ALI)){
             cadData.getIncident(incidentId).setAli(value);
-        } else if (tag.equals(INC_VAL.MEDIA))
-        {
+        }
+        else if(tag.equals(INC_VAL.MEDIA)){
             cadData.getIncident(incidentId).setMedia(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncVal");
         }
     }
+    
 
     /**
      * Returns a string out of IncidentLocation based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncLoc(INC_LOC tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_LOC.ADDRESS))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncLoc(INC_LOC tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_LOC.ADDRESS)){
             return cadData.getIncident(incidentId).getIncidentLocation().getAddress();
-        } else if (tag.equals(INC_LOC.LOC))
-        {
+        }
+        else if(tag.equals(INC_LOC.LOC)){
             return cadData.getIncident(incidentId).getIncidentLocation().getLoc();
-        } else if (tag.equals(INC_LOC.CITY))
-        {
+        }
+        else if(tag.equals(INC_LOC.CITY)){
             return cadData.getIncident(incidentId).getIncidentLocation().getCity();
-        } else if (tag.equals(INC_LOC.COUNTY))
-        {
+        }
+        else if(tag.equals(INC_LOC.COUNTY)){
             return cadData.getIncident(incidentId).getIncidentLocation().getCounty();
-        } else if (tag.equals(INC_LOC.STATE))
-        {
+        }
+        else if(tag.equals(INC_LOC.STATE)){
             return cadData.getIncident(incidentId).getIncidentLocation().getState();
-        } else if (tag.equals(INC_LOC.ZIP))
-        {
+        }
+        else if(tag.equals(INC_LOC.ZIP)){
             return cadData.getIncident(incidentId).getIncidentLocation().getZip();
-        } else if (tag.equals(INC_LOC.BEAT))
-        {
+        }
+        else if(tag.equals(INC_LOC.BEAT)){
             return cadData.getIncident(incidentId).getIncidentLocation().getBeat();
-        } else if (tag.equals(INC_LOC.AREA))
-        {
+        }
+        else if(tag.equals(INC_LOC.AREA)){
             return cadData.getIncident(incidentId).getIncidentLocation().getArea();
-        } else if (tag.equals(INC_LOC.SECTOR))
-        {
+        }
+        else if(tag.equals(INC_LOC.SECTOR)){
             return cadData.getIncident(incidentId).getIncidentLocation().getSector();
-        } else if (tag.equals(INC_LOC.SECTOR_CODE))
-        {
+        }
+        else if(tag.equals(INC_LOC.SECTOR_CODE)){
             return cadData.getIncident(incidentId).getIncidentLocation().getSectorCode();
-        } else if (tag.equals(INC_LOC.DIVISION))
-        {
+        }
+        else if(tag.equals(INC_LOC.DIVISION)){
             return cadData.getIncident(incidentId).getIncidentLocation().getDivision();
-        } else if (tag.equals(INC_LOC.APT))
-        {
+        }
+        else if(tag.equals(INC_LOC.APT)){
             return cadData.getIncident(incidentId).getIncidentLocation().getApt();
-        } else if (tag.equals(INC_LOC.BUILDING))
-        {
+        }
+        else if(tag.equals(INC_LOC.BUILDING)){
             return cadData.getIncident(incidentId).getIncidentLocation().getBuilding();
-        } else if (tag.equals(INC_LOC.CROSS_ST))
-        {
+        }
+        else if(tag.equals(INC_LOC.CROSS_ST)){
             return cadData.getIncident(incidentId).getIncidentLocation().getCrossSt();
-        } else if (tag.equals(INC_LOC.LAW))
-        {
+        }
+        else if(tag.equals(INC_LOC.LAW)){
             return cadData.getIncident(incidentId).getIncidentLocation().getLaw();
-        } else if (tag.equals(INC_LOC.FIRE))
-        {
+        }
+        else if(tag.equals(INC_LOC.FIRE)){
             return cadData.getIncident(incidentId).getIncidentLocation().getFire();
-        } else if (tag.equals(INC_LOC.EMS))
-        {
+        }
+        else if(tag.equals(INC_LOC.EMS)){
             return cadData.getIncident(incidentId).getIncidentLocation().getEms();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncLoc");
         }
@@ -1062 +946 @@
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncLoc(INC_LOC tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_LOC.ADDRESS))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncLoc(INC_LOC tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_LOC.ADDRESS)){
             cadData.getIncident(incidentId).getIncidentLocation().setAddress(value);
-        } else if (tag.equals(INC_LOC.LOC))
-        {
+        }
+        else if(tag.equals(INC_LOC.LOC)){
             cadData.getIncident(incidentId).getIncidentLocation().setLoc(value);
-        } else if (tag.equals(INC_LOC.CITY))
-        {
+        }
+        else if(tag.equals(INC_LOC.CITY)){
             cadData.getIncident(incidentId).getIncidentLocation().setCity(value);
-        } else if (tag.equals(INC_LOC.COUNTY))
-        {
+        }
+        else if(tag.equals(INC_LOC.COUNTY)){
             cadData.getIncident(incidentId).getIncidentLocation().setCounty(value);
-        } else if (tag.equals(INC_LOC.STATE))
-        {
+        }
+        else if(tag.equals(INC_LOC.STATE)){
             cadData.getIncident(incidentId).getIncidentLocation().setState(value);
-        } else if (tag.equals(INC_LOC.ZIP))
-        {
+        }
+        else if(tag.equals(INC_LOC.ZIP)){
             cadData.getIncident(incidentId).getIncidentLocation().setZip(value);
-        } else if (tag.equals(INC_LOC.BEAT))
-        {
+        }
+        else if(tag.equals(INC_LOC.BEAT)){
             cadData.getIncident(incidentId).getIncidentLocation().setBeat(value);
-        } else if (tag.equals(INC_LOC.AREA))
-        {
+        }
+        else if(tag.equals(INC_LOC.AREA)){
             cadData.getIncident(incidentId).getIncidentLocation().setArea(value);
-        } else if (tag.equals(INC_LOC.SECTOR))
-        {
+        }
+        else if(tag.equals(INC_LOC.SECTOR)){
             cadData.getIncident(incidentId).getIncidentLocation().setSector(value);
-        } else if (tag.equals(INC_LOC.SECTOR_CODE))
-        {
+        }
+        else if(tag.equals(INC_LOC.SECTOR_CODE)){
             cadData.getIncident(incidentId).getIncidentLocation().setSectorCode(value);
-        } else if (tag.equals(INC_LOC.DIVISION))
-        {
+        }
+        else if(tag.equals(INC_LOC.DIVISION)){
             cadData.getIncident(incidentId).getIncidentLocation().setDivision(value);
-        } else if (tag.equals(INC_LOC.APT))
-        {
+        }
+        else if(tag.equals(INC_LOC.APT)){
             cadData.getIncident(incidentId).getIncidentLocation().setApt(value);
-        } else if (tag.equals(INC_LOC.BUILDING))
-        {
+        }
+        else if(tag.equals(INC_LOC.BUILDING)){
             cadData.getIncident(incidentId).getIncidentLocation().setBuilding(value);
-        } else if (tag.equals(INC_LOC.CROSS_ST))
-        {
+        }
+        else if(tag.equals(INC_LOC.CROSS_ST)){
             cadData.getIncident(incidentId).getIncidentLocation().setCrossSt(value);
-        } else if (tag.equals(INC_LOC.LAW))
-        {
+        }
+        else if(tag.equals(INC_LOC.LAW)){
             cadData.getIncident(incidentId).getIncidentLocation().setLaw(value);
-        } else if (tag.equals(INC_LOC.FIRE))
-        {
+        }
+        else if(tag.equals(INC_LOC.FIRE)){
             cadData.getIncident(incidentId).getIncidentLocation().setFire(value);
-        } else if (tag.equals(INC_LOC.EMS))
-        {
+        }
+        else if(tag.equals(INC_LOC.EMS)){
             cadData.getIncident(incidentId).getIncidentLocation().setEms(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncLoc");
         }
     }
-
+    
     /**
      * Returns a string out of IncidentCaller based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncCaller(INC_CALLER tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_CALLER.TYPE))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncCaller(INC_CALLER tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_CALLER.TYPE)){
             return cadData.getIncident(incidentId).getIncidentCaller().getCallerType();
-        } else if (tag.equals(INC_CALLER.NAME))
-        {
+        }
+        else if(tag.equals(INC_CALLER.NAME)){
             return cadData.getIncident(incidentId).getIncidentCaller().getCallerName();
-        } else if (tag.equals(INC_CALLER.PHONE))
-        {
+        }
+        else if(tag.equals(INC_CALLER.PHONE)){
             return cadData.getIncident(incidentId).getIncidentCaller().getPhone();
-        } else if (tag.equals(INC_CALLER.EXT))
-        {
+        }
+        else if(tag.equals(INC_CALLER.EXT)){
             return cadData.getIncident(incidentId).getIncidentCaller().getExt();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncCaller");
         }
@@ -1155 +1033 @@
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncCaller(INC_CALLER tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_CALLER.TYPE))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncCaller(INC_CALLER tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_CALLER.TYPE)){
             cadData.getIncident(incidentId).getIncidentCaller().setCallerType(value);
-        } else if (tag.equals(INC_CALLER.NAME))
-        {
+        }
+        else if(tag.equals(INC_CALLER.NAME)){
             cadData.getIncident(incidentId).getIncidentCaller().setCallerName(value);
-        } else if (tag.equals(INC_CALLER.PHONE))
-        {
+        }
+        else if(tag.equals(INC_CALLER.PHONE)){
             cadData.getIncident(incidentId).getIncidentCaller().setPhone(value);
-        } else if (tag.equals(INC_CALLER.EXT))
-        {
+        }
+        else if(tag.equals(INC_CALLER.EXT)){
             cadData.getIncident(incidentId).getIncidentCaller().setExt(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncCaller");
         }
     }
-
+    
     /**
      * Returns a string out of IncidentProblem based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncProblem(INC_PROBLEM tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_PROBLEM.PROBLEM))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncProblem(INC_PROBLEM tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_PROBLEM.PROBLEM)){
             return cadData.getIncident(incidentId).getProblem().getProblem();
-        } else if (tag.equals(INC_PROBLEM.CODE))
-        {
+        }
+        else if(tag.equals(INC_PROBLEM.CODE)){
             return cadData.getIncident(incidentId).getProblem().getProblemCode();
-        } else if (tag.equals(INC_PROBLEM.PRIORITY))
-        {
+        }
+        else if(tag.equals(INC_PROBLEM.PRIORITY)){
             return cadData.getIncident(incidentId).getProblem().getPriority();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncProblem");
         }
     }
-
+    
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncProblem(INC_PROBLEM tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_PROBLEM.PROBLEM))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncProblem(INC_PROBLEM tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_PROBLEM.PROBLEM)){
             cadData.getIncident(incidentId).getProblem().setProblem(value);
-        } else if (tag.equals(INC_PROBLEM.CODE))
-        {
+        }
+        else if(tag.equals(INC_PROBLEM.CODE)){
             cadData.getIncident(incidentId).getProblem().setProblemCode(value);
-        } else if (tag.equals(INC_PROBLEM.PRIORITY))
-        {
+        }
+        else if(tag.equals(INC_PROBLEM.PRIORITY)){
             cadData.getIncident(incidentId).getProblem().setPriority(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncProblem");
         }
@@ -1230 +1099 @@
     /**
      * Returns a string out of IncidentGeneralInfo based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncGenInfo(INC_GEN_INFO tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_GEN_INFO.JURISDICTION))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncGenInfo(INC_GEN_INFO tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_GEN_INFO.JURISDICTION)){
             return cadData.getIncident(incidentId).getGenInfo().getJurisdiction();
-        } else if (tag.equals(INC_GEN_INFO.ALARM))
-        {
+        }
+        else if(tag.equals(INC_GEN_INFO.ALARM)){
             return cadData.getIncident(incidentId).getGenInfo().getAlarm();
-        } else if (tag.equals(INC_GEN_INFO.AGY))
-        {
+        }
+        else if(tag.equals(INC_GEN_INFO.AGY)){
             return cadData.getIncident(incidentId).getGenInfo().getAgy();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncGenInfo");
         }
@@ -1254 +1120 @@
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncGenInfo(INC_GEN_INFO tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_GEN_INFO.JURISDICTION))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncGenInfo(INC_GEN_INFO tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_GEN_INFO.JURISDICTION)){
             cadData.getIncident(incidentId).getGenInfo().setJurisdiction(value);
-        } else if (tag.equals(INC_GEN_INFO.ALARM))
-        {
+        }
+        else if(tag.equals(INC_GEN_INFO.ALARM)){
             cadData.getIncident(incidentId).getGenInfo().setAlarm(value);
-        } else if (tag.equals(INC_GEN_INFO.AGY))
-        {
+        }
+        else if(tag.equals(INC_GEN_INFO.AGY)){
             cadData.getIncident(incidentId).getGenInfo().setAgy(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncGenInfo");
         }
     }
-
+    
     /**
      * Returns a string out of IncidentResponse based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncResp(INC_RESP tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_RESP.PLAN))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncResp(INC_RESP tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_RESP.PLAN)){
             return cadData.getIncident(incidentId).getResponse().getPlan();
-        } else if (tag.equals(INC_RESP.AREA))
-        {
+        }
+        else if(tag.equals(INC_RESP.AREA)){
             return cadData.getIncident(incidentId).getResponse().getArea();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncResp");
         }
     }
-
+    
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncResp(INC_RESP tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_RESP.PLAN))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncResp(INC_RESP tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_RESP.PLAN)){
             cadData.getIncident(incidentId).getResponse().setPlan(value);
-        } else if (tag.equals(INC_RESP.AREA))
-        {
+        }
+        else if(tag.equals(INC_RESP.AREA)){
             cadData.getIncident(incidentId).getResponse().setArea(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncResp");
         }
@@ -1320 +1177 @@
     /**
      * Returns a string out of IncidentAdditionalInfo based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncAddInfo(INC_ADD_INFO tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_ADD_INFO.TYPE))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncAddInfo(INC_ADD_INFO tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_ADD_INFO.TYPE)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getType();
-        } else if (tag.equals(INC_ADD_INFO.TYPE_CODE))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.TYPE_CODE)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getTypeCode();
-        } else if (tag.equals(INC_ADD_INFO.MACHINE))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.MACHINE)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getMachine();
-        } else if (tag.equals(INC_ADD_INFO.CALL_STATUS))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.CALL_STATUS)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getCallStatus();
-        } else if (tag.equals(INC_ADD_INFO.CALL_TAKER_EXT))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.CALL_TAKER_EXT)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getCallTakerExt();
-        } else if (tag.equals(INC_ADD_INFO.ALARM_LEVEL))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.ALARM_LEVEL)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getAlarmLevel();
-        } else if (tag.equals(INC_ADD_INFO.ROTATION_PROVIDER_AREA))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.ROTATION_PROVIDER_AREA)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getRotationProviderArea();
-        } else if (tag.equals(INC_ADD_INFO.COMMENT))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.COMMENT)){
             return cadData.getIncident(incidentId).getAdditionalInfo().getComment();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncAddInfo");
         }
@@ -1359 +1213 @@
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncAddInfo(INC_ADD_INFO tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_ADD_INFO.TYPE))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncAddInfo(INC_ADD_INFO tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_ADD_INFO.TYPE)){
             cadData.getIncident(incidentId).getAdditionalInfo().setType(value);
-        } else if (tag.equals(INC_ADD_INFO.TYPE_CODE))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.TYPE_CODE)){
             cadData.getIncident(incidentId).getAdditionalInfo().setTypeCode(value);
-        } else if (tag.equals(INC_ADD_INFO.MACHINE))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.MACHINE)){
             cadData.getIncident(incidentId).getAdditionalInfo().setMachine(value);
-        } else if (tag.equals(INC_ADD_INFO.CALL_STATUS))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.CALL_STATUS)){
             cadData.getIncident(incidentId).getAdditionalInfo().setCallStatus(value);
-        } else if (tag.equals(INC_ADD_INFO.CALL_TAKER_EXT))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.CALL_TAKER_EXT)){
             cadData.getIncident(incidentId).getAdditionalInfo().setCallTakerExt(value);
-        } else if (tag.equals(INC_ADD_INFO.ALARM_LEVEL))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.ALARM_LEVEL)){
             cadData.getIncident(incidentId).getAdditionalInfo().setAlarmLevel(value);
-        } else if (tag.equals(INC_ADD_INFO.ROTATION_PROVIDER_AREA))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.ROTATION_PROVIDER_AREA)){
             cadData.getIncident(incidentId).getAdditionalInfo().setRotationProviderArea(value);
-        } else if (tag.equals(INC_ADD_INFO.COMMENT))
-        {
+        }
+        else if(tag.equals(INC_ADD_INFO.COMMENT)){
             cadData.getIncident(incidentId).getAdditionalInfo().setComment(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncAddInfo");
         }
     }
-
+    
     /**
      * Returns a string out of IncidentActivities based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncActivities(INC_ACTIVITIES tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_ACTIVITIES.VEHICLE))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncActivities(INC_ACTIVITIES tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_ACTIVITIES.VEHICLE)){
             return cadData.getIncident(incidentId).getActivities().getVehicle();
-        } else if (tag.equals(INC_ACTIVITIES.ACTIVITY))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.ACTIVITY)){
             return cadData.getIncident(incidentId).getActivities().getActivity();
-        } else if (tag.equals(INC_ACTIVITIES.LOCATION))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.LOCATION)){
             return cadData.getIncident(incidentId).getActivities().getLocation();
-        } else if (tag.equals(INC_ACTIVITIES.COMMENT))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.COMMENT)){
             return cadData.getIncident(incidentId).getActivities().getComment();
-        } else if (tag.equals(INC_ACTIVITIES.DISP))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.DISP)){
             return cadData.getIncident(incidentId).getActivities().getDisp();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncActivities");
         }
@@ -1428 +1276 @@
     /**
      * Set incidentId's field based on tag to value.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public void setCadDataIncActivities(INC_ACTIVITIES tag, int incidentId, String value) throws RemoteException
-    {
-        if (tag.equals(INC_ACTIVITIES.VEHICLE))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public void setCadDataIncActivities(INC_ACTIVITIES tag, int incidentId, String value) throws RemoteException{
+        if(tag.equals(INC_ACTIVITIES.VEHICLE)){
             cadData.getIncident(incidentId).getActivities().setVehicle(value);
-        } else if (tag.equals(INC_ACTIVITIES.ACTIVITY))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.ACTIVITY)){
             cadData.getIncident(incidentId).getActivities().setActivity(value);
-        } else if (tag.equals(INC_ACTIVITIES.LOCATION))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.LOCATION)){
             cadData.getIncident(incidentId).getActivities().setLocation(value);
-        } else if (tag.equals(INC_ACTIVITIES.COMMENT))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.COMMENT)){
             cadData.getIncident(incidentId).getActivities().setComment(value);
-        } else if (tag.equals(INC_ACTIVITIES.DISP))
-        {
+        }
+        else if(tag.equals(INC_ACTIVITIES.DISP)){
             cadData.getIncident(incidentId).getActivities().setDisp(value);
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataIncActivities");
         }
     }
-
+    
     /**
      * Returns a string out of IncidentCallback based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncCallBack(INC_CALLBACK tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_CALLBACK.INITIAL))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncCallBack(INC_CALLBACK tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_CALLBACK.INITIAL)){
             return cadData.getIncident(incidentId).getCallBacks().getInitial();
-        } else if (tag.equals(INC_CALLBACK.COMMENT))
-        {
+        }
+        else if(tag.equals(INC_CALLBACK.COMMENT)){
             return cadData.getIncident(incidentId).getCallBacks().getComment();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncCallBack");
         }
@@ -1479 +1321 @@
     /**
      * Returns a string out of IncidentEditLog based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncEditLog(INC_EDIT_LOG tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_EDIT_LOG.EDIT))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncEditLog(INC_EDIT_LOG tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_EDIT_LOG.EDIT)){
             return cadData.getIncident(incidentId).getEditLog().getEdit();
-        } else if (tag.equals(INC_EDIT_LOG.REASON))
-        {
+        }
+        else if(tag.equals(INC_EDIT_LOG.REASON)){
             return cadData.getIncident(incidentId).getEditLog().getReason();
-        } else if (tag.equals(INC_EDIT_LOG.CHANGE_BY))
-        {
+        }
+        else if(tag.equals(INC_EDIT_LOG.CHANGE_BY)){
             return cadData.getIncident(incidentId).getEditLog().getChangeBy();
-        } else if (tag.equals(INC_EDIT_LOG.TERMINAL))
-        {
+        }
+        else if(tag.equals(INC_EDIT_LOG.TERMINAL)){
             return cadData.getIncident(incidentId).getEditLog().getTerminal();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncEditLog");
         }
@@ -1506 +1345 @@
     /**
      * Returns a string out of IncidentInfo based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncInfo(INC_INFO tag, int incidentId) throws RemoteException
-    {
-        if (tag.equals(INC_INFO.CALL_INITIATED))
-        {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncInfo(INC_INFO tag, int incidentId) throws RemoteException {
+        if(tag.equals(INC_INFO.CALL_INITIATED)){
             return cadData.getIncident(incidentId).getInfo().getCallInit();
-        } else if (tag.equals(INC_INFO.CALL_TAKEN))
-        {
+        }
+        else if(tag.equals(INC_INFO.CALL_TAKEN)){
             return cadData.getIncident(incidentId).getInfo().getCallTaken();
-        } else if (tag.equals(INC_INFO.TIME_IN_Q))
-        {
+        }
+        else if(tag.equals(INC_INFO.TIME_IN_Q)){
             return cadData.getIncident(incidentId).getInfo().getTimeInQ();
-        } else if (tag.equals(INC_INFO.LAST_UPDATED))
-        {
+        }
+        else if(tag.equals(INC_INFO.LAST_UPDATED)){
             return cadData.getIncident(incidentId).getInfo().getLastUpdated();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataIncInfo");
         }
@@ -1533 +1369 @@
     /**
      * Returns a string out of IncidentTimes based on tag.
-     *
-     * @param tag a CADDataEnums tag
-     * @param incidentId the incident's ID to look up
-     * @throws RemoteException
-     */
-    public String getCadDataIncTimes(INC_TIMES tag, int incidentId) throws RemoteException
-    {
+     * @param tag a CADDataEnums tag
+     * @param incidentId the incident's ID to look up
+     * @throws RemoteException
+     */
+    public String getCadDataIncTimes(INC_TIMES tag, int incidentId) throws RemoteException {
         // TODO Auto-generated method stub
         return null;
     }
-
+    
     /**
      * Returns a CardfileList matching the tag.
      */
-    public CardfileList getCardfileList(CARDFILE tag) throws RemoteException
-    {
-        if (tag.equals(CARDFILE.COASTAL_DIVISION_UNITS))
-        {
+    public CardfileList getCardfileList(CARDFILE tag) throws RemoteException{
+        if(tag.equals(CARDFILE.COASTAL_DIVISION_UNITS)){
             return cardfileData.getCoastalDivisionUnitList();
-        } else if (tag.equals(CARDFILE.POLICE_SHERIFF_CORONER))
-        {
+        }
+        else if(tag.equals(CARDFILE.POLICE_SHERIFF_CORONER)){
             return cardfileData.getPoliceSheriffCoronerList();
-        } else if (tag.equals(CARDFILE.COURTS))
-        {
+        }
+        else if(tag.equals(CARDFILE.COURTS)){
             return cardfileData.getCourtsList();
-        } else if (tag.equals(CARDFILE.PUBLIC_TRANSPORTATION))
-        {
+        }
+        else if(tag.equals(CARDFILE.PUBLIC_TRANSPORTATION)){
             return cardfileData.getPublicTransportationList();
-        } else if (tag.equals(CARDFILE.GG_OTHER))
-        {
+        }
+        else if(tag.equals(CARDFILE.GG_OTHER)){
             return cardfileData.getGgOtherList();
-        } else if (tag.equals(CARDFILE.MY_MISC))
-        {
+        }
+        else if(tag.equals(CARDFILE.MY_MISC)){
             return cardfileData.getMyMiscList();
-        } else if (tag.equals(CARDFILE.SL_MISC))
-        {
+        }
+        else if(tag.equals(CARDFILE.SL_MISC)){
             return cardfileData.getSlMiscList();
-        } else if (tag.equals(CARDFILE.VT_MISC))
-        {
+        }
+        else if(tag.equals(CARDFILE.VT_MISC)){
             return cardfileData.getVlMiscList();
-        } else if (tag.equals(CARDFILE.CHP_OFFICES))
-        {
+        }
+        else if(tag.equals(CARDFILE.CHP_OFFICES)){
             return cardfileData.getChpOfficesList();
-        } else if (tag.equals(CARDFILE.STATE_AGENCIES_FACILITIES))
-        {
+        }
+        else if(tag.equals(CARDFILE.STATE_AGENCIES_FACILITIES)){
             return cardfileData.getStateAgenciesFacilitiesList();
-        } else if (tag.equals(CARDFILE.GOVERNMENT_OFFICIALS))
-        {
+        }
+        else if(tag.equals(CARDFILE.GOVERNMENT_OFFICIALS)){
             return cardfileData.getGovernmentOfficialsList();
-        } else if (tag.equals(CARDFILE.FEDERAL_AGENCIES))
-        {
+        }
+        else if(tag.equals(CARDFILE.FEDERAL_AGENCIES)){
             return cardfileData.getFederalAgenciesList();
-        } else if (tag.equals(CARDFILE.RANCHES_LIVESTOCK))
-        {
+        }
+        else if(tag.equals(CARDFILE.RANCHES_LIVESTOCK)){
             return cardfileData.getRanchesLivestockList();
-        } else if (tag.equals(CARDFILE.FIRE_EMS))
-        {
+        }
+        else if(tag.equals(CARDFILE.FIRE_EMS)){
             return cardfileData.getFireEmsList();
-        } else if (tag.equals(CARDFILE.JAILS))
-        {
+        }
+        else if(tag.equals(CARDFILE.JAILS)){
             return cardfileData.getJailsList();
-        } else if (tag.equals(CARDFILE.HOSPITALS_MED_CENTERS))
-        {
+        }
+        else if(tag.equals(CARDFILE.HOSPITALS_MED_CENTERS)){
             return cardfileData.getHospitalsMedCentersList();
-        } else if (tag.equals(CARDFILE.TOW_COMPANIES))
-        {
+        }
+        else if(tag.equals(CARDFILE.TOW_COMPANIES)){
             return cardfileData.getTowCompaniesList();
-        } else if (tag.equals(CARDFILE.CALTRANS))
-        {
+        }
+        else if(tag.equals(CARDFILE.CALTRANS)){
             return cardfileData.getCalTransList();
-        } else if (tag.equals(CARDFILE.COUNTY_ROADS))
-        {
+        }
+        else if(tag.equals(CARDFILE.COUNTY_ROADS)){
             return cardfileData.getCountyRoadsList();
-        } else if (tag.equals(CARDFILE.UTILITIES))
-        {
+        }
+        else if(tag.equals(CARDFILE.UTILITIES)){
             return cardfileData.getUtilitiesList();
-        } else if (tag.equals(CARDFILE.ANIMAL_CONTROL))
-        {
+        }
+        else if(tag.equals(CARDFILE.ANIMAL_CONTROL)){
             return cardfileData.getAnimalControlList();
-        } else if (tag.equals(CARDFILE.AIRPORTS))
-        {
+        }
+        else if(tag.equals(CARDFILE.AIRPORTS)){
             return cardfileData.getAirportsList();
-        } else if (tag.equals(CARDFILE.CREDIT_CARDS))
-        {
+        }
+        else if(tag.equals(CARDFILE.CREDIT_CARDS)){
             return cardfileData.getCreditCardsList();
-        } else if (tag.equals(CARDFILE.GG_CRISIS_SHELTERS))
-        {
+        }
+        else if(tag.equals(CARDFILE.GG_CRISIS_SHELTERS)){
             return cardfileData.getGgCrisisSheltersList();
-        } else if (tag.equals(CARDFILE.RANGES))
-        {
+        }
+        else if(tag.equals(CARDFILE.RANGES)){
             return cardfileData.getRangesList();
-        } else if (tag.equals(CARDFILE.HOTLINES))
-        {
+        }
+        else if(tag.equals(CARDFILE.HOTLINES)){
             return cardfileData.getHotlinesList();
-        } else if (tag.equals(CARDFILE.HWY_PATROLS_OOS))
-        {
+        }
+        else if(tag.equals(CARDFILE.HWY_PATROLS_OOS)){
             return cardfileData.getHwyPatrolsOosList();
-        } else if (tag.equals(CARDFILE.PARKS_RECREATION))
-        {
+        }
+        else if(tag.equals(CARDFILE.PARKS_RECREATION)){
             return cardfileData.getParksRecreationList();
-        } else if (tag.equals(CARDFILE.SHELTERS))
-        {
+        }
+        else if(tag.equals(CARDFILE.SHELTERS)){
             return cardfileData.getSheltersList();
-        } else if (tag.equals(CARDFILE.SL_COUNTY_SERVICES))
-        {
+        }
+        else if(tag.equals(CARDFILE.SL_COUNTY_SERVICES)){
             return cardfileData.getSlCountyServicesList();
-        } else if (tag.equals(CARDFILE.SL_RESOURCES))
-        {
+        }
+        else if(tag.equals(CARDFILE.SL_RESOURCES)){
             return cardfileData.getSlResourcesList();
-        } else if (tag.equals(CARDFILE.TRUCK_TIRE_REPAIR))
-        {
+        }
+        else if(tag.equals(CARDFILE.TRUCK_TIRE_REPAIR)){
             return cardfileData.getTruckTireRepairList();
-        } else if (tag.equals(CARDFILE.MCC_EMPLOYEES))
-        {
+        }
+        else if(tag.equals(CARDFILE.MCC_EMPLOYEES)){
             return cardfileData.getMccEmployeesList();
-        } else if (tag.equals(CARDFILE.GATE_ACCESS_CODES))
-        {
+        }
+        else if(tag.equals(CARDFILE.GATE_ACCESS_CODES)){
             return cardfileData.getGateAccessCodesList();
-        } else if (tag.equals(CARDFILE.VT_CALL_SIGNS))
-        {
+        }
+        else if(tag.equals(CARDFILE.VT_CALL_SIGNS)){
             return cardfileData.getVtCallSignsList();
-        } else if (tag.equals(CARDFILE.SLCC_EMPLOYEES))
-        {
+        }
+        else if(tag.equals(CARDFILE.SLCC_EMPLOYEES)){
             return cardfileData.getSlccEmployeesList();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCardfileList");
         }
     }
-
-    /**
-     * Receives the fields of the ChangeLog in Cardfile.java and uses those
-     * fields to make changes to its own copy of the Cardfiledata.
-     */
-    public void editCardfile(ChangeLog log) throws RemoteException
-    {
-
+    
+    /**
+     * Receives the fields of the ChangeLog in Cardfile.java and uses those fields
+     * to make changes to its own copy of the Cardfiledata.
+     */
+    public void editCardfile(ChangeLog log) throws RemoteException{
+        
         CardfileList selectedList;
-
-        if (log.listTitle.equals(CARDFILE.COASTAL_DIVISION_UNITS.tag))
-        {
+        
+        if(log.listTitle.equals(CARDFILE.COASTAL_DIVISION_UNITS.tag)){
             selectedList = cardfileData.getCoastalDivisionUnitList();
-        } else if (log.listTitle.equals(CARDFILE.POLICE_SHERIFF_CORONER.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.POLICE_SHERIFF_CORONER.tag)){
             selectedList = cardfileData.getPoliceSheriffCoronerList();
-        } else if (log.listTitle.equals(CARDFILE.COURTS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.COURTS.tag)){
             selectedList = cardfileData.getCourtsList();
-        } else if (log.listTitle.equals(CARDFILE.PUBLIC_TRANSPORTATION.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.PUBLIC_TRANSPORTATION.tag)){
             selectedList = cardfileData.getPublicTransportationList();
-        } else if (log.listTitle.equals(CARDFILE.GG_OTHER.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.GG_OTHER.tag)){
             selectedList = cardfileData.getGgOtherList();
-        } else if (log.listTitle.equals(CARDFILE.MY_MISC.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.MY_MISC.tag)){
             selectedList = cardfileData.getMyMiscList();
-        } else if (log.listTitle.equals(CARDFILE.SL_MISC.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.SL_MISC.tag)){
             selectedList = cardfileData.getSlMiscList();
-        } else if (log.listTitle.equals(CARDFILE.VT_MISC.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.VT_MISC.tag)){
             selectedList = cardfileData.getVlMiscList();
-        } else if (log.listTitle.equals(CARDFILE.CHP_OFFICES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.CHP_OFFICES.tag)){
             selectedList = cardfileData.getChpOfficesList();
-        } else if (log.listTitle.equals(CARDFILE.STATE_AGENCIES_FACILITIES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.STATE_AGENCIES_FACILITIES.tag)){
             selectedList = cardfileData.getStateAgenciesFacilitiesList();
-        } else if (log.listTitle.equals(CARDFILE.GOVERNMENT_OFFICIALS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.GOVERNMENT_OFFICIALS.tag)){
             selectedList = cardfileData.getGovernmentOfficialsList();
-        } else if (log.listTitle.equals(CARDFILE.FEDERAL_AGENCIES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.FEDERAL_AGENCIES.tag)){
             selectedList = cardfileData.getFederalAgenciesList();
-        } else if (log.listTitle.equals(CARDFILE.RANCHES_LIVESTOCK.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.RANCHES_LIVESTOCK.tag)){
             selectedList = cardfileData.getRanchesLivestockList();
-        } else if (log.listTitle.equals(CARDFILE.FIRE_EMS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.FIRE_EMS.tag)){
             selectedList = cardfileData.getFireEmsList();
-        } else if (log.listTitle.equals(CARDFILE.JAILS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.JAILS.tag)){
             selectedList = cardfileData.getJailsList();
-        } else if (log.listTitle.equals(CARDFILE.HOSPITALS_MED_CENTERS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.HOSPITALS_MED_CENTERS.tag)){
             selectedList = cardfileData.getHospitalsMedCentersList();
-        } else if (log.listTitle.equals(CARDFILE.TOW_COMPANIES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.TOW_COMPANIES.tag)){
             selectedList = cardfileData.getTowCompaniesList();
-        } else if (log.listTitle.equals(CARDFILE.CALTRANS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.CALTRANS.tag)){
             selectedList = cardfileData.getCalTransList();
-        } else if (log.listTitle.equals(CARDFILE.COUNTY_ROADS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.COUNTY_ROADS.tag)){
             selectedList = cardfileData.getCountyRoadsList();
-        } else if (log.listTitle.equals(CARDFILE.UTILITIES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.UTILITIES.tag)){
             selectedList = cardfileData.getUtilitiesList();
-        } else if (log.listTitle.equals(CARDFILE.ANIMAL_CONTROL.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.ANIMAL_CONTROL.tag)){
             selectedList = cardfileData.getAnimalControlList();
-        } else if (log.listTitle.equals(CARDFILE.AIRPORTS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.AIRPORTS.tag)){
             selectedList = cardfileData.getAirportsList();
-        } else if (log.listTitle.equals(CARDFILE.CREDIT_CARDS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.CREDIT_CARDS.tag)){
             selectedList = cardfileData.getCreditCardsList();
-        } else if (log.listTitle.equals(CARDFILE.GG_CRISIS_SHELTERS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.GG_CRISIS_SHELTERS.tag)){
             selectedList = cardfileData.getGgCrisisSheltersList();
-        } else if (log.listTitle.equals(CARDFILE.RANGES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.RANGES.tag)){
             selectedList = cardfileData.getRangesList();
-        } else if (log.listTitle.equals(CARDFILE.HOTLINES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.HOTLINES.tag)){
             selectedList = cardfileData.getHotlinesList();
-        } else if (log.listTitle.equals(CARDFILE.HWY_PATROLS_OOS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.HWY_PATROLS_OOS.tag)){
             selectedList = cardfileData.getHwyPatrolsOosList();
-        } else if (log.listTitle.equals(CARDFILE.PARKS_RECREATION.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.PARKS_RECREATION.tag)){
             selectedList = cardfileData.getParksRecreationList();
-        } else if (log.listTitle.equals(CARDFILE.SHELTERS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.SHELTERS.tag)){
             selectedList = cardfileData.getSheltersList();
-        } else if (log.listTitle.equals(CARDFILE.SL_COUNTY_SERVICES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.SL_COUNTY_SERVICES.tag)){
             selectedList = cardfileData.getSlCountyServicesList();
-        } else if (log.listTitle.equals(CARDFILE.SL_RESOURCES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.SL_RESOURCES.tag)){
             selectedList = cardfileData.getSlResourcesList();
-        } else if (log.listTitle.equals(CARDFILE.TRUCK_TIRE_REPAIR.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.TRUCK_TIRE_REPAIR.tag)){
             selectedList = cardfileData.getTruckTireRepairList();
-        } else if (log.listTitle.equals(CARDFILE.MCC_EMPLOYEES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.MCC_EMPLOYEES.tag)){
             selectedList = cardfileData.getMccEmployeesList();
-        } else if (log.listTitle.equals(CARDFILE.GATE_ACCESS_CODES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.GATE_ACCESS_CODES.tag)){
             selectedList = cardfileData.getGateAccessCodesList();
-        } else if (log.listTitle.equals(CARDFILE.VT_CALL_SIGNS.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.VT_CALL_SIGNS.tag)){
             selectedList = cardfileData.getVtCallSignsList();
-        } else if (log.listTitle.equals(CARDFILE.SLCC_EMPLOYEES.tag))
-        {
+        }
+        else if(log.listTitle.equals(CARDFILE.SLCC_EMPLOYEES.tag)){
             selectedList = cardfileData.getSlccEmployeesList();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.editCardfileDataObject");
         }
-
+        
         CardfileDataObject cfdo = cardfileData.getCardfileDataObject(selectedList, log.id);
-        if (cfdo != null && log.command.equals(EditCommand.NAME))
-        {
+        if(cfdo != null && log.command.equals(EditCommand.NAME)){
             cfdo.setName(log.newValue);
-            selectedList.resort(cardfileData.getCardfileDataIndex(selectedList, log.id));
-        } else if (cfdo != null && log.command.equals(EditCommand.ADDRESS))
-        {
+            selectedList.resort(cardfileData.getCardfileDataIndex(selectedList,log.id));
+        }
+        else if(cfdo != null && log.command.equals(EditCommand.ADDRESS)){
             cfdo.setAddress(log.newValue);
-        } else if (cfdo != null && log.command.equals(EditCommand.CITY))
-        {
+        }
+        else if(cfdo != null && log.command.equals(EditCommand.CITY)){
             cfdo.setCity(log.newValue);
-        } else if (cfdo != null && log.command.equals(EditCommand.STATE))
-        {
+        }
+        else if(cfdo != null && log.command.equals(EditCommand.STATE)){
             cfdo.setState(log.newValue);
-        } else if (cfdo != null && log.command.equals(EditCommand.ZIP))
-        {
+        }
+        else if(cfdo != null && log.command.equals(EditCommand.ZIP)){
             cfdo.setZip(log.newValue);
-        } else if (cfdo != null && log.command.equals(EditCommand.PHONE1))
-        {
+        }
+        else if(cfdo != null && log.command.equals(EditCommand.PHONE1)){
             cfdo.setPhone1(log.newValue);
-        } else if (cfdo != null && log.command.equals(EditCommand.PHONE2))
-        {
+        }
+        else if(cfdo != null && log.command.equals(EditCommand.PHONE2)){
             cfdo.setPhone2(log.newValue);
-        } else if (cfdo != null && log.command.equals(EditCommand.FAX))
-        {
+        }
+        else if(cfdo != null && log.command.equals(EditCommand.FAX)){
             cfdo.setFax(log.newValue);
-        } else if (log.command.equals(EditCommand.OBJECT_DELETE))
-        {
-            selectedList.removeDataObject(cardfileData.getCardfileDataIndex(selectedList, log.id));
-        } else if (log.command.equals(EditCommand.OBJECT_ADD))
-        {
+        }
+        else if(log.command.equals(EditCommand.OBJECT_DELETE)){
+            selectedList.removeDataObject(cardfileData.getCardfileDataIndex(selectedList,log.id));
+        }
+        else if(log.command.equals(EditCommand.OBJECT_ADD)){
             selectedList.addDataObject(log.newCardfileObject);
-        } else if (log.command.equals(EditCommand.TABLE_ADD))
-        {
-            if (cfdo != null)
-            {
-                cfdo.addComment(log.tableFields);
+        }
+        else if(log.command.equals(EditCommand.TABLE_ADD)){
+            if(cfdo != null){
+               cfdo.addComment(log.tableFields);
             }
-        } else if (log.command.equals(EditCommand.TABLE_DELETE))
-        {
-            if (cfdo != null)
-            {
+        }
+        else if(log.command.equals(EditCommand.TABLE_DELETE)){
+            if(cfdo != null){
                 cfdo.removeComment(log.timeStamp);
             }
-        } else
-        {
-        }
-
-
-    }
-
+        }
+        else{
+            
+        }
+        
+        
+    }
+    
     /**
      * Obtain a new unique ID for a cardfileDataObject.
      */
-    public int obtainNewUniqueId() throws RemoteException
-    {
+    public int obtainNewUniqueId() throws RemoteException{
         return cardfileData.obtainNewUniqueId();
     }
-
+    
     /**
      * Returns a value from Unit based on tag.
-     *
      * @param unitNum the unitNum to look up
-     * @throws RemoteException
-     */
-    public UnitStatusEnums getCadDataUnitStatus(String unitNum) throws RemoteException
-    {
+     * @throws RemoteException 
+     */
+    public UnitStatusEnums getCadDataUnitStatus(String unitNum) throws RemoteException{
         return cadData.getUnit(unitNum).getUnitStatus();
     }
-
+    
     /**
      * Returns a string field from Unit based on tag.
-     *
      * @param tag a CADScriptTags tag
      * @param unitNum the unitNum to look up
@@ -1863 +1687 @@
      * @throws RemoteException
      */
-    public String getCadDataUnitValue(String unitNum, UNIT_TAGS tag) throws RemoteException
-    {
-        if (tag.equals(UNIT_TAGS.MASTER_INC_NUM))
-        {
+    public String getCadDataUnitValue(String unitNum, UNIT_TAGS tag) throws RemoteException{
+        if(tag.equals(UNIT_TAGS.MASTER_INC_NUM)){
             return cadData.getUnit(unitNum).getMasterInc();
-        } else if (tag.equals(UNIT_TAGS.STATUS))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.STATUS)){
             return cadData.getUnit(unitNum).getStatus();
-        } else if (tag.equals(UNIT_TAGS.OOS))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.OOS)){
             return cadData.getUnit(unitNum).getOos();
-        } else if (tag.equals(UNIT_TAGS.TYPE))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.TYPE)){
             return cadData.getUnit(unitNum).getType();
-        } else if (tag.equals(UNIT_TAGS.CURR_LOC))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.CURR_LOC)){
             return cadData.getUnit(unitNum).getCurrentLocation();
-        } else if (tag.equals(UNIT_TAGS.DESTINATION))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.DESTINATION)){
             return cadData.getUnit(unitNum).getDestination();
-        } else if (tag.equals(UNIT_TAGS.MISC_INFO))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.MISC_INFO)){
             return cadData.getUnit(unitNum).getMisc();
-        } else if (tag.equals(UNIT_TAGS.STACK))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.STACK)){
             return cadData.getUnit(unitNum).getStack();
-        } else if (tag.equals(UNIT_TAGS.AREA))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.AREA)){
             return cadData.getUnit(unitNum).getArea();
-        } else if (tag.equals(UNIT_TAGS.OFFICER))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.OFFICER)){
             return cadData.getUnit(unitNum).getOfficer();
-        } else if (tag.equals(UNIT_TAGS.BADGE_NUM))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.BADGE_NUM)){
             return cadData.getUnit(unitNum).getBadge();
-        } else if (tag.equals(UNIT_TAGS.TIMER))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.TIMER)){
             return cadData.getUnit(unitNum).getTimerInString();
-        } else if (tag.equals(UNIT_TAGS.OFFICE))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.OFFICE)){
             return cadData.getUnit(unitNum).getOffice();
-        } else if (tag.equals(UNIT_TAGS.P))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.P)){
             return cadData.getUnit(unitNum).getP();
-        } else if (tag.equals(UNIT_TAGS.AGY))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.AGY)){
             return cadData.getUnit(unitNum).getAgy();
-        } else if (tag.equals(UNIT_TAGS.ALIAS))
-        {
+        }
+        else if(tag.equals(UNIT_TAGS.ALIAS)){
             return cadData.getUnit(unitNum).getAlias();
-        } else
-        {
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.getCadDataUnitValue");
         }
@@ -1921 +1743 @@
     /**
      * Sets a field from Unit based on tag.
-     *
      * @param tag a CADScriptTags tag
      * @param unitNum the unitNum to look up
@@ -1927 +1748 @@
      * @throws RemoteException
      */
-    public void setCadDataUnitValue(String unitNum, UNIT_TAGS tag, Object value) throws RemoteException
-    {
-        if (tag.equals(UNIT_TAGS.MASTER_INC_NUM))
-        {
-            cadData.getUnit(unitNum).setMasterInc((String) value);
-        } else if (tag.equals(UNIT_TAGS.STATUS))
-        {
-            cadData.getUnit(unitNum).setStatus((String) value);
-        } else if (tag.equals(UNIT_TAGS.OOS))
-        {
-            cadData.getUnit(unitNum).setOos((String) value);
-        } else if (tag.equals(UNIT_TAGS.TYPE))
-        {
-            cadData.getUnit(unitNum).setType((String) value);
-        } else if (tag.equals(UNIT_TAGS.CURR_LOC))
-        {
-            cadData.getUnit(unitNum).setCurrentLocation((String) value);
-        } else if (tag.equals(UNIT_TAGS.DESTINATION))
-        {
-            cadData.getUnit(unitNum).setDestination((String) value);
-        } else if (tag.equals(UNIT_TAGS.MISC_INFO))
-        {
-            cadData.getUnit(unitNum).setMisc((String) value);
-        } else if (tag.equals(UNIT_TAGS.STACK))
-        {
-            cadData.getUnit(unitNum).setStack((String) value);
-        } else if (tag.equals(UNIT_TAGS.AREA))
-        {
-            cadData.getUnit(unitNum).setArea((String) value);
-        } else if (tag.equals(UNIT_TAGS.OFFICER))
-        {
-            cadData.getUnit(unitNum).setOfficer((String) value);
-        } else if (tag.equals(UNIT_TAGS.BADGE_NUM))
-        {
-            cadData.getUnit(unitNum).setBadge((String) value);
-        } else if (tag.equals(UNIT_TAGS.UNIT_STATUS))
-        {
-            cadData.getUnit(unitNum).setUnitStatus((UnitStatusEnums) value);
-        } else if (tag.equals(UNIT_TAGS.OFFICE))
-        {
-            cadData.getUnit(unitNum).setOffice((String) value);
-        } else if (tag.equals(UNIT_TAGS.P))
-        {
-            cadData.getUnit(unitNum).setP((String) value);
-        } else if (tag.equals(UNIT_TAGS.AGY))
-        {
-            cadData.getUnit(unitNum).setAgy((String) value);
-        } else if (tag.equals(UNIT_TAGS.ALIAS))
-        {
-            cadData.getUnit(unitNum).setAlias((String) value);
-        } else
-        {
+    public void setCadDataUnitValue(String unitNum, UNIT_TAGS tag, Object value) throws RemoteException{
+        if(tag.equals(UNIT_TAGS.MASTER_INC_NUM)){
+            cadData.getUnit(unitNum).setMasterInc((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.STATUS)){
+            cadData.getUnit(unitNum).setStatus((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.OOS)){
+            cadData.getUnit(unitNum).setOos((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.TYPE)){
+            cadData.getUnit(unitNum).setType((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.CURR_LOC)){
+            cadData.getUnit(unitNum).setCurrentLocation((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.DESTINATION)){
+            cadData.getUnit(unitNum).setDestination((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.MISC_INFO)){
+            cadData.getUnit(unitNum).setMisc((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.STACK)){
+            cadData.getUnit(unitNum).setStack((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.AREA)){
+            cadData.getUnit(unitNum).setArea((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.OFFICER)){
+            cadData.getUnit(unitNum).setOfficer((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.BADGE_NUM)){
+            cadData.getUnit(unitNum).setBadge((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.UNIT_STATUS)){
+            cadData.getUnit(unitNum).setUnitStatus((UnitStatusEnums)value);
+        }
+        else if(tag.equals(UNIT_TAGS.OFFICE)){
+            cadData.getUnit(unitNum).setOffice((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.P)){
+            cadData.getUnit(unitNum).setP((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.AGY)){
+            cadData.getUnit(unitNum).setAgy((String)value);
+        }
+        else if(tag.equals(UNIT_TAGS.ALIAS)){
+            cadData.getUnit(unitNum).setAlias((String)value);
+        }
+        else{
             throw new RemoteException("Wrong Enum sent into Coordinator.setCadDataUnitValue");
         }
     }
-
+    
     /**
      * Assigns a unit to the specified incident.
-     *
      * @param unitNum the unitNum to look up
      * @param id the incident id that this unit is assigned to.
      * @throws RemoteException
      */
-    public void setCadDataUnitAssignedId(String unitNum, int id) throws RemoteException
-    {
+    public void setCadDataUnitAssignedId(String unitNum, int id) throws RemoteException{
         cadData.getUnit(unitNum).setAssignedIncidentId(id);
     }
-
+    
     /**
      * Adds a unit to the incident's list of assigned units.
-     *
      * @param incidentId the incident
      * @param assignedUnitNum the unit that's been assigned to the incident
      * @throws RemoteException
      */
-    public void addCadDataIncidentAssignedUnitNum(int incidentId, String assignedUnitNum) throws RemoteException
-    {
+    public void addCadDataIncidentAssignedUnitNum(int incidentId, String assignedUnitNum) throws RemoteException{
         cadData.getIncident(incidentId).addAssignedUnitNum(assignedUnitNum);
     }
-
+    
     /**
      * Sets the specified incident to the specified status.
-     *
      * @param incidentId the incident
      * @param status the status of the incident
      * @throws RemoteException
      */
-    public void setCadDataIncidentStatus(int incidentId, IncidentEnums status) throws RemoteException
-    {
+    public void setCadDataIncidentStatus(int incidentId, IncidentEnums status) throws RemoteException{
         cadData.getIncident(incidentId).setIncidentStatus(status);
     }
-
-    /**
+    
+    /** 
      * Returns a LinkedList containing entries that match the search string.
-     *
      * @param search the string entry to be searched
      * @return linked list of CardfileDataObjects matching search
      */
-    public LinkedList<CardfileDataObject> getSearchList(String search) throws RemoteException
-    {
+    public LinkedList<CardfileDataObject> getSearchList(String search) throws RemoteException{
         return cardfileData.getSearchList(search);
     }
-
-    /**
-     * Updates the server database so clients can view additional informations
-     * as events complete
-     *
+    
+    /** 
+     * Updates the server database so clients can view additional informations as events complete
      * @param incidentNumber the incident in which the event occurred
-     * @return completedEvent IncidentEvent with information to be added to
-     * server database
-     */
-    public void updateIncidentInGUI(Integer incidentNumber, IncidentEvent completedEvent)
-    {
+     * @return completedEvent IncidentEvent with information to be added to server database
+     */
+    public void updateIncidentInGUI(Integer incidentNumber, IncidentEvent completedEvent) {
         updateDetailsInGUI(incidentNumber, completedEvent);
         updateUnitsInGUI(incidentNumber, completedEvent);
     }
-
-    /**
-     * Updates the server database so clients can view details as events
-     * complete
-     *
+    
+    /** 
+     * Updates the server database so clients can view details as events complete
      * @param incidentNumber the incident in which the event occurred
-     * @return completedEvent IncidentEvent with details to be added to server
-     * database
-     */
-    public void updateDetailsInGUI(Integer incidentNumber, IncidentEvent completedEvent)
-    {
+     * @return completedEvent IncidentEvent with details to be added to server database
+     */
+    public void updateDetailsInGUI(Integer incidentNumber, IncidentEvent completedEvent) {
         DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
         DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
-        for (int i = 0; i < completedEvent.eventInfo.getDetails().size(); i++)
-        {
-            String[] fields =
-            {
-                dateFormat.format(new Date()),
-                timeFormat.format(new Date()),
-                "", "", completedEvent.eventInfo.getDetails().elementAt(i).details
-            };
-
-            try
-            {
+        for(int i = 0; i < completedEvent.eventInfo.getDetails().size(); i++){
+            String[] fields = {dateFormat.format(new Date()),
+                       timeFormat.format(new Date()),
+                       "","",completedEvent.eventInfo.getDetails().elementAt(i).details};
+    
+            try{
                 addCadDataIncidentTable(INC_TABLE.COMMENTS_NOTES, incidentNumber, fields);
-            } catch (RemoteException e)
-            {
+            }catch(RemoteException e){
                 e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * Updates the server database so clients can view unit updates as events
-     * complete
-     *
+            }   
+        }
+    }
+    
+    /** 
+     * Updates the server database so clients can view unit updates as events complete
      * @param incidentNumber the incident in which the event occurred
-     * @return completedEvent IncidentEvent with unit updates to be added to
-     * server database
-     */
-    public void updateUnitsInGUI(Integer incidentNumber, IncidentEvent completedEvent)
-    {
-        for (int i = 0; i < completedEvent.eventInfo.getUnits().size(); i++)
-        {
+     * @return completedEvent IncidentEvent with unit updates to be added to server database
+     */
+    public void updateUnitsInGUI(Integer incidentNumber, IncidentEvent completedEvent) {
+        for(int i = 0; i < completedEvent.eventInfo.getUnits().size(); i++){
             IncidentInquiryUnitsAssigned unit = completedEvent.eventInfo.getUnits().get(i);
-            if (unit.statusType.equals("ENRT"))
-            {
+            if(unit.statusType.equals("ENRT")){
                 cadData.unitAssignedToIncident(unit.beat, incidentNumber, unit.isPrimary);
-            } else if (unit.statusType.equals("1097"))
-            {
+            }else if(unit.statusType.equals("1097")){
                 cadData.unitArrivedAtIncidentScene(unit.beat, incidentNumber, unit.isPrimary);
-            } else if (unit.statusType.equals("1098"))
-            {
+            }else if(unit.statusType.equals("1098")){
                 cadData.unitAvailable(unit.beat);
             }
         }
     }
-
+    
     /**
      * Sets the specified incidentNumber to viewable in the GUI.
-     *
      * @param incidentNumber the number of the Incident started
      */
-    public void incidentStartedInGUI(Integer incidentNumber)
-    {
+    public void incidentStartedInGUI(Integer incidentNumber){
         Date date = new Date();
         DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");

/trunk/src/tmcsim/cadsimulator/viewer/CADSimulatorViewer.java

@@ -3 +3 @@
 import java.awt.AWTEvent;
 import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
+
 import javax.swing.JFrame;
 import javax.swing.JMenu;
@@ -12 +11 @@
 import javax.swing.JOptionPane;
 import javax.swing.JTabbedPane;
-import javax.swing.KeyStroke;
+
 import tmcsim.cadsimulator.videocontrol.DVDStatusUpdate;
 import tmcsim.cadsimulator.videocontrol.DVDTitleUpdate;
@@ -21 +20 @@
 
 /**
- * This class provides a GUI to view current status information for the CAD
- * Simulator.
+ * This class provides a GUI to view current status information for the
+ * CAD Simulator.
  *
  * @see SimulationStatusPanel
  * @see MediaStatusPanel
- * @author Matthew Cechini
+ * @author Matthew Cechini 
  * @version $Revision: 1.3 $ $Date: 2006/06/06 20:46:41 $
  */
 @SuppressWarnings("serial")
-public class CADSimulatorViewer extends JFrame
-{
+public class CADSimulatorViewer extends JFrame {
 
-    /**
-     * Panel to display simulation information.
-     */
+    /** Panel to display simulation information. */
     private SimulationStatusPanel simulationPanel;
-    /**
-     * Panel to display media control information.
-     */
+    
+    /** Panel to display media control information. */
     private MediaStatusPanel mediaPanel;
-
-    /**
-     * Constructor.
-     */
-    public CADSimulatorViewer()
-    {
+    
+    /** Constructor. */
+    public CADSimulatorViewer() {
         super("CAD Simulator");
-
+        
         initComponents();
-    }
-
-    /**
+    }    
+    
+    /** 
      * @see SimulationStatusPanel
      */
-    public void connectClient()
-    {
+    public void connectClient() {
         simulationPanel.connectClient();
     }
-
-    /**
+    
+    /** 
      * @see SimulationStatusPanel
      */
-    public void disconnectClient()
-    {
+    public void disconnectClient() {
         simulationPanel.disconnectClient();
     }
-
-    /**
+    
+    /** 
      * @see SimulationStatusPanel
      */
-    public void setSimManagerStatus(boolean connection)
-    {
-        simulationPanel.setSimManagerStatus(connection);
+    public void setSimManagerStatus(boolean connection) {
+        simulationPanel.setSimManagerStatus(connection);        
     }
-
-    /**
+    
+    /** 
      * @see SimulationStatusPanel
      */
-    public void setTime(long seconds)
-    {
+    public void setTime(long seconds) {
         simulationPanel.setTime(seconds);
     }
 
-    /**
+    /** 
      * @see SimulationStatusPanel
      */
-    public void setScriptStatus(SCRIPT_STATUS newStatus)
-    {
-        simulationPanel.setScriptStatus(newStatus);
+    public void setScriptStatus(SCRIPT_STATUS newStatus) {
+        simulationPanel.setScriptStatus(newStatus);         
+    }
+    
+    /** 
+     * @see SimulationStatusPanel
+     */
+    public void setParamicsStatus(PARAMICS_STATUS newStatus) {
+        simulationPanel.setParamicsStatus(newStatus);       
+    }
+    
+    /** 
+     * @see SimulationStatusPanel
+     */
+    public void setParamicsNetworkLoaded(String networkID) {
+        simulationPanel.setParamicsNetworkLoaded(networkID);        
     }
 
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void setParamicsStatus(PARAMICS_STATUS newStatus)
-    {
-        simulationPanel.setParamicsStatus(newStatus);
-    }
-
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void setParamicsNetworkLoaded(String networkID)
-    {
-        simulationPanel.setParamicsNetworkLoaded(networkID);
-    }
-
-    /**
+    /** 
      * @see MediaStatusPanel
      */
-    public void updateDVDStatus(DVDStatusUpdate update)
-    {
+    public void updateDVDStatus(DVDStatusUpdate update) {
         mediaPanel.updateDVDStatus(update);
     }
 
-    /**
+    /** 
      * @see MediaStatusPanel
      */
-    public void updateDVDTitle(DVDTitleUpdate update)
-    {
+    public void updateDVDTitle(DVDTitleUpdate update) {
         mediaPanel.updateDVDTitle(update);
     }
-
+    
     /**
-     * Method calls the processEvent() method with a WINDOW_CLOSING WindowEvent
-     * to start the application closing process.
+     * Method calls the processEvent() method with a WINDOW_CLOSING
+     * WindowEvent to start the application closing process.
      */
-    public void closeViewer()
-    {
+    public void closeViewer() {
         processEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
     }
 
     /**
-     * Overloads the processEvent method. If the AWTEvent is a WINDOW_CLOSING
-     * event, prompt the user to confirm the action. If confirmed, close the
-     * application.
+     * Overloads the processEvent method.  If the AWTEvent is a 
+     * WINDOW_CLOSING event, prompt the user to confirm the action.
+     * If confirmed, close the application.
      */
-    protected void processEvent(AWTEvent evt)
-    {
-
-        if (evt.getID() == WindowEvent.WINDOW_CLOSING)
-        {
+    protected void processEvent(AWTEvent evt) {
+        
+        if(evt.getID() == WindowEvent.WINDOW_CLOSING) {
             int option = JOptionPane.showConfirmDialog(null,
-                    "Closing the CAD Simulator will stop the current "
-                    + "simulation.  Do you wish to continue exiting?",
+                    "Closing the CAD Simulator will stop the current " +
+                    "simulation.  Do you wish to continue exiting?",
                     "Confirm Exit",
                     JOptionPane.YES_NO_OPTION);
+            
+            if(option != JOptionPane.NO_OPTION) {
+                System.exit(0);
+            }       
+        }
+     }
+    
+    /** Initialize GUI Components */
+    private void initComponents() {
 
-            if (option != JOptionPane.NO_OPTION)
-            {
-                System.exit(0);
-            }
-        }
-    }
-
-    /**
-     * Initialize GUI Components
-     */
-    private void initComponents()
-    {
-
-
+        
         simulationPanel = new SimulationStatusPanel();
-        mediaPanel = new MediaStatusPanel();
-
+        mediaPanel      = new MediaStatusPanel();
+        
         cadSimTabbedPane = new JTabbedPane();
         cadSimTabbedPane.addTab("Status", simulationPanel);
         cadSimTabbedPane.addTab("Media", mediaPanel);
-
-        add(cadSimTabbedPane);
+        
+        add(cadSimTabbedPane);      
 
         menubar = new JMenuBar();
-
+        
         fileMenu = new JMenu("File");
-        fileMenu.setMnemonic(KeyEvent.VK_F);
         menubar.add(fileMenu);
-
+        
         exitMenuItem = new JMenuItem(new ExitAction(this));
-        exitMenuItem.setAccelerator(KeyStroke.getKeyStroke(
-                KeyEvent.VK_X, ActionEvent.ALT_MASK));
         fileMenu.add(exitMenuItem);
-
+        
         javax.swing.JMenu helpMenu = new javax.swing.JMenu("Help");
         javax.swing.JMenuItem aboutItem = new javax.swing.JMenuItem("About");
@@ -196 +169 @@
         helpMenu.add(aboutItem);
         menubar.add(helpMenu);
-
+        
         setJMenuBar(menubar);
-
-        setPreferredSize(new Dimension(500, 575));
+        
+        setPreferredSize(new Dimension(500, 575));  
         pack();
         setResizable(false);
     }
+    
+    
     private JTabbedPane cadSimTabbedPane;
+    
     private JMenuBar menubar;
+    
     private JMenu fileMenu;
+    
     private JMenuItem exitMenuItem;
+    
 }

/trunk/src/tmcsim/cadsimulator/viewer/actions/ExitAction.java

@@ -2 +2 @@
 
 import java.awt.event.ActionEvent;
+
 import javax.swing.AbstractAction;
+
 import tmcsim.cadsimulator.viewer.CADSimulatorViewer;
 
 /**
- * Abstract action to exit the CADSimulator. When the action is performed the
- * CADSimulatorView.closeViewer() method is called.
- *
+ * Abstract action to exit the CADSimulator. When the action is performed
+ * the CADSimulatorView.closeViewer() method is called.
+ *  
  * @author Matthew Cechini
- * @version
+ * @version 
  */
 @SuppressWarnings("serial")
-public class ExitAction extends AbstractAction
-{
+public class ExitAction extends AbstractAction {
 
-    /**
-     * Reference to the CADSimulatorViewer.
-     */
+    /** Reference to the CADSimulatorViewer. */
     private CADSimulatorViewer theViewer;
 
-    public ExitAction(CADSimulatorViewer viewer)
-    {
+    public ExitAction(CADSimulatorViewer viewer) {
         super("Exit");
-
+        
         theViewer = viewer;
     }
+    
+    public void actionPerformed(ActionEvent arg0) {     
+        theViewer.closeViewer();
+    }
 
-    public void actionPerformed(ActionEvent arg0)
-    {
-        //theViewer.closeViewer();
-        /* closeViewer() will prompt the user for confirmation.
-         * 26 Apr 2016 I'm tired of seeing the confirmation message,
-         * so if the user chooses File>Exit, assume they intend to exit
-         * and don't ask for confirmation.  If they click window close
-         * button, they will still get the confirmation prompt. jdalbey
-         */
-        System.exit(0);
-    }
 }

/trunk/src/tmcsim/paramicscommunicator/ParamicsFileWriter.java

@@ -1 +1 @@
 package tmcsim.paramicscommunicator;
+
 
 import java.io.File;
@@ -10 +11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
 import org.w3c.dom.Element;
+
 import tmcsim.paramicscommunicator.FileIOUpdate.IO_TYPE;
 
 /**
- * The ParamicsFileWriter handles writing messages to a target file which is
- * read by Paramics. Messages are received through the writeMessage() method.
+ * The ParamicsFileWriter handles writing messages to a target file which
+ * is read by Paramics.  Messages are received through the writeMessage() method.
  * This object handles queueing messages and writing as the file becomes
- * available. New data is written to the target file when it has been modified
- * (cleared) by Paramics. If this does not happen, messages are queued and a
- * timer is used to periodically determine if the file has become available for
- * writing.
- *
+ * available.  New data is written to the target file when it has been
+ * modified (cleared) by Paramics.  If this does not happen, messages
+ * are queued and a timer is used to periodically determine if the
+ * file has become available for writing.
+ * 
  * @author Matthew Cechini
  * @version
  */
-public class ParamicsFileWriter extends Observable
-{
-
-    /**
-     * Duration (in ms) that the TimerTask will be scheduled to retry writing to
-     * the target file. Default = 2000ms
+public class ParamicsFileWriter extends Observable {
+    
+    /** 
+     * Duration (in  ms) that the TimerTask will be scheduled to
+     * retry writing to the target file. Default = 2000ms
      */
     private static long TIMER_DURATION = 2000;
-    /**
-     * Error Logger.
-     */
+    
+    /** Error Logger. */
     private Logger paramLogger = Logger.getLogger("tmcsim.paramicscommunicator");
-    /**
-     * Linked List of messages that have been received
-     */
+    
+    /** Linked List of messages that have been received */
     private LinkedList<Element> queuedMessages = null;
-    /**
-     *
-     */
+    
+    /**  */
     private String writerID = null;
-    /**
-     * File name of the file where data is written
-     */
+
+    /** File name of the file where data is written */
     private String outputFile = null;
-    /**
-     * FileWriter used to write data to the output file.
-     */
+    
+    /** FileWriter used to write data to the output file. */
     private FileWriter fileWriter = null;
-    /**
-     * Value (seconds since 1/1/1970) of output file's last modifcation time
-     */
-    private long lastModified = 0;
-    /**
-     * Timer used to schedule file writing tasks.
-     */
+    
+    /** Value (seconds since 1/1/1970) of output file's last modifcation time */
+    private long lastModified = 0;  
+    
+    /** Timer used to schedule file writing tasks. */
     private Timer writerTimer = null;
-    /**
-     * Synchronizing lock to protect File IO and message queuing.
-     */
-    private Object lock = null;
-
+    
     /**
      * A TimerTask to retry writing messages that have been queued within this
-     * ParamicsWriter. If a message has been queued, see if the target file has
-     * been modified since last write. If so, write the first queued message to
-     * the file and remove the message from the queue. If writing is
-     * unsuccessful, do not remove the message from the queue. If there are no
-     * more messages in the queue, cancel this timer.
-     */
-    private class WriterTimerTask extends TimerTask
-    {
-
-        public void run()
-        {
-
-            synchronized (lock)
-            {
-                paramLogger.log(Level.INFO, "ParamicsFileWriter, WriterTimerTask "
-                        + "run() started, current queue size = " + queuedMessages.size());
-
+     * ParamicsWriter.  If a message has been queued, see if the target file
+     * has been modified since last write.  If so, write the first queued message
+     * to the file and remove the message from the queue.  If writing is unsuccessful,
+     * do not remove the message from the queue.  If there are no more messages in 
+     * the queue, cancel this timer.
+     */
+    private class WriterTimerTask extends TimerTask {
+        public void run() {
+
+            synchronized(lock) {
+            
                 //if we've queued something, continue.
-                if (queuedMessages.size() > 0)
-                {
-
+                if(queuedMessages.size() > 0) {         
+                    
                     //if file has been modified, write to it
-                    if (lastModified < new File(outputFile).lastModified())
-                    {
-                        try
-                        {
+                    if(lastModified < new File(outputFile).lastModified())
+                    {       
+                        try {
                             writeToFile(queuedMessages.getFirst());
                             queuedMessages.remove(0);
-                        } catch (IOException ioe)
-                        {
-                            paramLogger.logp(Level.SEVERE, "ParamicsFileWriter.WriterTimerTask",
-                                    "run()", "Exception in writing to the target file: "
-                                    + outputFile + ".  Queue size = " + queuedMessages.size(), ioe);
                         }
-
+                        catch (IOException ioe) {
+                            paramLogger.logp(Level.SEVERE, "ParamicsFileWriter.WriterTimerTask", 
+                                    "run()", "Exception in writing to the target file: " + 
+                                    outputFile + ".  Queue size = " + queuedMessages.size(), ioe);
+                        }
+                        
                         //all queued messages gone, cancel timer
-                        if (queuedMessages.size() == 0)
-                        {
+                        if(queuedMessages.size() == 0)
                             this.cancel();
-                        }
-                    }
+                    }   
                 }
-            }
+            }               
         }
     }
-
-    /**
-     * Constructor. Initialize data objects. If the target file exists, delete
-     * it, and then create a new file.
+    
+    /** Synchronizing lock to protect File IO and message queuing. */
+    private Object lock = null;     
+    
+    /**
+     * Constructor.  Initialize data objects.  If the target file exists, delete 
+     * it, and then create a new file.  
      *
      * @param workingDir Directory path where the output file is to be written
      * @param mess The ParamicsCommMessage containing the outputFile filename.
      */
-    public ParamicsFileWriter(String id, String workingDir, String targetFile)
-    {
-
-        try
-        {
+    public ParamicsFileWriter(String id, String workingDir, String targetFile) {
+
+        try {
             writerID = id;
-
-            queuedMessages = new LinkedList<Element>();
-            lock = new Object();
-
-            outputFile = workingDir + targetFile;
-
-            File tempFile = new File(outputFile);
-            if (tempFile.exists())
-            {
+    
+            queuedMessages  = new LinkedList<Element>();    
+            lock            = new Object();
+                        
+            outputFile      = workingDir + targetFile;  
+            
+            File tempFile = new File(outputFile);           
+            if(tempFile.exists()) {
                 tempFile.delete();
             }
 
-            tempFile.createNewFile();
-
-            writerTimer = new Timer();
-
-        } catch (IOException ioe)
-        {
-            paramLogger.logp(Level.SEVERE, "ParamicsFileWriter", "Constructor",
+            tempFile.createNewFile();           
+                                                
+            writerTimer     = new Timer();
+            
+        } catch (IOException ioe) {
+            paramLogger.logp(Level.SEVERE, "ParamicsFileWriter", "Constructor", 
                     "Unable to create Paramics File Writer.", ioe);
         }
-
+        
     }
-
+    
+    
     /**
      * Method is called when a message has been received from the CAD Simulator.
-     * If the message queue is not empty, add the new message to the queue. If
-     * the output file has not been modified (read) since last write, add the
-     * message to the queue and set a timer to repeatedly check for modification
-     * to the output file. Else, write the new message to the file. If there is
-     * an error in writing the data, queue the message start a timer to retry
-     * the writing.
+     * If the message queue is not empty, add the new message to the queue.
+     * If the output file has not been modified (read) since last write,
+     * add the message to the queue and set a timer to repeatedly check for 
+     * modification to the output file.  Else, write the new message to the file.  
+     * If there is an error in writing the data, queue the message start a timer
+     * to retry the writing.
      *
-     * @param newMessage The received message which is to be written to the
-     * output file.
-     */
-    public void writeMessage(Element messageElem)
-    {
-
-        synchronized (lock)
-        {
-            paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                    + "current queue size = " + queuedMessages.size());
-
-            //messages already queued... get in line.
-            if (queuedMessages.size() > 0)
-            {
+     * @param newMessage The received message which is to be written to 
+     * the output file.
+     */
+    public void writeMessage(Element messageElem) {
+        
+        synchronized(lock) {
+            
+            //messages already queued... get in line.           
+            if(queuedMessages.size() > 0) {
                 queuedMessages.add(messageElem);
 
-                paramLogger.log(Level.INFO, "Queueing message, new queue "
-                        + "size = " + queuedMessages.size());
-            } //No modification since last write. (first queue)
-            else if (lastModified >= new File(outputFile).lastModified())
-            {
-                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                        + "adding msg to queue.");
-                queuedMessages.add(messageElem);
-
-                writerTimer.scheduleAtFixedRate(new WriterTimerTask(),
+                paramLogger.log(Level.INFO, "Queueing message, new queue " +
+                        "size = " + queuedMessages.size());
+            }               
+            //No modification since last write. (first queue)               
+            else if (lastModified >= new File(outputFile).lastModified()) {
+                queuedMessages.add(messageElem);                
+                                
+                writerTimer.scheduleAtFixedRate(new WriterTimerTask(), 
                         0L, TIMER_DURATION);
 
                 paramLogger.log(Level.INFO, "First message queued");
-            } //free and clear, write.
-            else
-            {
-                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                        + "try to writeToFile" + outputFile);
-                try
-                {
+            }           
+            //free and clear, write.
+            else {
+                try {
                     writeToFile(messageElem);
-                } catch (IOException ioe)
-                {
-                    paramLogger.logp(Level.SEVERE, "ParamicsFileWriter",
-                            "writeMessage()", "Exception in writing to the "
-                            + "target file: " + outputFile, ioe);
-
+                }
+                catch(IOException ioe) {
+                    paramLogger.logp(Level.SEVERE, "ParamicsFileWriter", 
+                            "writeMessage()", "Exception in writing to the " +
+                            "target file: " + outputFile, ioe);
+                    
                     queuedMessages.add(messageElem);
-
-                    writerTimer.scheduleAtFixedRate(new WriterTimerTask(),
+                    
+                    writerTimer.scheduleAtFixedRate(new WriterTimerTask(), 
                             0L, TIMER_DURATION);
                 }
-                paramLogger.log(Level.INFO, "ParamicsFileWriter, writeMessage "
-                        + "writeToFile succeeded.");
             }
         }
     }
-
+        
     /**
      * Method writes data to the output file.
-     *
+     * 
      * @param output Data to be written to the file.
      */
-    private void writeToFile(Element output) throws IOException
-    {
-
+    private void writeToFile(Element output) throws IOException {       
+        
         fileWriter = new FileWriter(outputFile);
-
-        OutputFormat of = new OutputFormat("XML", "ISO-8859-1", true);
+        
+        OutputFormat of = new OutputFormat("XML","ISO-8859-1",true);
         of.setIndent(1);
         of.setIndenting(true);
-
+        
         XMLSerializer serializer = new XMLSerializer(fileWriter, of);
         serializer.asDOMSerializer();
         serializer.serialize(output);
 
-        /**
-         * Added by Nathaniel Lehrer
-         */
-        try
-        {
+        /** Added by Nathaniel Lehrer */
+        try {
             java.io.ByteArrayOutputStream outputStream = new java.io.ByteArrayOutputStream();
             new XMLSerializer(outputStream, of).serialize(output);
             tmcsim.paramicslog.ParamicsLog.getInstance().writeToLog(outputStream.toString());
-        } catch (Exception e)
-        {
+        } catch(Exception e) {
             System.out.println(e);
         }
-        /**
-         * End Add by Nathaniel Lehrer
-         */
+        /** End Add by Nathaniel Lehrer */
+        
         fileWriter.flush();
         fileWriter.close();
-
-        lastModified = new File(outputFile).lastModified();
-
+        
+        lastModified = new File(outputFile).lastModified();     
+        
         setChanged();
         notifyObservers(new FileIOUpdate(IO_TYPE.WRITE, writerID, new File(outputFile).length()));
-
-    }
+                            
+    }               
 }

/trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java

@@ -74 +74 @@
 
         SOCKET_PORT("SocketPort"),
-        WORKING_DIR("WorkingDirectory"),
-        GUI_VISIBLE("GUIvisible");
+        WORKING_DIR("WorkingDirectory");
         public String name;
 
@@ -140 +139 @@
         readers = new TreeMap<String, ParamicsFileReader>();
 
+        theGUI = new ParamicsCommunicatorGUI();
+        addObserver(theGUI);
+        theGUI.addWindowListener(new WindowListener()
+        {
+            public void windowActivated(WindowEvent arg0)
+            {
+            }
+
+            ;
+            public void windowClosed(WindowEvent arg0)
+            {
+            }
+
+            ;
+            public void windowClosing(WindowEvent arg0)
+            {
+                System.exit(0);
+            }
+
+            public void windowDeactivated(WindowEvent arg0)
+            {
+            }
+
+            ;
+            public void windowDeiconified(WindowEvent arg0)
+            {
+            }
+
+            ;
+            public void windowIconified(WindowEvent arg0)
+            {
+            }
+
+            ;
+            public void windowOpened(WindowEvent arg0)
+            {
+            }
+        ;
+        });
+
         try
         {
@@ -208 +247 @@
         }
 
-        // Should we display the GUI?
-        String visibleProp = paramicsCommProp.getProperty(PROPERTIES.GUI_VISIBLE.name);
-        // If no property was given, or if it was given and says True
-        if (visibleProp == null || (visibleProp.toLowerCase().equals("true")))
-        {
-            theGUI = new ParamicsCommunicatorGUI(); // it sets itself visible
-            addObserver(theGUI);
-            theGUI.setDefaultCloseOperation(javax.swing.JFrame.EXIT_ON_CLOSE);
-        }
 
         try
@@ -329 +359 @@
 
     /**
-     * Perform the action represented in XML document message received from the
-     * CAD Simulator. First determine if the action is from a READER, WRITER,
-     * and RESET. If the paramics action is REGISTER, add a new
-     * ParamicsFileReader/Writer to the local list of readers/writers and update
-     * the GUI with a FileRegUpdate object. If the paramics action is
-     * UNREGISTER, remove the ParamicsFileReader/Writer from the local list of
-     * readers/writers and update the GUI with a FileRegUpdate object. If RESET
-     * is received, clear all readers and writers.
+     * Perform the action represented in the received XML document message.
+     * First determine if the action is from a READER, WRITER, and RESET. If the
+     * paramics action is REGISTER, add a new ParamicsFileReader/Writer to the
+     * local list of readers/writers and update the GUI with a FileRegUpdate
+     * object. If the paramics action is UNREGISTER, remove the
+     * ParamicsFileReader/Writer from the local list of readers/writers and
+     * update the GUI with a FileRegUpdate object. If RESET is received, clear
+     * all readers and writers.
      *
      * @param mess Received XML document message.
@@ -452 +482 @@
             } catch (SocketTimeoutException ste)
             {
-                System.out.println("...waiting for socket connection from the CAD Simulator...");
+                System.out.println("...waiting...");
             } catch (IOException ioe)
             {

/trunk/src/tmcsim/paramicscommunicator/ParamicsFileReader.java

@@ -80 +80 @@
         public void run()
         {
-            paramLogger.logp(Level.INFO,
-                    "ParamicsFileReader.ReaderTimerTask", "run()",
-                    "Waiting for " + inputFile + " to be modified.");
+
             if (lastModified < inputFile.lastModified())
             {
-                paramLogger.logp(Level.INFO,
-                        "ParamicsFileReader.ReaderTimerTask", "run()",
-                        "Cool, " + inputFile + " has been modified, let's read it.");
 
                 try
@@ -101 +96 @@
                     Element messageElem = readerDoc.createElement(PARAMICS_COMM_TAGS.MESSAGE.tag);
                     String fileContents = readFromFile();
-                    paramLogger.logp(Level.INFO,
-                            "ParamicsFileReader.ReaderTimerTask", "run()",
-                            "Nice, we read " + fileContents);
                     messageElem.appendChild(readerDoc.createTextNode(fileContents));
                     readerElem.appendChild(messageElem);

/trunk/src/tmcsim/paramicscommunicator/gui/ParamicsCommunicatorGUI.java

@@ -11 +11 @@
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -21 +20 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
-
 import tmcsim.common.RevisionNumber;
 import tmcsim.paramicscommunicator.FileIOUpdate;
@@ -209 +207 @@
         this.setJMenuBar(menuBar);
 
-        fileReaderTabs = new JTabbedPane();
-        fileReaderTabs.setAlignmentX(Box.CENTER_ALIGNMENT);
-        fileReaderTabs.setMinimumSize(new Dimension(420, 480));
-        fileReaderTabs.setPreferredSize(new Dimension(420, 480));
-        fileReaderTabs.setMaximumSize(new Dimension(420, 480));
-        fileReaderTabs.setBorder(BorderFactory.createCompoundBorder(
+        fileIOTabs = new JTabbedPane();
+        fileIOTabs.setAlignmentX(Box.CENTER_ALIGNMENT);
+        fileIOTabs.setMinimumSize(new Dimension(420, 480));
+        fileIOTabs.setPreferredSize(new Dimension(420, 480));
+        fileIOTabs.setMaximumSize(new Dimension(420, 480));
+        fileIOTabs.setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createTitledBorder(
-                BorderFactory.createRaisedBevelBorder(), "Registered Readers "),
-                BorderFactory.createEmptyBorder(5, 5, 5, 5)));
-        
-        fileWriterTabs = new JTabbedPane();
-        fileWriterTabs.setAlignmentX(Box.CENTER_ALIGNMENT);
-        fileWriterTabs.setMinimumSize(new Dimension(420, 480));
-        fileWriterTabs.setPreferredSize(new Dimension(420, 480));
-        fileWriterTabs.setMaximumSize(new Dimension(420, 480));
-        fileWriterTabs.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createTitledBorder(
-                BorderFactory.createRaisedBevelBorder(), "Registered Writers "),
+                BorderFactory.createRaisedBevelBorder(), "Registered I/O"),
                 BorderFactory.createEmptyBorder(5, 5, 5, 5)));
 
@@ -240 +228 @@
                 BorderFactory.createEmptyBorder(5, 5, 5, 5)));
 
-        Box tabbedBox = new Box(BoxLayout.X_AXIS);
-        tabbedBox.add(fileReaderTabs);
-        tabbedBox.add(fileWriterTabs);
-        
+
         Box guiBox = new Box(BoxLayout.Y_AXIS);
-        guiBox.add(tabbedBox);
+        guiBox.add(fileIOTabs);
         guiBox.add(Box.createVerticalStrut(10));
         guiBox.add(errorPane);
@@ -252 +237 @@
 
         setMinimumSize(new Dimension(420, 680));
-        setPreferredSize(new Dimension(840, 680));
+        setPreferredSize(new Dimension(420, 680));
         setResizable(false);
         pack();
@@ -275 +260 @@
             case READ:
                 tabName = "Reader " + update.ioID;
-                fileReaderTabs.add(tabName, new ParamicsIOInfoPanel(update, model));
                 break;
             case WRITE:
                 tabName = "Writer " + update.ioID;
-                fileWriterTabs.add(tabName, new ParamicsIOInfoPanel(update, model));
                 break;
         }
 
-    }
-    
-    private JTabbedPane fileReaderTabs;
-    private JTabbedPane fileWriterTabs;
+        fileIOTabs.add(tabName, new ParamicsIOInfoPanel(update, model));
+    }
+    private JTabbedPane fileIOTabs;
     private JScrollPane errorPane;
     private JTextArea errorTA;

/trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java

@@ -34 +34 @@
             + "ATMSProperties         = empty.txt\n"
             + "MediaProperties        = empty.txt\n";
-    static final String configpData = "ParamicsCommHost = 192.168.251.45\n"
+    static final String paramicsData = "ParamicsCommHost       = 192.168.251.45\n"
             + "ParamicsCommPort       = 4450\n"
             + "IncidentUpdateInterval = 30\n"
@@ -42 +42 @@
             + "CameraStatusInterval   = 30\n"
             + "CameraStatusFile       = camera_status.xml\n";
-    static final String paramConfig    = "SocketPort=4450\n"
-            +"WorkingDirectory=.\nGUIvisible=false";
     static final String cardfileURL = "http://pastebin.com/raw/Yr26nfp7";
     static final String smallXMLURL = "http://pastebin.com/raw/Eqj2N5qD";
@@ -60 +58 @@
         System.setOut(ps);
         writedata("config.txt", configData);
-        writedata("pconfig.txt", configpData);
-        writedata("pmcprops.txt", paramConfig);
+        writedata("pconfig.txt", paramicsData);
         writedata("empty.txt", "");
         writeScriptfiles();

/trunk/IDE_metadata/Eclipse/build.xml

@@ -54 +54 @@
 
 
+    <echo message="Packaging TMC into a single JAR at ${deploy.jar}"/>
 
     <delete dir="${deploy.dir}"/>
     <mkdir dir="${deploy.dir}"/>
 
-    
+    <jar destfile="${deploy.dir}/temp_final.jar" filesetmanifest="skip">
+        <zipgroupfileset dir="${workdir}/lib" includes="xercesImpl.jar"/>
+
+        <manifest>
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </jar>
+
+    <zip destfile="${deploy.jar}">
+        <zipfileset src="${deploy.dir}/temp_final.jar"
+        excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
+    </zip>
+
+    <delete file="${deploy.dir}/temp_final.jar"/>
+
     <!--                   *** Build CAD Server Only Jar ***         -->
       <jar destfile="${deploy.dir}/CADserver.jar"

/trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -131 +131 @@
       </jar>
 </target>
-
-<target description="Build separate jar files for each component of the TMC system." 
-        name="ZipForInstall" depends="package-jars">
-    <!-- Notes:    Create a zip file with jars and all external resources for distributing
-    to other machines.
-    Zip the Jar files.
-    Zip folders for config, images, audio, scripts.
-    Write .bat files and .bash files to launch each app.  Put these in root folder.
-    Zip it all up!
-    -->
-</target>
-
     <!--
 

/trunk/config/paramics_communicator_logging.properties

@@ -16 +16 @@
 
 LogFile = paramics_communication_log.xml
-
-# Set properties for 2016 --jd
-LogFile=C:\\paramics_communicator.log
-# Ethernet cable in operator room
-#CADSimulatorHost=192.168.251.119
-# PC1 in operator room (Service Tag BHLLD42)
-CADSimulatorHost=192.168.251.116
-# Virtual Host: TMCSIM Manager
-#CADSimulatorHost=192.168.251.88
-# For local testing
 CADSimulatorHost = 127.0.0.1
-
-CADSimulatorRMIPort=4445
-#CADSimulatorRMIPort = 4450
+CADSimulatorRMIPort = 4450

/trunk/config/cad_simulator_paramics_config.properties

@@ -1 @@
-ParamicsCommHost       = 192.168.251.45
+#ParamicsCommHost       = 192.168.251.45
 # For development testing
-#ParamicsCommHost       = 127.0.0.1
+ParamicsCommHost       = 127.0.0.1
 ParamicsCommPort       = 4450
 IncidentUpdateInterval = 30