Changeset 9 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures/SimulationScript.java

Timestamp:

07/25/2017 02:59:09 PM (9 years ago)

Author:

bmcguffin

Message:

Decoupled ScriptIncident? from the observer-observable pattern. SimulationScript? no longer implements Observer; instead, ScriptIncident? calls methods in SimulationScript? which notify the script's observers of a change.

Also: TimeSlice? now contains a stub method, toXML(), which returns the contents of the timeslice in XML text format.

File:

• trunk/src/scriptbuilder/structures/SimulationScript.java (modified) (3 diffs)

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -26 +26 @@
  * @version 2017/06/22
  */
-public class SimulationScript extends Observable implements Observer
+public class SimulationScript extends Observable
 {
 
@@ -155 +155 @@
 
     /**
-     * Pass incident focus events on to observers, if applicable.
-     *
-     * @param o The observable object sending the update
-     * @param arg Argument parameter of update
-     */
-    @Override
-    public void update(Observable o, Object arg)
-    {
-        if (arg instanceof SliceChangedEvent)
-        {
-            // The slice focus has changed; pass the message
-            setChanged();
-            notifyObservers(arg);
-        }
-        else if (arg instanceof IncidentFocusedEvent)
-        {
-            // The slice focus has changed; pass the message
-            setChanged();
-            notifyObservers(arg);
-        }
-        else
-        {
-            // The script has changed, notify observers
-            setChanged();
-            notifyObservers(this);
-        }
+     * Update the script's observers.
+     *
+     */
+    public void update()
+    {
+        // The script has changed, notify observers
+        setChanged();
+        notifyObservers(this);
+    }
+
+    /**
+     * Tell this script's observers that there is a new slice event.
+     *
+     * @param e the slice focus event
+     */
+    public void broadcastEvent(SliceChangedEvent e)
+    {
+        // The slice focus has changed; pass the message
+        setChanged();
+        notifyObservers(e);
+    }
+
+    /**
+     * Tell this script's observers that there is a new slice event.
+     *
+     * @param e the incident focus event
+     */
+    public void broadcastEvent(IncidentFocusedEvent e)
+    {
+        // The slice focus has changed; pass the message
+        setChanged();
+        notifyObservers(e);
     }
 
@@ -210 +216 @@
             ex.printStackTrace();
         }
-        update(this, this);
+        this.update();
     }
 }