Index: trunk/src/tmcsim/application.properties
===================================================================
--- trunk/src/tmcsim/application.properties	(revision 458)
+++ trunk/src/tmcsim/application.properties	(revision 459)
@@ -1,5 +1,5 @@
-#Fri, 19 Jul 2019 09:44:03 -0700
+#Sun, 21 Jul 2019 19:11:06 -0700
 
-Application.revision=457
+Application.revision=458
 
-Application.buildnumber=165
+Application.buildnumber=166
Index: trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java
===================================================================
--- trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java	(revision 414)
+++ trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java	(revision 459)
@@ -69,5 +69,4 @@
         addBindings();
     }
-
     /**
      * This method is called from within the constructor to initialize the form.
@@ -2119,5 +2118,5 @@
     }
 
-    // JD  Invoked by timer every 5 seconds.
+    // JD  Invoked by timer every 5 seconds (Timer2 in ScreenManager).
     public void refreshCommentsNotesTable()
     {
Index: trunk/src/tmcsim/client/cadclientgui/screens/IncidentEditor.java
===================================================================
--- trunk/src/tmcsim/client/cadclientgui/screens/IncidentEditor.java	(revision 59)
+++ trunk/src/tmcsim/client/cadclientgui/screens/IncidentEditor.java	(revision 459)
@@ -31,5 +31,6 @@
  * This class contains the view and controller for the IncidentEditor screen.
  * The view is built using a GUI builder plug-in, and the controller uses
- * listeners to control how the view and data act.
+ * listeners to control how the view and data act.  The IncidentEditor is
+ * opened from the Inform CAD main menu.
  *
  * @author Stuart
Index: trunk/src/tmcsim/simulationmanager/SimulationManagerView.java
===================================================================
--- trunk/src/tmcsim/simulationmanager/SimulationManagerView.java	(revision 416)
+++ trunk/src/tmcsim/simulationmanager/SimulationManagerView.java	(revision 459)
@@ -26,4 +26,5 @@
 import javax.swing.JTable;
 import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingUtilities;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EtchedBorder;
@@ -181,12 +182,13 @@
      * @param logNumber Log number for this incident.
      */ 
-    public void addIncidentTab(Integer logNumber) {
-        
-        IncidentHistoryPanel newHistoryPanel = new IncidentHistoryPanel();
-    
-        incidentTableMap.put(logNumber, newHistoryPanel);
-
-        eventHistoryPane.addTab(String.valueOf(logNumber), newHistoryPanel);
-        
+    public void addIncidentTab(final Integer logNumber) {
+        // Place this code on EDT to fix defect #154
+        SwingUtilities.invokeLater(new Runnable(){public void run(){
+            IncidentHistoryPanel newHistoryPanel = new IncidentHistoryPanel();
+
+            incidentTableMap.put(logNumber, newHistoryPanel);
+
+            eventHistoryPane.addTab(String.valueOf(logNumber), newHistoryPanel);
+        }});
     }