Changeset 432 in tmcsimulator for trunk/src/tmcsim

Timestamp:

07/07/2019 11:13:00 AM (7 years ago)

Author:

jdalbey

Message:

CADlogDisplay updated. jar target added for CADlogDisplay. "Log Entries" changed to "CAD Log Entries" in Sim Mgr panel.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/Coordinator.java (modified) (1 diff)
• client/CADlogDisplay.java (modified) (7 diffs)
• simulationmanager/IncidentHistoryPanel.java (modified) (1 diff)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Mon, 24 Jun 2019 18:00:23 -0700
+#Sun, 07 Jul 2019 11:28:33 -0700
 
-Application.revision=424
+Application.revision=431
 
-Application.buildnumber=142
+Application.buildnumber=145

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -116 +116 @@
     private static SimulationManagerInterface simMgr = null;
     private static LinkedList<CADClientInterface> clientList;
+    /** 'database' of cad Data shared by all clients and the sim mgr */
     private static CADData cadData;
+    /** The 'rolodex' of contact info */
     private static CardfileData cardfileData;
+    /** The model for the state of the CAD Server */
     private CADSimulatorState cadModel;
     

trunk/src/tmcsim/client/CADlogDisplay.java

@@ -4 +4 @@
 import java.awt.event.ActionListener;
 import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.PrintWriter;
 import java.rmi.Naming;
 import java.rmi.RemoteException;
@@ -38 +40 @@
     private static Logger cadClientLogger = Logger.getLogger("tmcsim.client");
 
-    @Override
-    public void refresh() throws RemoteException
-    {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
+    private static final String CONFIG_FILE_NAME = "cad_client_config.properties";
+    private static final String LOG_FILE_NAME = "CADcomments.log";
+    private final static int TEN_SECONDS = 10000;
 
     /**
@@ -82 +82 @@
      */
     private CADClientInterface client = this;
-    private static final String CONFIG_FILE_NAME = "cad_client_config.properties";
-    private final static int TEN_SECONDS = 10000;
+    /*
+     * PrintWriter handle for sending log to a file 
+     */
+    private PrintWriter writer;
 
     /**
@@ -103 +105 @@
                 cadClientProp.getProperty(PROPERTIES.CAD_RMI_PORT.name).trim());
 
-        //theView = new ClockView();
-        //theView.setVisible(true);
-
         // Create a timer that fetches the simulation time every second.
         Timer timer = new Timer(TEN_SECONDS, new ActionListener()
         {
-            public void actionPerformed(ActionEvent e)
+            public void actionPerformed(ActionEvent evt)
             {
                 try
                 {
                     Vector<Incident> incList = theCoorInt.getIncidentList(); 
-                    StringBuffer sb = new StringBuffer();
+                    StringBuffer output = new StringBuffer();
 
                     for (Incident incident: incList)
@@ -120 +119 @@
                     // 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();
@@ -127 +125 @@
                         {
                             // Combine the fields into one export entry
-                            sb.append(notesTable.getValueAt(row,1) + " "); // time
-                            String initials = (String) notesTable.getValueAt(row,2); // initials
+                            //sb.append(notesTable.getValueAt(row,1) + " "); // time
+                            String initials = (String) notesTable.getValueAt(row,2); // user initials
                             // If there are user intials, include this item.
-                            // Zero length initials mean it's a scripted item
+                            // Zero length initials mean it's a scripted item, ignore it.
                             if (initials.length() > 0)
-                            {
-                                sb.append(initials + " ");
-                                sb.append(notesTable.getValueAt(row,4) + "\n"); // notes
+                            {//CAD Log Entry, Incident #187, Sharon: REQUEST EXTRA ANCHOVIES
+                                output.append("CAD log entry, ");
+                                output.append("Incident #" + incident.logNum + ", ");
+                                output.append(initials + ": ");
+                                output.append(notesTable.getValueAt(row,4) + "\n"); // notes
                             }
                         }
                     }
-                    System.out.println(sb);
+                    System.out.print(output);
+                    // Write output to a file
+                    try 
+                    {
+                        writer = new PrintWriter(new FileWriter(LOG_FILE_NAME));
+                        writer.print(output);
+                        writer.close();
+                    } catch (Exception exc) {
+                        exc.printStackTrace();
+                        } 
+        
                     //long simtime = theCoorInt.getCurrentSimulationTime();
                     //theView.updateTime("" + formatInterval(simtime));
@@ -256 +266 @@
     }
 
+    @Override
+    public void refresh() throws RemoteException
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
     /**
      * Construct the CADClient with the properties file path, either from the

trunk/src/tmcsim/simulationmanager/IncidentHistoryPanel.java

@@ -114 +114 @@
         logScrollPane.setViewportView(eventHistoryTable);
         logScrollPane.setBorder(BorderFactory.createTitledBorder(
-                BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "Log Entries"));
+                BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), "CAD Log Entries"));