Index: trunk/nbproject/genfiles.properties
===================================================================
--- trunk/nbproject/genfiles.properties	(revision 4)
+++ trunk/nbproject/genfiles.properties	(revision 7)
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=c690a94a
-build.xml.script.CRC32=5682d7f4
+build.xml.data.CRC32=66ccbf9e
+build.xml.script.CRC32=7597bd4c
 build.xml.stylesheet.CRC32=8064a381@1.68.1.46
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=c690a94a
-nbproject/build-impl.xml.script.CRC32=1357f838
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
+nbproject/build-impl.xml.data.CRC32=66ccbf9e
+nbproject/build-impl.xml.script.CRC32=d1923e08
+nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
Index: trunk/nbproject/build-impl.xml
===================================================================
--- trunk/nbproject/build-impl.xml	(revision 4)
+++ trunk/nbproject/build-impl.xml	(revision 7)
@@ -20,5 +20,5 @@
 
         -->
-<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">
+<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">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
@@ -47,6 +47,6 @@
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.6"/>
-        <property name="default.javac.target" value="1.6"/>
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
@@ -77,14 +77,11 @@
                 <isset property="javac.profile"/>
                 <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
             </and>
         </condition>
         <condition property="do.archive">
-            <or>
-                <not>
-                    <istrue value="${jar.archive.disabled}"/>
-                </not>
-                <istrue value="${not.archive.disabled}"/>
-            </or>
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
         </condition>
         <condition property="do.mkdist">
@@ -157,5 +154,4 @@
         <property name="source.encoding" value="${file.encoding}"/>
         <property name="runtime.encoding" value="${source.encoding}"/>
-        <property name="manifest.encoding" value="${source.encoding}"/>
         <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
             <and>
@@ -193,10 +189,5 @@
             </and>
         </condition>
-        <condition else="false" property="javac.fork">
-            <or>
-                <istrue value="${jdkBug6558476}"/>
-                <istrue value="${javac.external.vm}"/>
-            </or>
-        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
@@ -224,5 +215,4 @@
             <istrue value="${junit+testng.available}"/>
         </condition>
-        <property name="java.failonerror" value="true"/>
     </target>
     <target name="-post-init">
@@ -451,5 +441,5 @@
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <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}">
+                <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}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
@@ -602,5 +592,5 @@
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename ScriptBuilder -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename ScriptBuilder_Repo -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
@@ -701,5 +691,5 @@
                 <property environment="env"/>
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
+                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>
@@ -776,5 +766,5 @@
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
@@ -803,5 +793,5 @@
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
@@ -842,5 +832,5 @@
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <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}">
+                <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}">
                     <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
@@ -854,5 +844,5 @@
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
                 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
@@ -894,5 +884,5 @@
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/>
+        <echo level="warn" message="Cycle detected: ScriptBuilder_Repo was already built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
@@ -977,13 +967,13 @@
     <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
+        <manifest file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
+        <manifest file="${tmp.manifest.file}" mode="update">
             <attribute name="Profile" value="${javac.profile}"/>
         </manifest>
@@ -993,5 +983,5 @@
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
+        <manifest file="${tmp.manifest.file}" mode="update">
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
@@ -1188,5 +1178,5 @@
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <startprofiler/>
-        <antcall target="run-test-with-main"/>
+        <antcal target="run-test-with-main"/>
     </target>
     <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
@@ -1210,12 +1200,9 @@
             </and>
         </condition>
-        <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-        </condition>
-        <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}">
+        <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}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1291,5 +1278,5 @@
     </target>
     <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
+        <j2seproject3:test testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
@@ -1379,5 +1366,5 @@
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/>
+        <echo level="warn" message="Cycle detected: ScriptBuilder_Repo was already built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
Index: trunk/nbproject/project.properties
===================================================================
--- trunk/nbproject/project.properties	(revision 3)
+++ trunk/nbproject/project.properties	(revision 7)
@@ -1,8 +1,9 @@
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=ScriptBuilder_Repo
+application.vendor=bryanmcguffin
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
@@ -25,6 +26,7 @@
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/ScriptBuilder.jar
+dist.jar=${dist.dir}/ScriptBuilder_Repo.jar
 dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
 excludes=
 includes=**
Index: trunk/nbproject/project.xml
===================================================================
--- trunk/nbproject/project.xml	(revision 2)
+++ trunk/nbproject/project.xml	(revision 7)
@@ -4,5 +4,5 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>ScriptBuilder</name>
+            <name>ScriptBuilder_Repo</name>
             <source-roots>
                 <root id="src.dir"/>
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<ELEMENT, ScriptEventInterface> eventMap;
+    private TreeMap<ELEMENT, I_ScriptEvent> 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<Integer, ScriptIncident>();
-        eventMap = new TreeMap<ELEMENT, ScriptEventInterface>();
+        eventMap = new TreeMap<ELEMENT, I_ScriptEvent>();
         pcData = new TreeMap<ELEMENT, String>();
         docPosition = new Stack<ELEMENT>();
@@ -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<ScriptEventInterface> events;
+    public List<I_ScriptEvent> events;
     //Absolute start time of this time slice
     private int seconds;
@@ -36,5 +36,5 @@
     {
         this.seconds = seconds;
-        events = new ArrayList<ScriptEventInterface>();
+        events = new ArrayList<I_ScriptEvent>();
     }
 
@@ -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/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/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/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<String> 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/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<String> 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/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/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,
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/event/editor/CADLogPanel.java
===================================================================
--- trunk/src/event/editor/CADLogPanel.java	(revision 1)
+++ trunk/src/event/editor/CADLogPanel.java	(revision 7)
@@ -4,5 +4,5 @@
 import java.util.Observable;
 import scriptbuilder.structures.events.CADEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -29,5 +29,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CADEvent) sei;
Index: trunk/src/event/editor/CHPRadioPanel.java
===================================================================
--- trunk/src/event/editor/CHPRadioPanel.java	(revision 1)
+++ trunk/src/event/editor/CHPRadioPanel.java	(revision 7)
@@ -31,5 +31,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CHPRadioEvent) sei;
Index: trunk/src/event/editor/WitnessPanel.java
===================================================================
--- trunk/src/event/editor/WitnessPanel.java	(revision 1)
+++ trunk/src/event/editor/WitnessPanel.java	(revision 7)
@@ -4,5 +4,5 @@
 import java.util.Observable;
 import java.util.StringTokenizer;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 import scriptbuilder.structures.events.WitnessEvent;
 
@@ -31,5 +31,5 @@
 
     
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (WitnessEvent) sei;
Index: trunk/src/event/editor/ParamicsPanel.java
===================================================================
--- trunk/src/event/editor/ParamicsPanel.java	(revision 1)
+++ trunk/src/event/editor/ParamicsPanel.java	(revision 7)
@@ -6,5 +6,5 @@
 import javax.swing.JCheckBox;
 import scriptbuilder.structures.events.ParamicsEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -31,5 +31,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (ParamicsEvent) sei;
Index: trunk/src/event/editor/MaintenanceRadioPanel.java
===================================================================
--- trunk/src/event/editor/MaintenanceRadioPanel.java	(revision 1)
+++ trunk/src/event/editor/MaintenanceRadioPanel.java	(revision 7)
@@ -23,5 +23,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (MaintenanceRadioEvent) sei;
Index: trunk/src/event/editor/AudioPanel.java
===================================================================
--- trunk/src/event/editor/AudioPanel.java	(revision 1)
+++ trunk/src/event/editor/AudioPanel.java	(revision 7)
@@ -5,5 +5,5 @@
 import javax.swing.*;
 import scriptbuilder.structures.events.AudioEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -26,5 +26,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (AudioEvent) sei;
Index: trunk/src/event/editor/GenericEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/GenericEvaluationPanel.java	(revision 1)
+++ trunk/src/event/editor/GenericEvaluationPanel.java	(revision 7)
@@ -7,6 +7,6 @@
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import scriptbuilder.structures.events.EvaluationEventInterface;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_EvaluationEvent;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -18,5 +18,5 @@
 
     private ActionListener removeListener;
-    private EvaluationEventInterface event;
+    private I_EvaluationEvent event;
     private JTable dialogTable;
 
@@ -37,9 +37,9 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
-        if (sei instanceof EvaluationEventInterface)
+        if (sei instanceof I_EvaluationEvent)
         {
-            event = (EvaluationEventInterface) sei;
+            event = (I_EvaluationEvent) sei;
             ArrayList<String> strs = event.getExpectedActions();
             for (String s : strs)
Index: trunk/src/event/editor/Editor.java
===================================================================
--- trunk/src/event/editor/Editor.java	(revision 1)
+++ trunk/src/event/editor/Editor.java	(revision 7)
@@ -392,5 +392,5 @@
     }
 
-    public void addProperty(Properties property, ScriptEventInterface se)
+    public void addProperty(Properties property, I_ScriptEvent se)
     {
         try
@@ -457,5 +457,5 @@
     }
 
-    public void addProperty(Properties property, ScriptEventInterface se)
+    public void addProperty(Properties property, I_ScriptEvent se)
     {
         model.addProperty(property, se);
Index: trunk/src/event/editor/ScriptEventEditorPanel.java
===================================================================
--- trunk/src/event/editor/ScriptEventEditorPanel.java	(revision 1)
+++ trunk/src/event/editor/ScriptEventEditorPanel.java	(revision 7)
@@ -7,5 +7,5 @@
 
 import java.util.Observer;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -16,4 +16,4 @@
 {
 
-    void getEventObject(ScriptEventInterface sei);
+    void getEventObject(I_ScriptEvent sei);
 }
Index: trunk/src/event/editor/RemoveablePanel.java
===================================================================
--- trunk/src/event/editor/RemoveablePanel.java	(revision 1)
+++ trunk/src/event/editor/RemoveablePanel.java	(revision 7)
@@ -2,5 +2,5 @@
 
 import java.awt.event.*;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 public interface RemoveablePanel
Index: trunk/src/event/editor/CCTVPanel.java
===================================================================
--- trunk/src/event/editor/CCTVPanel.java	(revision 1)
+++ trunk/src/event/editor/CCTVPanel.java	(revision 7)
@@ -4,5 +4,5 @@
 import java.util.Observable;
 import scriptbuilder.structures.events.CCTVEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -64,5 +64,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CCTVEvent) sei;
Index: trunk/src/event/editor/TowPanel.java
===================================================================
--- trunk/src/event/editor/TowPanel.java	(revision 1)
+++ trunk/src/event/editor/TowPanel.java	(revision 7)
@@ -3,5 +3,5 @@
 import java.awt.event.*;
 import java.util.Observable;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 import scriptbuilder.structures.events.TowEvent;
 
@@ -60,5 +60,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (TowEvent) sei;
Index: trunk/src/event/editor/CMSEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/CMSEvaluationPanel.java	(revision 1)
+++ trunk/src/event/editor/CMSEvaluationPanel.java	(revision 7)
@@ -7,5 +7,5 @@
 import javax.swing.event.TableModelListener;
 import scriptbuilder.structures.events.CMSEvaluationEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -36,5 +36,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CMSEvaluationEvent) sei;
Index: trunk/src/event/editor/UnitPanel.java
===================================================================
--- trunk/src/event/editor/UnitPanel.java	(revision 1)
+++ trunk/src/event/editor/UnitPanel.java	(revision 7)
@@ -3,5 +3,5 @@
 import java.awt.event.*;
 import java.util.Observable;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 import scriptbuilder.structures.events.UnitEvent;
 
@@ -44,5 +44,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (UnitEvent) sei;
Index: trunk/src/event/editor/TelephonePanel.java
===================================================================
--- trunk/src/event/editor/TelephonePanel.java	(revision 1)
+++ trunk/src/event/editor/TelephonePanel.java	(revision 7)
@@ -33,5 +33,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (TelephoneEvent) sei;
Index: trunk/src/event/editor/TMTRadioPanel.java
===================================================================
--- trunk/src/event/editor/TMTRadioPanel.java	(revision 1)
+++ trunk/src/event/editor/TMTRadioPanel.java	(revision 7)
@@ -23,5 +23,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (TMTRadioEvent) sei;
Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 5)
+++ trunk/build.xml	(revision 7)
@@ -8,6 +8,6 @@
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="ScriptBuilder" default="default" basedir=".">
-    <description>Builds, tests, and runs the project ScriptBuilder.</description>
+<project name="ScriptBuilder_Repo" default="default" basedir=".">
+    <description>Builds, tests, and runs the project ScriptBuilder_Repo.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
@@ -59,5 +59,5 @@
     An example of overriding the target for project execution could look like this:
 
-        <target name="run" depends="ScriptBuilder-impl.jar">
+        <target name="run" depends="ScriptBuilder_Repo-impl.jar">
             <exec dir="bin" executable="launcher.exe">
                 <arg file="${dist.jar}"/>