Changeset 7 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder


Ignore:
Timestamp:
07/25/2017 11:16:45 AM (9 years ago)
Author:
bmcguffin
Message:

Renamed Interfaces in structures.events package from "*Interface" to "I_*"

Location:
trunk
Files:
15 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore set to
      build

  • trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

    r1 r7  
    3131import scriptbuilder.structures.SimulationScript; 
    3232import scriptbuilder.structures.TimeSlice; 
    33 import scriptbuilder.structures.events.ScriptEventInterface; 
     33import scriptbuilder.structures.events.I_ScriptEvent; 
    3434 
    3535/** 
    … …  
    360360 
    361361            DefaultListModel model = new DefaultListModel(); 
    362             for (ScriptEventInterface e : slice.events) 
     362            for (I_ScriptEvent e : slice.events) 
    363363            { 
    364364                model.addElement(e); 

  • trunk/src/scriptbuilder/gui/drawers/EventIconDrawer.java

    r1 r7  
    1313import scriptbuilder.structures.ScriptEvent.ScriptEventType; 
    1414import images.*; 
    15 import scriptbuilder.structures.events.ScriptEventInterface; 
     15import scriptbuilder.structures.events.I_ScriptEvent; 
    1616 
    1717/** 
    … …  
    138138     * y) 
    139139     */ 
    140     public static void DrawEventIcon(Graphics2D g2d, ScriptEventInterface event, 
     140    public static void DrawEventIcon(Graphics2D g2d, I_ScriptEvent event, 
    141141            int x, int y) 
    142142    { 

  • trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java

    r1 r7  
    1212import scriptbuilder.structures.ScriptEvent; 
    1313import scriptbuilder.structures.TimeSlice; 
    14 import scriptbuilder.structures.events.ScriptEventInterface; 
     14import scriptbuilder.structures.events.I_ScriptEvent; 
    1515 
    1616/** 
    … …  
    8888                } 
    8989 
    90                 ScriptEventInterface event = slice.events.get(i); 
     90                I_ScriptEvent event = slice.events.get(i); 
    9191                EventIconDrawer.DrawEventIcon(g2d, event, slice.getX() 
    9292                        - ScriptBuilderGuiConstants.EVENT_ICON_WIDTH, 

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

    r1 r7  
    2020import scriptbuilder.structures.ScriptIncident; 
    2121import scriptbuilder.structures.TimeSlice; 
    22 import scriptbuilder.structures.events.ScriptEventInterface; 
     22import scriptbuilder.structures.events.I_ScriptEvent; 
    2323 
    2424/** 
    … …  
    129129            } 
    130130 
    131             for (ScriptEventInterface se : incident.slices.get(newSlice).events) 
     131            for (I_ScriptEvent se : incident.slices.get(newSlice).events) 
    132132            { 
    133133                ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se); 
    … …  
    141141                if (f.currentEventType != null) 
    142142                { 
    143                     ScriptEventInterface s = ScriptEvent.factoryByType(f.currentEventType); 
     143                    I_ScriptEvent s = ScriptEvent.factoryByType(f.currentEventType); 
    144144                    ed.addProperty(eventTypeToPropertyMap.get(f.currentEventType), s); 
    145145                    incident.slices.get(newSlice).addEvent(s); 

  • trunk/src/scriptbuilder/structures/MyScriptHandler.java

    r1 r7  
    195195     * Event object. 
    196196     */ 
    197     private TreeMap<ELEMENT, ScriptEventInterface> eventMap; 
     197    private TreeMap<ELEMENT, I_ScriptEvent> eventMap; 
    198198 
    199199    /** 
    … …  
    335335     * The most recent element which contains dialog or other sub-elements. 
    336336     */ 
    337     private ScriptEventInterface trackedEvent = null; 
     337    private I_ScriptEvent trackedEvent = null; 
    338338 
    339339    /** 
    … …  
    369369        script = s; 
    370370        incidentMap = new TreeMap<Integer, ScriptIncident>(); 
    371         eventMap = new TreeMap<ELEMENT, ScriptEventInterface>(); 
     371        eventMap = new TreeMap<ELEMENT, I_ScriptEvent>(); 
    372372        pcData = new TreeMap<ELEMENT, String>(); 
    373373        docPosition = new Stack<ELEMENT>(); 
    … …  
    727727 
    728728        currentElement = docPosition.pop(); 
    729         ScriptEventInterface newEvent = null; 
     729        I_ScriptEvent newEvent = null; 
    730730        try 
    731731        { 
    … …  
    804804            else if (currentElement == ELEMENT.EXPECTED_ACTION) 
    805805            { 
    806                 if (trackedEvent instanceof EvaluationEventInterface) 
    807                 { 
    808                     ((EvaluationEventInterface) trackedEvent).addAction(pcData.remove(ELEMENT.EXPECTED_ACTION)); 
     806                if (trackedEvent instanceof I_EvaluationEvent) 
     807                { 
     808                    ((I_EvaluationEvent) trackedEvent).addAction(pcData.remove(ELEMENT.EXPECTED_ACTION)); 
    809809                } 
    810810            } 

  • trunk/src/scriptbuilder/structures/ScriptEvent.java

    r1 r7  
    1212 * @version 2017/06/30 
    1313 */ 
    14 public abstract class ScriptEvent extends Observable implements ScriptEventInterface 
     14public abstract class ScriptEvent extends Observable implements I_ScriptEvent 
    1515{ 
    1616 
    … …  
    129129    } 
    130130     
    131     public static ScriptEventInterface factoryByType(ScriptEventType t) 
     131    public static I_ScriptEvent factoryByType(ScriptEventType t) 
    132132    { 
    133133        switch(t) 

  • trunk/src/scriptbuilder/structures/ScriptIncident.java

    r1 r7  
    77import java.util.Observable; 
    88import java.util.TreeMap; 
    9 import scriptbuilder.structures.events.ScriptEventInterface; 
     9import scriptbuilder.structures.events.I_ScriptEvent; 
    1010 
    1111/** 
    … …  
    161161     * the simulation 
    162162     */ 
    163     public void addNewEvent(ScriptEventInterface ev, int start) 
     163    public void addNewEvent(I_ScriptEvent ev, int start) 
    164164    { 
    165165        TimeSlice t = slices.get(start); 

  • trunk/src/scriptbuilder/structures/TimeSlice.java

    r1 r7  
    55import java.util.List; 
    66import scriptbuilder.gui.ScriptBuilderGuiConstants; 
    7 import scriptbuilder.structures.events.ScriptEventInterface; 
     7import scriptbuilder.structures.events.I_ScriptEvent; 
    88 
    99/** 
    … …  
    2323     * List of Script Events which begin at this instance. 
    2424     */ 
    25     public List<ScriptEventInterface> events; 
     25    public List<I_ScriptEvent> events; 
    2626    //Absolute start time of this time slice 
    2727    private int seconds; 
    … …  
    3636    { 
    3737        this.seconds = seconds; 
    38         events = new ArrayList<ScriptEventInterface>(); 
     38        events = new ArrayList<I_ScriptEvent>(); 
    3939    } 
    4040 
    … …  
    4444     * @param event the ScriptEvent to be added 
    4545     */ 
    46     public void addEvent(ScriptEventInterface event) 
     46    public void addEvent(I_ScriptEvent event) 
    4747    { 
    4848        events.add(event); 
    … …  
    9393    { 
    9494        int dur = 0; 
    95         for (ScriptEventInterface e : events) 
     95        for (I_ScriptEvent e : events) 
    9696        { 
    9797            if (e.getLength() > dur) 
    … …  
    151151        StringBuilder sb = new StringBuilder(); 
    152152 
    153         for (ScriptEventInterface event : events) 
     153        for (I_ScriptEvent event : events) 
    154154        { 
    155155            sb.append(event.toString()); 

  • trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java

    r1 r7  
    1414 * @author Bryan McGuffin 
    1515 */ 
    16 public class ATMSEvaluationEvent extends ScriptEvent implements EvaluationEventInterface 
     16public class ATMSEvaluationEvent extends ScriptEvent implements I_EvaluationEvent 
    1717{ 
    1818 

  • trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java

    r1 r7  
    1414 * @author Bryan McGuffin 
    1515 */ 
    16 public class ActivityLogEvaluationEvent extends ScriptEvent implements EvaluationEventInterface 
     16public class ActivityLogEvaluationEvent extends ScriptEvent implements I_EvaluationEvent 
    1717{ 
    1818 

  • trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java

    r1 r7  
    1414 * @author Bryan McGuffin 
    1515 */ 
    16 public class CADEvaluationEvent extends ScriptEvent implements EvaluationEventInterface 
     16public class CADEvaluationEvent extends ScriptEvent implements I_EvaluationEvent 
    1717{ 
    1818 

  • trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java

    r1 r7  
    1515 * @author Bryan McGuffin 
    1616 */ 
    17 public class CMSEvaluationEvent extends ScriptEvent implements EvaluationEventInterface 
     17public class CMSEvaluationEvent extends ScriptEvent implements I_EvaluationEvent 
    1818{ 
    1919 

  • trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java

    r1 r7  
    1414 * @author Bryan McGuffin 
    1515 */ 
    16 public class FacilitatorEvaluationEvent extends ScriptEvent implements EvaluationEventInterface 
     16public class FacilitatorEvaluationEvent extends ScriptEvent implements I_EvaluationEvent 
    1717{ 
    1818 

  • trunk/src/scriptbuilder/structures/events/I_EvaluationEvent.java

    r1 r7  
    1 /* 
    2  * To change this license header, choose License Headers in Project Properties. 
    3  * To change this template file, choose Tools | Templates 
    4  * and open the template in the editor. 
    5  */ 
    61package scriptbuilder.structures.events; 
    72 
    … …  
    149 * @author Bryan McGuffin 
    1510 */ 
    16 public interface EvaluationEventInterface 
     11public interface I_EvaluationEvent 
    1712{ 
    1813 

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

    r1 r7  
    1010 * @author Bryan McGuffin 
    1111 */ 
    12 public interface ScriptEventInterface extends Comparable 
     12public interface I_ScriptEvent extends Comparable 
    1313{ 
    1414 

  • trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java

    r1 r7  
    1515 * @author Bryan McGuffin 
    1616 */ 
    17 public class RadioEvaluationEvent extends ScriptEvent implements EvaluationEventInterface 
     17public class RadioEvaluationEvent extends ScriptEvent implements I_EvaluationEvent 
    1818{ 
    1919 
Note: See TracChangeset for help on using the changeset viewer.