bugfixes

pom.xml

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

src/main/java/de/srsoftware/web4rail/BaseClass.java

@@ -135,7 +135,8 @@ public abstract class BaseClass implements Constants{
 		public String toString() {
 			StringBuffer sb = new StringBuffer(getClass().getSimpleName());
 			sb.append("(");
-			sb.append(t("Train: {}",train));
+			sb.append("main: "+main);
+			if (isSet(train)) sb.append(", "+t("Train: {}",train));
 			if (isSet(direction)) sb.append(", "+t("Direction: {}",direction));
 			if (isSet(block)) sb.append(", "+t("Block: {}",block));
 			if (isSet(route))   sb.append(", "+t("Route: {}",route));

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

@@ -91,7 +91,7 @@ public class ActionList extends Action implements Iterable<Action>{
 	}
 
 	public boolean fire(Context context) {
-		if (!isEmpty())	LOG.debug(t("Firing {}"),this);
+		if (!isEmpty())	LOG.debug(t("Firing {}"),actions);
 		for (Action action : actions) {
 			if (!action.fire(context)) return false;			
 		}

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

@@ -29,7 +29,7 @@ public class ConditionalAction extends ActionList {
 	@Override
 	public boolean fire(Context context) {
 		for (Condition condition : conditions) {
-			if (!condition.fulfilledBy(context)) return false;
+			if (!condition.fulfilledBy(context)) return true; // wenn die Bedingung nicht erfüllt ist, ist das kein Fehler!
 		}
 		return super.fire(context.clone()); // actions, that happen within the conditional action list must not modify the global context.
 	}

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

@@ -22,7 +22,9 @@ public class StartStopAuto extends Action {
 	@Override
 	public boolean fire(Context context) {
 		if (isNull(context.train())) return false;
-		context.train().quitAutopilot();
+		if (inverted) {
+			context.train().automatic();
+		} else context.train().quitAutopilot();
 		return true;
 	}
 	

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

@@ -193,7 +193,7 @@ public class Train extends BaseClass implements Comparable<Train> {
 		car.train(this);
 	}
 	
-	private String automatic() {
+	public String automatic() {
 		if (isNull(autopilot)) {
 			autopilot = new Autopilot();
 			autopilot.start();