Index: trunk/src/scriptbuilder/structures/ScriptIncident.java =================================================================== --- trunk/src/scriptbuilder/structures/ScriptIncident.java (revision 1) +++ trunk/src/scriptbuilder/structures/ScriptIncident.java (revision 7) @@ -7,5 +7,5 @@ import java.util.Observable; import java.util.TreeMap; -import scriptbuilder.structures.events.ScriptEventInterface; +import scriptbuilder.structures.events.I_ScriptEvent; /** @@ -161,5 +161,5 @@ * the simulation */ - public void addNewEvent(ScriptEventInterface ev, int start) + public void addNewEvent(I_ScriptEvent ev, int start) { TimeSlice t = slices.get(start); Index: trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java (revision 1) +++ trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java (revision 7) @@ -15,5 +15,5 @@ * @author Bryan McGuffin */ -public class CMSEvaluationEvent extends ScriptEvent implements EvaluationEventInterface +public class CMSEvaluationEvent extends ScriptEvent implements I_EvaluationEvent { Index: trunk/src/scriptbuilder/structures/events/I_ScriptEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/I_ScriptEvent.java (revision 7) +++ trunk/src/scriptbuilder/structures/events/I_ScriptEvent.java (revision 7) @@ -0,0 +1,28 @@ +package scriptbuilder.structures.events; + +import scriptbuilder.structures.ScriptEvent; +import scriptbuilder.structures.ScriptEvent.ScriptEventType; + +/** + * Generic interface for ScriptEvent objects. Script Events have an event type, + * a length, and several data values unique to the event. + * + * @author Bryan McGuffin + */ +public interface I_ScriptEvent extends Comparable +{ + + /** + * Get the time length of this event. + * + * @return number of seconds the event takes place; default is 1 + */ + int getLength(); + + /** + * Get the event type. + * + * @return the enum script event type of this event + */ + ScriptEventType getScriptEventType(); +} Index: trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java (revision 1) +++ trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java (revision 7) @@ -14,5 +14,5 @@ * @author Bryan McGuffin */ -public class CADEvaluationEvent extends ScriptEvent implements EvaluationEventInterface +public class CADEvaluationEvent extends ScriptEvent implements I_EvaluationEvent { Index: trunk/src/scriptbuilder/structures/events/I_EvaluationEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/I_EvaluationEvent.java (revision 7) +++ trunk/src/scriptbuilder/structures/events/I_EvaluationEvent.java (revision 7) @@ -0,0 +1,42 @@ +package scriptbuilder.structures.events; + +import java.util.ArrayList; + +/** + * Generic interface for an evaluation event. An evaluation event has some set + * of expected actions. + * + * @author Bryan McGuffin + */ +public interface I_EvaluationEvent +{ + + /** + * Get all the expected actions stored in this event. + * + * @return a list of expected actions + */ + ArrayList getExpectedActions(); + + /** + * Add a new action to the list of expected actions. + * + * @param act the new expected action + */ + void addAction(String act); + + /** + * Update the description of an existing expected action. + * + * @param index The zero-based index of the action to update. + * @param act the new description of that action + */ + void updateAction(int index, String act); + + /** + * Remove an action from the list. + * + * @param index the zero-based index of the action to remove + */ + void removeAction(int index); +} Index: trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java (revision 1) +++ trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java (revision 7) @@ -14,5 +14,5 @@ * @author Bryan McGuffin */ -public class ActivityLogEvaluationEvent extends ScriptEvent implements EvaluationEventInterface +public class ActivityLogEvaluationEvent extends ScriptEvent implements I_EvaluationEvent { Index: trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java (revision 1) +++ trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java (revision 7) @@ -15,5 +15,5 @@ * @author Bryan McGuffin */ -public class RadioEvaluationEvent extends ScriptEvent implements EvaluationEventInterface +public class RadioEvaluationEvent extends ScriptEvent implements I_EvaluationEvent { Index: trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java (revision 1) +++ trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java (revision 7) @@ -14,5 +14,5 @@ * @author Bryan McGuffin */ -public class FacilitatorEvaluationEvent extends ScriptEvent implements EvaluationEventInterface +public class FacilitatorEvaluationEvent extends ScriptEvent implements I_EvaluationEvent { Index: trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java (revision 1) +++ trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java (revision 7) @@ -14,5 +14,5 @@ * @author Bryan McGuffin */ -public class ATMSEvaluationEvent extends ScriptEvent implements EvaluationEventInterface +public class ATMSEvaluationEvent extends ScriptEvent implements I_EvaluationEvent { Index: trunk/src/scriptbuilder/structures/events/ScriptEventInterface.java =================================================================== --- trunk/src/scriptbuilder/structures/events/ScriptEventInterface.java (revision 1) +++ (revision ) @@ -1,28 +1,0 @@ -package scriptbuilder.structures.events; - -import scriptbuilder.structures.ScriptEvent; -import scriptbuilder.structures.ScriptEvent.ScriptEventType; - -/** - * Generic interface for ScriptEvent objects. Script Events have an event type, - * a length, and several data values unique to the event. - * - * @author Bryan McGuffin - */ -public interface ScriptEventInterface extends Comparable -{ - - /** - * Get the time length of this event. - * - * @return number of seconds the event takes place; default is 1 - */ - int getLength(); - - /** - * Get the event type. - * - * @return the enum script event type of this event - */ - ScriptEventType getScriptEventType(); -} Index: trunk/src/scriptbuilder/structures/events/EvaluationEventInterface.java =================================================================== --- trunk/src/scriptbuilder/structures/events/EvaluationEventInterface.java (revision 1) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package scriptbuilder.structures.events; - -import java.util.ArrayList; - -/** - * Generic interface for an evaluation event. An evaluation event has some set - * of expected actions. - * - * @author Bryan McGuffin - */ -public interface EvaluationEventInterface -{ - - /** - * Get all the expected actions stored in this event. - * - * @return a list of expected actions - */ - ArrayList getExpectedActions(); - - /** - * Add a new action to the list of expected actions. - * - * @param act the new expected action - */ - void addAction(String act); - - /** - * Update the description of an existing expected action. - * - * @param index The zero-based index of the action to update. - * @param act the new description of that action - */ - void updateAction(int index, String act); - - /** - * Remove an action from the list. - * - * @param index the zero-based index of the action to remove - */ - void removeAction(int index); -} Index: trunk/src/scriptbuilder/structures/ScriptEvent.java =================================================================== --- trunk/src/scriptbuilder/structures/ScriptEvent.java (revision 1) +++ trunk/src/scriptbuilder/structures/ScriptEvent.java (revision 7) @@ -12,5 +12,5 @@ * @version 2017/06/30 */ -public abstract class ScriptEvent extends Observable implements ScriptEventInterface +public abstract class ScriptEvent extends Observable implements I_ScriptEvent { @@ -129,5 +129,5 @@ } - public static ScriptEventInterface factoryByType(ScriptEventType t) + public static I_ScriptEvent factoryByType(ScriptEventType t) { switch(t) Index: trunk/src/scriptbuilder/structures/MyScriptHandler.java =================================================================== --- trunk/src/scriptbuilder/structures/MyScriptHandler.java (revision 1) +++ trunk/src/scriptbuilder/structures/MyScriptHandler.java (revision 7) @@ -195,5 +195,5 @@ * Event object. */ - private TreeMap eventMap; + private TreeMap eventMap; /** @@ -335,5 +335,5 @@ * The most recent element which contains dialog or other sub-elements. */ - private ScriptEventInterface trackedEvent = null; + private I_ScriptEvent trackedEvent = null; /** @@ -369,5 +369,5 @@ script = s; incidentMap = new TreeMap(); - eventMap = new TreeMap(); + eventMap = new TreeMap(); pcData = new TreeMap(); docPosition = new Stack(); @@ -727,5 +727,5 @@ currentElement = docPosition.pop(); - ScriptEventInterface newEvent = null; + I_ScriptEvent newEvent = null; try { @@ -804,7 +804,7 @@ else if (currentElement == ELEMENT.EXPECTED_ACTION) { - if (trackedEvent instanceof EvaluationEventInterface) - { - ((EvaluationEventInterface) trackedEvent).addAction(pcData.remove(ELEMENT.EXPECTED_ACTION)); + if (trackedEvent instanceof I_EvaluationEvent) + { + ((I_EvaluationEvent) trackedEvent).addAction(pcData.remove(ELEMENT.EXPECTED_ACTION)); } } Index: trunk/src/scriptbuilder/structures/TimeSlice.java =================================================================== --- trunk/src/scriptbuilder/structures/TimeSlice.java (revision 1) +++ trunk/src/scriptbuilder/structures/TimeSlice.java (revision 7) @@ -5,5 +5,5 @@ import java.util.List; import scriptbuilder.gui.ScriptBuilderGuiConstants; -import scriptbuilder.structures.events.ScriptEventInterface; +import scriptbuilder.structures.events.I_ScriptEvent; /** @@ -23,5 +23,5 @@ * List of Script Events which begin at this instance. */ - public List events; + public List events; //Absolute start time of this time slice private int seconds; @@ -36,5 +36,5 @@ { this.seconds = seconds; - events = new ArrayList(); + events = new ArrayList(); } @@ -44,5 +44,5 @@ * @param event the ScriptEvent to be added */ - public void addEvent(ScriptEventInterface event) + public void addEvent(I_ScriptEvent event) { events.add(event); @@ -93,5 +93,5 @@ { int dur = 0; - for (ScriptEventInterface e : events) + for (I_ScriptEvent e : events) { if (e.getLength() > dur) @@ -151,5 +151,5 @@ StringBuilder sb = new StringBuilder(); - for (ScriptEventInterface event : events) + for (I_ScriptEvent event : events) { sb.append(event.toString()); Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java =================================================================== --- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java (revision 1) +++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java (revision 7) @@ -20,5 +20,5 @@ import scriptbuilder.structures.ScriptIncident; import scriptbuilder.structures.TimeSlice; -import scriptbuilder.structures.events.ScriptEventInterface; +import scriptbuilder.structures.events.I_ScriptEvent; /** @@ -129,5 +129,5 @@ } - for (ScriptEventInterface se : incident.slices.get(newSlice).events) + for (I_ScriptEvent se : incident.slices.get(newSlice).events) { ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se); @@ -141,5 +141,5 @@ if (f.currentEventType != null) { - ScriptEventInterface s = ScriptEvent.factoryByType(f.currentEventType); + I_ScriptEvent s = ScriptEvent.factoryByType(f.currentEventType); ed.addProperty(eventTypeToPropertyMap.get(f.currentEventType), s); incident.slices.get(newSlice).addEvent(s); Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 1) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 7) @@ -31,5 +31,5 @@ import scriptbuilder.structures.SimulationScript; import scriptbuilder.structures.TimeSlice; -import scriptbuilder.structures.events.ScriptEventInterface; +import scriptbuilder.structures.events.I_ScriptEvent; /** @@ -360,5 +360,5 @@ DefaultListModel model = new DefaultListModel(); - for (ScriptEventInterface e : slice.events) + for (I_ScriptEvent e : slice.events) { model.addElement(e); Index: trunk/src/scriptbuilder/gui/drawers/EventIconDrawer.java =================================================================== --- trunk/src/scriptbuilder/gui/drawers/EventIconDrawer.java (revision 1) +++ trunk/src/scriptbuilder/gui/drawers/EventIconDrawer.java (revision 7) @@ -13,5 +13,5 @@ import scriptbuilder.structures.ScriptEvent.ScriptEventType; import images.*; -import scriptbuilder.structures.events.ScriptEventInterface; +import scriptbuilder.structures.events.I_ScriptEvent; /** @@ -138,5 +138,5 @@ * y) */ - public static void DrawEventIcon(Graphics2D g2d, ScriptEventInterface event, + public static void DrawEventIcon(Graphics2D g2d, I_ScriptEvent event, int x, int y) { Index: trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java =================================================================== --- trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java (revision 1) +++ trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java (revision 7) @@ -12,5 +12,5 @@ import scriptbuilder.structures.ScriptEvent; import scriptbuilder.structures.TimeSlice; -import scriptbuilder.structures.events.ScriptEventInterface; +import scriptbuilder.structures.events.I_ScriptEvent; /** @@ -88,5 +88,5 @@ } - ScriptEventInterface event = slice.events.get(i); + I_ScriptEvent event = slice.events.get(i); EventIconDrawer.DrawEventIcon(g2d, event, slice.getX() - ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,