Changeset 18 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui

Timestamp:

07/28/2017 02:32:08 PM (9 years ago)

Author:

bmcguffin

Message:

Resolved issue where a new event failed to be added to the incident when the user tried to add an event.

File:

• trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java (modified) (2 diffs)

trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java

@@ -123 +123 @@
              * Check if click is out of bounds *
              */
-            if (incident.slices.get(newSlice) == null || incident == null
-                    || newSlice < 0)
+            if (newSlice < 0 || incident == null)
             {
                 return;
             }
 
-            for (I_ScriptEvent se : incident.slices.get(newSlice).events)
-            {
-                ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se);
+            if (incident.slices.get(newSlice) != null)
+
+            {
+                for (I_ScriptEvent se : incident.slices.get(newSlice).events)
+                {
+                    ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se);
+                }
             }
 
@@ -143 +146 @@
                     I_ScriptEvent s = ScriptEvent.factoryByType(f.currentEventType);
                     ed.addProperty(eventTypeToPropertyMap.get(f.currentEventType), s);
-                    incident.slices.get(newSlice).addEvent(s);
+                    if (incident.slices.get(newSlice) == null)
+                    {
+                        incident.addNewEvent(s, newSlice);
+                    }
+                    else
+                    {
+                        incident.slices.get(newSlice).addEvent(s);
+                    }
                     f.update(f.getScript(), f.getScript());
                 }
             }
 
-            ed.setVisible(true);
+            if (incident.slices.get(newSlice) != null)
+            {
+                ed.setVisible(true);
+            }
         }