Changeset 89 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures

Timestamp:

08/28/2017 01:38:15 PM (9 years ago)

Author:

bmcguffin

Message:

Added dropdown menu item to ScriptBuilderFrame?: "Delete Incident". When clicked, user may select an existing incident to delete. Program will prompt user to confirm the deletion, then remove the incident from the script and refresh the display.

Added button to individual event editor window: "Remove this event". When clicked, the currently displayed event will be removed from the timeslice it is in. The display will be refreshed accordingly. NOTE: This still has some bugs, namely that the last remaining event in a timeslice fails to be deleted.

Restructured Interface ScriptEventEditorPanel? to include a removeAssociatedEvent method, which calls a new method in I_ScriptEvent called removeThis, which causes the event to be removed from its timeslice.

Editor.Java previously contained several classes and enums, none of which were set to private scope. Moved these extra classes to their own files to decrease clutter in Editor.java and increase readability of all files.

Location:

trunk/src/scriptbuilder/structures

Files:

• ScriptEvent.java (modified) (2 diffs)
• TimeSlice.java (modified) (1 diff)
• events/I_ScriptEvent.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/ScriptEvent.java

@@ -82 +82 @@
      */
     public int length;
+    
+    private TimeSlice slice;
 
     /**
@@ -189 +191 @@
         return event instanceof I_EvaluationEvent;
     }
+    
+    @Override
+    public void removeThis()
+    {
+        this.slice.events.remove(this);
+    }
+    
+    @Override
+    public void assignTimeSlice(TimeSlice ts)
+    {
+        this.slice = ts;
+    }
 }

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -58 +58 @@
     public void addEvent(I_ScriptEvent event)
     {
+        event.assignTimeSlice(this);
         events.add(event);
         Collections.sort(events);

trunk/src/scriptbuilder/structures/events/I_ScriptEvent.java

@@ -3 +3 @@
 import scriptbuilder.structures.ScriptEvent;
 import scriptbuilder.structures.ScriptEvent.ScriptEventType;
+import scriptbuilder.structures.TimeSlice;
 
 /**
@@ -19 +20 @@
      */
     int getLength();
+    
+    /**
+     * Remove this event from the timeslice it's in.
+     */
+    void removeThis();
+    
+    /**
+     * Give this event access to the timeslice it's in.
+     * 
+     * @param ts the timeslice which contains this event
+     */
+    void assignTimeSlice(TimeSlice ts);
 
     /**