Changeset 24 in tmcsimulator-scriptbuilder for trunk

Timestamp:

07/28/2017 04:40:09 PM (9 years ago)

Author:

bmcguffin

Message:

 

Location:

trunk

Files:

• nbproject/project.properties (modified) (1 diff)
• src/scriptbuilder/structures/ScriptIncident.java (modified) (1 diff)
• src/scriptbuilder/structures/SimulationScript.java (modified) (1 diff)

trunk/nbproject/project.properties

@@ -60 +60 @@
 javac.classpath=\
     ${file.reference.junit-3.8.2.jar}:\
-    ${libs.swing-layout.classpath}:\
-    ${libs.Hamcrest.classpath}
+    ${libs.Hamcrest.classpath}:\
+    ${libs.swing-layout.classpath}
 annotation.processing.enabled.in.editor=false
 build.generated.sources.dir=${build.dir}/generated-sources

trunk/src/scriptbuilder/structures/ScriptIncident.java

@@ -172 +172 @@
         {
             //System.out.println("Generating new slice at time " + start);
-            t = new TimeSlice(start);
+            t = new TimeSlice(start, this);
             t.addEvent(ev);
             slices.put(start, t);

trunk/src/scriptbuilder/structures/SimulationScript.java

@@ -6 +6 @@
 import java.util.List;
 import java.util.Observable;
-import java.util.Observer;
 import java.util.Random;
 import java.util.Vector;