X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=dsl%2Fruntime%2Fsrc%2Fnl%2Fru%2Fdes%2FMarsRover.java;h=8561c0a5db3249a32c5829fb8287258ec0139d9c;hb=c9506d94c22f96ba5ffea707f5040fcc9d6c3c3f;hp=41a5f902abc6124a8a12ae1ec6d49c775b95d8c0;hpb=d9e24efc7491c75496d20fbfd1e48954605ea301;p=des2015.git

diff --git a/dsl/runtime/src/nl/ru/des/MarsRover.java b/dsl/runtime/src/nl/ru/des/MarsRover.java
index 41a5f90..8561c0a 100644
--- a/dsl/runtime/src/nl/ru/des/MarsRover.java
+++ b/dsl/runtime/src/nl/ru/des/MarsRover.java
@@ -16,7 +16,7 @@ import lejos.robotics.subsumption.Arbitrator;
 
 public class MarsRover {
 	public static final float SAMPLERATE = 100;
-	public static LinkedList<Mission> missions = new LinkedList<Mission>();
+	public static Arbitrator arb;
 	
 	@SuppressWarnings("resource")
 	public static void main(String[] args) {
@@ -54,19 +54,11 @@ public class MarsRover {
 		ColorMemory colorMemory = new ColorMemory(color);
 		
 		Arbitrator a;
-		missions = Missions.getMissions(sensors, rightMotor, leftMotor, colorMemory);
+		LinkedList<Mission> missions = Missions.getMissions(sensors, rightMotor, leftMotor, colorMemory);
 		for(Mission m : missions){
 			LCDPrinter.print("Start " + m.name + " mission...");
 			a = new Arbitrator(m.behaviours);
-			m.SetArbitrator(a);
 			a.start();
 		}
 	}
-	
-	public static void FinishMission(String missionName){
-		Mission m = missions.stream().filter(o -> o.name.equalsIgnoreCase(missionName)).findFirst().get();
-		if(m != null){
-			m.arbitrator.stop();
-		}
-	}
 }
\ No newline at end of file