Changeset 7 in tmcsimulator-scriptbuilder for trunk


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:
36 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore set to
      build

  • trunk/build.xml

    r5 r7  
    88<!-- You can turn off the Compile on Save (or Deploy on Save) setting --> 
    99<!-- in the project's Project Properties dialog box.--> 
    10 <project name="ScriptBuilder" default="default" basedir="."> 
    11     <description>Builds, tests, and runs the project ScriptBuilder.</description> 
     10<project name="ScriptBuilder_Repo" default="default" basedir="."> 
     11    <description>Builds, tests, and runs the project ScriptBuilder_Repo.</description> 
    1212    <import file="nbproject/build-impl.xml"/> 
    1313    <!-- 
    … …  
    5959    An example of overriding the target for project execution could look like this: 
    6060 
    61         <target name="run" depends="ScriptBuilder-impl.jar"> 
     61        <target name="run" depends="ScriptBuilder_Repo-impl.jar"> 
    6262            <exec dir="bin" executable="launcher.exe"> 
    6363                <arg file="${dist.jar}"/> 

  • trunk/nbproject/build-impl.xml

    r4 r7  
    2020 
    2121        --> 
    22 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="ScriptBuilder-impl"> 
     22<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="ScriptBuilder_Repo-impl"> 
    2323    <fail message="Please build using Ant 1.8.0 or higher."> 
    2424        <condition> 
    … …  
    4747        <!-- The two properties below are usually overridden --> 
    4848        <!-- by the active platform. Just a fallback. --> 
    49         <property name="default.javac.source" value="1.6"/> 
    50         <property name="default.javac.target" value="1.6"/> 
     49        <property name="default.javac.source" value="1.4"/> 
     50        <property name="default.javac.target" value="1.4"/> 
    5151    </target> 
    5252    <target depends="-pre-init,-init-private,-init-user" name="-init-project"> 
    … …  
    7777                <isset property="javac.profile"/> 
    7878                <length length="0" string="${javac.profile}" when="greater"/> 
    79                 <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/> 
     79                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/> 
    8080            </and> 
    8181        </condition> 
    8282        <condition property="do.archive"> 
    83             <or> 
    84                 <not> 
    85                     <istrue value="${jar.archive.disabled}"/> 
    86                 </not> 
    87                 <istrue value="${not.archive.disabled}"/> 
    88             </or> 
     83            <not> 
     84                <istrue value="${jar.archive.disabled}"/> 
     85            </not> 
    8986        </condition> 
    9087        <condition property="do.mkdist"> 
    … …  
    157154        <property name="source.encoding" value="${file.encoding}"/> 
    158155        <property name="runtime.encoding" value="${source.encoding}"/> 
    159         <property name="manifest.encoding" value="${source.encoding}"/> 
    160156        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
    161157            <and> 
    … …  
    193189            </and> 
    194190        </condition> 
    195         <condition else="false" property="javac.fork"> 
    196             <or> 
    197                 <istrue value="${jdkBug6558476}"/> 
    198                 <istrue value="${javac.external.vm}"/> 
    199             </or> 
    200         </condition> 
     191        <property name="javac.fork" value="${jdkBug6558476}"/> 
    201192        <property name="jar.index" value="false"/> 
    202193        <property name="jar.index.metainf" value="${jar.index}"/> 
    … …  
    224215            <istrue value="${junit+testng.available}"/> 
    225216        </condition> 
    226         <property name="java.failonerror" value="true"/> 
    227217    </target> 
    228218    <target name="-post-init"> 
    … …  
    451441                </union> 
    452442                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 
    453                 <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="ScriptBuilder" testname="TestNG tests" workingDir="${work.dir}"> 
     443                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="ScriptBuilder_Repo" testname="TestNG tests" workingDir="${work.dir}"> 
    454444                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 
    455445                    <propertyset> 
    … …  
    602592                    <isset property="test.method"/> 
    603593                </condition> 
    604                 <condition else="-suitename ScriptBuilder -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> 
     594                <condition else="-suitename ScriptBuilder_Repo -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> 
    605595                    <matches pattern=".*\.xml" string="@{testClass}"/> 
    606596                </condition> 
    … …  
    701691                <property environment="env"/> 
    702692                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    703                 <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}"> 
     693                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 
    704694                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    705695                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    … …  
    776766            <element name="customize" optional="true"/> 
    777767            <sequential> 
    778                 <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
     768                <java classname="@{classname}" dir="${work.dir}" fork="true"> 
    779769                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    780770                    <jvmarg line="${debug-args-line}"/> 
    … …  
    803793            <element name="customize" optional="true"/> 
    804794            <sequential> 
    805                 <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
     795                <java classname="@{classname}" dir="${work.dir}" fork="true"> 
    806796                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    807797                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
    … …  
    842832                </pathconvert> 
    843833                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    844                 <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
     834                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
    845835                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    846836                    <manifest> 
    … …  
    854844    <target name="-init-presetdef-jar"> 
    855845        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    856             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8"> 
     846            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> 
    857847                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    858848            </jar> 
    … …  
    894884    </target> 
    895885    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> 
    896         <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/> 
     886        <echo level="warn" message="Cycle detected: ScriptBuilder_Repo was already built"/> 
    897887    </target> 
    898888    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> 
    … …  
    977967    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> 
    978968        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 
    979         <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/> 
     969        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 
    980970    </target> 
    981971    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass"> 
    982         <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
     972        <manifest file="${tmp.manifest.file}" mode="update"> 
    983973            <attribute name="Main-Class" value="${main.class}"/> 
    984974        </manifest> 
    985975    </target> 
    986976    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile"> 
    987         <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
     977        <manifest file="${tmp.manifest.file}" mode="update"> 
    988978            <attribute name="Profile" value="${javac.profile}"/> 
    989979        </manifest> 
    … …  
    993983        <mkdir dir="${build.classes.dir}/META-INF"/> 
    994984        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 
    995         <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
     985        <manifest file="${tmp.manifest.file}" mode="update"> 
    996986            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 
    997987        </manifest> 
    … …  
    11881178        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    11891179        <startprofiler/> 
    1190         <antcall target="run-test-with-main"/> 
     1180        <antcal target="run-test-with-main"/> 
    11911181    </target> 
    11921182    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent"> 
    … …  
    12101200            </and> 
    12111201        </condition> 
    1212         <condition else="" property="bug5101868workaround" value="*.java"> 
    1213             <matches pattern="1\.[56](\..*)?" string="${java.version}"/> 
    1214         </condition> 
    1215         <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> 
     1202        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> 
    12161203            <classpath> 
    12171204                <path path="${javac.classpath}"/> 
    12181205            </classpath> 
    1219             <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> 
     1206            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}"> 
    12201207                <filename name="**/*.java"/> 
    12211208            </fileset> 
    … …  
    12911278    </target> 
    12921279    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    1293         <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/> 
     1280        <j2seproject3:test testincludes="**/*Test.java"/> 
    12941281    </target> 
    12951282    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
    … …  
    13791366    </target> 
    13801367    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> 
    1381         <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/> 
     1368        <echo level="warn" message="Cycle detected: ScriptBuilder_Repo was already built"/> 
    13821369    </target> 
    13831370    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> 

  • trunk/nbproject/genfiles.properties

    r4 r7  
    1 build.xml.data.CRC32=c690a94a 
    2 build.xml.script.CRC32=5682d7f4 
     1build.xml.data.CRC32=66ccbf9e 
     2build.xml.script.CRC32=7597bd4c 
    33build.xml.stylesheet.CRC32=8064a381@1.68.1.46 
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    6 nbproject/build-impl.xml.data.CRC32=c690a94a 
    7 nbproject/build-impl.xml.script.CRC32=1357f838 
    8 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 
     6nbproject/build-impl.xml.data.CRC32=66ccbf9e 
     7nbproject/build-impl.xml.script.CRC32=d1923e08 
     8nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46 

  • trunk/nbproject/project.properties

    r3 r7  
    11annotation.processing.enabled=true 
    22annotation.processing.enabled.in.editor=false 
    3 annotation.processing.processor.options= 
    43annotation.processing.processors.list= 
    54annotation.processing.run.all.processors=true 
    65annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output 
     6application.title=ScriptBuilder_Repo 
     7application.vendor=bryanmcguffin 
    78build.classes.dir=${build.dir}/classes 
    89build.classes.excludes=**/*.java,**/*.form 
    … …  
    2526# This directory is removed when the project is cleaned: 
    2627dist.dir=dist 
    27 dist.jar=${dist.dir}/ScriptBuilder.jar 
     28dist.jar=${dist.dir}/ScriptBuilder_Repo.jar 
    2829dist.javadoc.dir=${dist.dir}/javadoc 
     30endorsed.classpath= 
    2931excludes= 
    3032includes=** 

  • trunk/nbproject/project.xml

    r2 r7  
    44    <configuration> 
    55        <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> 
    6             <name>ScriptBuilder</name> 
     6            <name>ScriptBuilder_Repo</name> 
    77            <source-roots> 
    88                <root id="src.dir"/> 

  • trunk/src/event/editor/AudioPanel.java

    r1 r7  
    55import javax.swing.*; 
    66import scriptbuilder.structures.events.AudioEvent; 
    7 import scriptbuilder.structures.events.ScriptEventInterface; 
     7import scriptbuilder.structures.events.I_ScriptEvent; 
    88 
    99/** 
    … …  
    2626    } 
    2727 
    28     public void getEventObject(ScriptEventInterface sei) 
     28    public void getEventObject(I_ScriptEvent sei) 
    2929    { 
    3030        event = (AudioEvent) sei; 

  • trunk/src/event/editor/CADLogPanel.java

    r1 r7  
    44import java.util.Observable; 
    55import scriptbuilder.structures.events.CADEvent; 
    6 import scriptbuilder.structures.events.ScriptEventInterface; 
     6import scriptbuilder.structures.events.I_ScriptEvent; 
    77 
    88/** 
    … …  
    2929    } 
    3030 
    31     public void getEventObject(ScriptEventInterface sei) 
     31    public void getEventObject(I_ScriptEvent sei) 
    3232    { 
    3333        event = (CADEvent) sei; 

  • trunk/src/event/editor/CCTVPanel.java

    r1 r7  
    44import java.util.Observable; 
    55import scriptbuilder.structures.events.CCTVEvent; 
    6 import scriptbuilder.structures.events.ScriptEventInterface; 
     6import scriptbuilder.structures.events.I_ScriptEvent; 
    77 
    88/** 
    … …  
    6464    } 
    6565 
    66     public void getEventObject(ScriptEventInterface sei) 
     66    public void getEventObject(I_ScriptEvent sei) 
    6767    { 
    6868        event = (CCTVEvent) sei; 

  • trunk/src/event/editor/CHPRadioPanel.java

    r1 r7  
    3131    } 
    3232 
    33     public void getEventObject(ScriptEventInterface sei) 
     33    public void getEventObject(I_ScriptEvent sei) 
    3434    { 
    3535        event = (CHPRadioEvent) sei; 

  • trunk/src/event/editor/CMSEvaluationPanel.java

    r1 r7  
    77import javax.swing.event.TableModelListener; 
    88import scriptbuilder.structures.events.CMSEvaluationEvent; 
    9 import scriptbuilder.structures.events.ScriptEventInterface; 
     9import scriptbuilder.structures.events.I_ScriptEvent; 
    1010 
    1111/** 
    … …  
    3636    } 
    3737 
    38     public void getEventObject(ScriptEventInterface sei) 
     38    public void getEventObject(I_ScriptEvent sei) 
    3939    { 
    4040        event = (CMSEvaluationEvent) sei; 

  • trunk/src/event/editor/Editor.java

    r1 r7  
    392392    } 
    393393 
    394     public void addProperty(Properties property, ScriptEventInterface se) 
     394    public void addProperty(Properties property, I_ScriptEvent se) 
    395395    { 
    396396        try 
    … …  
    457457    } 
    458458 
    459     public void addProperty(Properties property, ScriptEventInterface se) 
     459    public void addProperty(Properties property, I_ScriptEvent se) 
    460460    { 
    461461        model.addProperty(property, se); 

  • trunk/src/event/editor/GenericEvaluationPanel.java

    r1 r7  
    77import javax.swing.event.TableModelEvent; 
    88import javax.swing.event.TableModelListener; 
    9 import scriptbuilder.structures.events.EvaluationEventInterface; 
    10 import scriptbuilder.structures.events.ScriptEventInterface; 
     9import scriptbuilder.structures.events.I_EvaluationEvent; 
     10import scriptbuilder.structures.events.I_ScriptEvent; 
    1111 
    1212/** 
    … …  
    1818 
    1919    private ActionListener removeListener; 
    20     private EvaluationEventInterface event; 
     20    private I_EvaluationEvent event; 
    2121    private JTable dialogTable; 
    2222 
    … …  
    3737    } 
    3838 
    39     public void getEventObject(ScriptEventInterface sei) 
     39    public void getEventObject(I_ScriptEvent sei) 
    4040    { 
    41         if (sei instanceof EvaluationEventInterface) 
     41        if (sei instanceof I_EvaluationEvent) 
    4242        { 
    43             event = (EvaluationEventInterface) sei; 
     43            event = (I_EvaluationEvent) sei; 
    4444            ArrayList<String> strs = event.getExpectedActions(); 
    4545            for (String s : strs) 

  • trunk/src/event/editor/MaintenanceRadioPanel.java

    r1 r7  
    2323    } 
    2424 
    25     public void getEventObject(ScriptEventInterface sei) 
     25    public void getEventObject(I_ScriptEvent sei) 
    2626    { 
    2727        event = (MaintenanceRadioEvent) sei; 

  • trunk/src/event/editor/ParamicsPanel.java

    r1 r7  
    66import javax.swing.JCheckBox; 
    77import scriptbuilder.structures.events.ParamicsEvent; 
    8 import scriptbuilder.structures.events.ScriptEventInterface; 
     8import scriptbuilder.structures.events.I_ScriptEvent; 
    99 
    1010/** 
    … …  
    3131    } 
    3232 
    33     public void getEventObject(ScriptEventInterface sei) 
     33    public void getEventObject(I_ScriptEvent sei) 
    3434    { 
    3535        event = (ParamicsEvent) sei; 

  • trunk/src/event/editor/RemoveablePanel.java

    r1 r7  
    22 
    33import java.awt.event.*; 
    4 import scriptbuilder.structures.events.ScriptEventInterface; 
     4import scriptbuilder.structures.events.I_ScriptEvent; 
    55 
    66public interface RemoveablePanel 

  • trunk/src/event/editor/ScriptEventEditorPanel.java

    r1 r7  
    77 
    88import java.util.Observer; 
    9 import scriptbuilder.structures.events.ScriptEventInterface; 
     9import scriptbuilder.structures.events.I_ScriptEvent; 
    1010 
    1111/** 
    … …  
    1616{ 
    1717 
    18     void getEventObject(ScriptEventInterface sei); 
     18    void getEventObject(I_ScriptEvent sei); 
    1919} 

  • trunk/src/event/editor/TMTRadioPanel.java

    r1 r7  
    2323    } 
    2424 
    25     public void getEventObject(ScriptEventInterface sei) 
     25    public void getEventObject(I_ScriptEvent sei) 
    2626    { 
    2727        event = (TMTRadioEvent) sei; 

  • trunk/src/event/editor/TelephonePanel.java

    r1 r7  
    3333    } 
    3434 
    35     public void getEventObject(ScriptEventInterface sei) 
     35    public void getEventObject(I_ScriptEvent sei) 
    3636    { 
    3737        event = (TelephoneEvent) sei; 

  • trunk/src/event/editor/TowPanel.java

    r1 r7  
    33import java.awt.event.*; 
    44import java.util.Observable; 
    5 import scriptbuilder.structures.events.ScriptEventInterface; 
     5import scriptbuilder.structures.events.I_ScriptEvent; 
    66import scriptbuilder.structures.events.TowEvent; 
    77 
    … …  
    6060    } 
    6161 
    62     public void getEventObject(ScriptEventInterface sei) 
     62    public void getEventObject(I_ScriptEvent sei) 
    6363    { 
    6464        event = (TowEvent) sei; 

  • trunk/src/event/editor/UnitPanel.java

    r1 r7  
    33import java.awt.event.*; 
    44import java.util.Observable; 
    5 import scriptbuilder.structures.events.ScriptEventInterface; 
     5import scriptbuilder.structures.events.I_ScriptEvent; 
    66import scriptbuilder.structures.events.UnitEvent; 
    77 
    … …  
    4444    } 
    4545 
    46     public void getEventObject(ScriptEventInterface sei) 
     46    public void getEventObject(I_ScriptEvent sei) 
    4747    { 
    4848        event = (UnitEvent) sei; 

  • trunk/src/event/editor/WitnessPanel.java

    r1 r7  
    44import java.util.Observable; 
    55import java.util.StringTokenizer; 
    6 import scriptbuilder.structures.events.ScriptEventInterface; 
     6import scriptbuilder.structures.events.I_ScriptEvent; 
    77import scriptbuilder.structures.events.WitnessEvent; 
    88 
    … …  
    3131 
    3232     
    33     public void getEventObject(ScriptEventInterface sei) 
     33    public void getEventObject(I_ScriptEvent sei) 
    3434    { 
    3535        event = (WitnessEvent) sei; 

  • 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.