Index: trunk/src/tmcsim/client/CADlogDisplay.java
===================================================================
--- trunk/src/tmcsim/client/ClockClient.java	(revision 64)
+++ trunk/src/tmcsim/client/CADlogDisplay.java	(revision 416)
@@ -8,4 +8,5 @@
 import java.rmi.server.UnicastRemoteObject;
 import java.util.Properties;
+import java.util.Vector;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -15,4 +16,7 @@
 import javax.swing.Timer;
 import javax.swing.UIManager;
+import javax.swing.table.DefaultTableModel;
+import tmcsim.client.cadclientgui.data.Incident;
+import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_TABLE;
 import tmcsim.common.SimulationException;
 import tmcsim.interfaces.CADClientInterface;
@@ -20,11 +24,11 @@
 
 /**
- * ClockClient shows the simulation clock time. It operates as a client of the
+ * CADlogDisplays shows the current CAD log for all incidents. It operates as a client of the
  * CAD server, using RMI to poll the server every second for the current
- * simulation clock time.
+ * list of incidents and associated comments/notes table. 
  *
  * @author jdalbey
  */
-public class ClockClient extends UnicastRemoteObject implements
+public class CADlogDisplay extends UnicastRemoteObject implements
         CADClientInterface
 {
@@ -82,5 +86,5 @@
     private CADClientInterface client = this;
     private static final String CONFIG_FILE_NAME = "cad_client_config.properties";
-    private final static int ONE_SECOND = 1000;
+    private final static int TEN_SECONDS = 10000;
 
     /**
@@ -91,5 +95,5 @@
      * file containing configuration data.
      */
-    public ClockClient(String propertiesFile) throws SimulationException,
+    public CADlogDisplay(String propertiesFile) throws SimulationException,
             RemoteException
     {
@@ -102,9 +106,9 @@
                 cadClientProp.getProperty(PROPERTIES.CAD_RMI_PORT.name).trim());
 
-        theView = new ClockView();
-        theView.setVisible(true);
+        //theView = new ClockView();
+        //theView.setVisible(true);
 
         // Create a timer that fetches the simulation time every second.
-        Timer timer = new Timer(ONE_SECOND, new ActionListener()
+        Timer timer = new Timer(TEN_SECONDS, new ActionListener()
         {
             public void actionPerformed(ActionEvent e)
@@ -112,9 +116,35 @@
                 try
                 {
-                    long simtime = theCoorInt.getCurrentSimulationTime();
-                    theView.updateTime("" + formatInterval(simtime));
+                    Vector<Incident> incList = theCoorInt.getIncidentList(); 
+                    StringBuffer sb = new StringBuffer();
+
+                    for (Incident incident: incList)
+                    {
+                    // DefaultTableModel noteTable = (DefaultTableModel) theCoorInt.getCadDataIncidentTable(INC_TABLE.COMMENTS_NOTES, incident.getLogNum());
+                     // Output noteTable
+                        sb.append("Incident # " + incident.logNum + "\n");
+                        // Retrieve the table of comments/notes the users created
+                        DefaultTableModel notesTable = incident.getCommentsNotesTable();
+                        // Retrieve the notes chronologically (Most recent is in first row)
+                        for (int row=notesTable.getRowCount()-1; row >=0; row--)
+                        {
+                            // Combine the fields into one export entry
+                            sb.append(notesTable.getValueAt(row,1) + " "); // time
+                            String initials = (String) notesTable.getValueAt(row,2); // initials
+                            // If there are no user intials, it's a scripted item
+                            if (initials.length() == 0)
+                            {
+                                initials = "Script";
+                            }
+                            sb.append(initials + " ");
+                            sb.append(notesTable.getValueAt(row,4) + "\n"); // notes
+                        }
+                    }
+                    System.out.println(sb);
+                    //long simtime = theCoorInt.getCurrentSimulationTime();
+                    //theView.updateTime("" + formatInterval(simtime));
                 } catch (RemoteException ex)
                 {
-                    Logger.getLogger(ClockClient.class.getName()).log(Level.SEVERE, null, ex);
+                    Logger.getLogger(CADlogDisplay.class.getName()).log(Level.SEVERE, null, ex);
                 }
             }
@@ -245,5 +275,5 @@
         {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new ClockClient(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+            new CADlogDisplay(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
 
         } catch (Exception e)