Changeset 119 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/ScriptIncident.java

Timestamp:

09/13/2017 12:30:19 PM (9 years ago)

Author:

bmcguffin

Message:

Fixed a bug which caused an event to be destroyed if it was the only event in its incident and the user attempted to change its start time. (See  http://git.tokomak.net:8888/ticket/20 for more details.)

File:

• trunk/src/scriptbuilder/structures/ScriptIncident.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -208 +208 @@
             latestStart = start;
         }
-            //If this event is earlier than all previous events, or if there are 
+        //If this event is earlier than all previous events, or if there are 
         //no other events, the offset is equal to this event's start time
         if (start < offset || eventCount == 1)
@@ -392 +392 @@
         if (seconds == offset)
         {
-            offset = slices.firstKey();
+            if (slices.size() > 0)
+            {
+                offset = slices.firstKey();
+            }
+            else
+            {
+                offset = 0;
+            }
         }
         this.updateLength();
         script.update();
     }
+
+    /**
+     * Shifts the start time of a given event in this incident. The first event
+     * in the incident cannot be shifted.
+     *
+     * @param evt the event to be relocated
+     * @param oldTime the current start time of the event
+     * @param newTime the destination start time of the event
+     * @return true if the event is shifted over properly
+     * @pre the event in question exists
+     * @pre oldTime != newTime
+     */
+    public boolean changeEventStart(I_ScriptEvent evt, int oldTime, int newTime)
+    {
+        if (!(oldTime == 0 && newTime > oldTime))
+        {
+            this.slices.get(oldTime).events.remove(evt);
+            this.addNewEvent(evt, newTime);
+            return true;
+        }
+        return false;
+    }
 }