Add scheduled tokens as first elements to token list then the other

waiting items.

sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/queue/FCFSQueue.java

@@ -215,14 +215,6 @@ public class FCFSQueue extends Queue {
 	@Override
 	public Marking saveMarking(Net net, Executor executor) {
 		List<QueuedTokenState> tokens = new LinkedList<QueuedTokenState>();
-		for (Token tk : waitingLine) {
-			QueuedTokenState curTkState = MarkingModelFactory.eINSTANCE.createQueuedTokenState();
-			curTkState.setColorName(tk.place.colors[tk.color]);
-			curTkState.setArrivalTime(tk.arrivTS);
-			curTkState.setSourcePlaceName(tk.place.name);
-			MarkingModelUtil.copyTokenData(net, tk, curTkState);
-			tokens.add(curTkState);
-		}
 		for (QueueEvent ev : executor.getEventQueue()) {
 			if (ev.queue == this) {
 				Token curTk = ev.token;				
@@ -235,6 +227,14 @@ public class FCFSQueue extends Queue {
 				tokens.add(curTkState);
 			}
 		}
+		for (Token tk : waitingLine) {
+			QueuedTokenState curTkState = MarkingModelFactory.eINSTANCE.createQueuedTokenState();
+			curTkState.setColorName(tk.place.colors[tk.color]);
+			curTkState.setArrivalTime(tk.arrivTS);
+			curTkState.setSourcePlaceName(tk.place.name);
+			MarkingModelUtil.copyTokenData(net, tk, curTkState);
+			tokens.add(curTkState);
+		}
 		Marking marking = MarkingModelFactory.eINSTANCE.createMarking();
 		marking.setElementName(name);
 		marking.setElementType(MarkingType.QUEUE);

sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/queue/PRIOQueue.java

@@ -167,14 +167,6 @@ public class PRIOQueue extends Queue {
 	@Override
 	public Marking saveMarking(Net net, Executor executor) {
 		List<QueuedTokenState> tokens = new LinkedList<QueuedTokenState>();
-		for (Token tk : priorityQueue) {
-			QueuedTokenState curTkState = MarkingModelFactory.eINSTANCE.createQueuedTokenState();
-			curTkState.setColorName(tk.place.colors[tk.color]);
-			curTkState.setArrivalTime(tk.arrivTS);
-			curTkState.setSourcePlaceName(tk.place.name);
-			MarkingModelUtil.copyTokenData(net, tk, curTkState);
-			tokens.add(curTkState);
-		}
 		for (QueueEvent ev : executor.getEventQueue()) {
 			if (ev.queue == this) {
 				Token curTk = ev.token;				
@@ -187,6 +179,14 @@ public class PRIOQueue extends Queue {
 				tokens.add(curTkState);
 			}
 		}
+		for (Token tk : priorityQueue) {
+			QueuedTokenState curTkState = MarkingModelFactory.eINSTANCE.createQueuedTokenState();
+			curTkState.setColorName(tk.place.colors[tk.color]);
+			curTkState.setArrivalTime(tk.arrivTS);
+			curTkState.setSourcePlaceName(tk.place.name);
+			MarkingModelUtil.copyTokenData(net, tk, curTkState);
+			tokens.add(curTkState);
+		}
 		Marking marking = MarkingModelFactory.eINSTANCE.createMarking();
 		marking.setElementName(name);
 		marking.setElementType(MarkingType.QUEUE);

sources/qpme.simqpn.kernel/src/de/tud/cs/simqpn/kernel/entities/queue/RANDOMQueue.java

@@ -187,14 +187,6 @@ public class RANDOMQueue extends Queue {
 	@Override
 	public Marking saveMarking(Net net, Executor executor) {
 		List<QueuedTokenState> tokens = new LinkedList<QueuedTokenState>();
-		for (Token tk : waitingLine) {
-			QueuedTokenState curTkState = MarkingModelFactory.eINSTANCE.createQueuedTokenState();
-			curTkState.setColorName(tk.place.colors[tk.color]);
-			curTkState.setArrivalTime(tk.arrivTS);
-			curTkState.setSourcePlaceName(tk.place.name);
-			MarkingModelUtil.copyTokenData(net, tk, curTkState);
-			tokens.add(curTkState);
-		}
 		for (QueueEvent ev : executor.getEventQueue()) {
 			if (ev.queue == this) {
 				Token curTk = ev.token;				
@@ -207,6 +199,14 @@ public class RANDOMQueue extends Queue {
 				tokens.add(curTkState);
 			}
 		}
+		for (Token tk : waitingLine) {
+			QueuedTokenState curTkState = MarkingModelFactory.eINSTANCE.createQueuedTokenState();
+			curTkState.setColorName(tk.place.colors[tk.color]);
+			curTkState.setArrivalTime(tk.arrivTS);
+			curTkState.setSourcePlaceName(tk.place.name);
+			MarkingModelUtil.copyTokenData(net, tk, curTkState);
+			tokens.add(curTkState);
+		}
 		Marking marking = MarkingModelFactory.eINSTANCE.createMarking();
 		marking.setElementName(name);
 		marking.setElementType(MarkingType.QUEUE);