bugfixes

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.3.72</version>
+	<version>1.3.73</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>

resources/css/style.css

@@ -78,21 +78,32 @@ svg.Relay rect{
 }
 
 svg.reserved polygon,
-svg.reserved rect:not(.sig_a):not(.sig_b){
+svg.reserved rect{
 	fill: yellow;
 }
 
 svg.locked polygon,
-svg.locked rect:not(.sig_a):not(.sig_b){
+svg.locked rect{
 	fill: lime;
 }
 
-.occupied .block,
 svg.occupied polygon,
-svg.occupied rect:not(.sig_a):not(.sig_b){
+svg.occupied rect{
 	fill: orange;
 }
 
+svg.preview circle,
+svg.preview line,
+svg.preview polygon,
+svg.preview rect{
+	fill:cyan;
+}
+
+svg rect.sig_a,
+svg rect.sig_b{
+	fill: inherit;
+}
+
 svg text{
 	font-size: 38px;
 	font-family: sans-serif;
@@ -365,18 +376,6 @@ textarea.json {
 	margin-left: 5%;
 }
 
-svg.preview circle,
-svg.preview line,
-svg.preview polygon,
-svg.preview rect{
-	fill:cyan;
-}
-
-svg.preview rect.sig_a,
-svg.preview rect.sig_b{
-	fill: inherit;
-}
-
 svg.Block text{
 	fill: black;
 }
@@ -431,4 +430,4 @@ svg.Block text{
 }
 .Switch.on rect.enabled{
 	fill: forestgreen;	
-}
+}

src/main/java/de/srsoftware/web4rail/actions/ActionList.java

@@ -82,10 +82,6 @@ public class ActionList extends Action implements Iterable<Action>{
 
 	public boolean fire(Context context,Object cause) {
 		for (Action action : actions) {
-			if (context.invalidated()) {
-				LOG.debug("Context has been invalidated, aborting {}",this);
-				return false;
-			}
 			LOG.debug("firing \"{}\"",action);
 			if (!action.fire(context,cause)) {
 				LOG.warn("{} failed",action);

src/main/java/de/srsoftware/web4rail/actions/PreserveRoute.java

@@ -13,6 +13,7 @@ public class PreserveRoute extends Action {
 
 	@Override
 	public boolean fire(Context context,Object cause) {
+		if (context.invalidated()) return false;
 		Train train = context.train();
 		Route route = context.route();
 		// These are errors:

src/main/java/de/srsoftware/web4rail/actions/SetSignal.java

@@ -35,6 +35,7 @@ public class SetSignal extends Action {
 	
 	@Override
 	public boolean fire(Context context,Object cause) {
+		if (context.invalidated()) return false;
 		if (isNull(signal)) return false;
 		return signal.state(state);
 	}

src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java

@@ -27,6 +27,7 @@ public class SetSpeed extends Action{
 	
 	@Override
 	public boolean fire(Context context,Object cause) {
+		if (context.invalidated()) return false;
 		if (isNull(context.train())) return false;
 		context.train().setSpeed(speed);
 		return true;

src/main/java/de/srsoftware/web4rail/actions/SetTurnout.java

@@ -26,6 +26,7 @@ public class SetTurnout extends Action {
 
 	@Override
 	public boolean fire(Context context,Object cause) {
+		if (context.invalidated()) return false;
 		if (isNull(turnout)) return false;		
 		if (!turnout.state(state).succeeded()) return false;
 		if (turnout.address() == 0) return true;

src/main/java/de/srsoftware/web4rail/moving/Train.java

@@ -570,7 +570,10 @@ public class Train extends BaseClass implements Comparable<Train> {
 				});
 				if (json.has(BLOCK)) {// do not move this up! during set, other fields will be referenced!
 					currentBlock = (Block) plan.get(Id.from(json, BLOCK), false);
-					if (isSet(currentBlock)) currentBlock.add(Train.this, direction);
+					if (isSet(currentBlock)) {
+						currentBlock.setTrain(Train.this);
+						currentBlock.add(Train.this, direction);
+					}
 				}
 			}
 		};

src/main/java/de/srsoftware/web4rail/threads/BrakeProcess.java

@@ -41,9 +41,9 @@ public class BrakeProcess extends BaseClass implements Runnable{
 			lastSpeed = train.speed;
 			updateDistance();
 			if (lastSpeed > targetSpeed) lastSpeed -= 10;
-			if (lastSpeed < targetSpeed && (ended = true)) lastSpeed = targetSpeed;
 			if (ended) break;
-			if (lastSpeed != train.speed) train.setSpeed(lastSpeed);
+			if (lastSpeed <= targetSpeed && (ended = true)) lastSpeed = targetSpeed;
+			train.setSpeed(lastSpeed);
 		}
 	}