From 49185e79a25f4c6542f79dcaec578ca13c207b57 Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Thu, 10 Dec 2020 20:18:31 +0100
Subject: [PATCH] minor improvements

---
 pom.xml                                                   | 2 +-
 src/main/java/de/srsoftware/web4rail/Route.java           | 4 ++--
 .../java/de/srsoftware/web4rail/actions/ActionList.java   | 5 +++++
 src/main/java/de/srsoftware/web4rail/tiles/Contact.java   | 8 ++++++--
 src/main/java/de/srsoftware/web4rail/tiles/Relay.java     | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 661da07..2f86ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.2.39</version>
+	<version>1.2.40</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java
index 486baa7..d171039 100644
--- a/src/main/java/de/srsoftware/web4rail/Route.java
+++ b/src/main/java/de/srsoftware/web4rail/Route.java
@@ -347,7 +347,7 @@ public class Route extends BaseClass {
 			add(lastContact.trigger(), new BrakeStop(this)); 
 			add(lastContact.trigger(), new FinishRoute(this));
 		}
-		for (Signal signal : signals) add(ROUTE_SETUP,new SetSignal(this).set(signal).to(Signal.GO));
+		for (Signal signal : signals) add(ROUTE_START,new SetSignal(this).set(signal).to(Signal.GO));
 		add(ROUTE_START,new SetSpeed(this).to(999));
 		return this;
 	}
@@ -363,7 +363,7 @@ public class Route extends BaseClass {
 		LOG.debug("{} on {} activated {}.",train,this,contact);
 		traceTrainFrom(contact);
 		ActionList actions = triggeredActions.get(contact.trigger());
-		LOG.debug("Contact has id {} / trigger {} and is assigned with {}",contact.id(),contact.trigger(),actions);
+		LOG.debug("Contact has id {} / trigger {} and is assigned with {}",contact.id(),contact.trigger(),isNull(actions)?t("nothing"):actions);
 		if (isNull(actions)) return;
 		context.contact(contact);
 		actions.fire(context);
diff --git a/src/main/java/de/srsoftware/web4rail/actions/ActionList.java b/src/main/java/de/srsoftware/web4rail/actions/ActionList.java
index 163e9df..ae169ec 100644
--- a/src/main/java/de/srsoftware/web4rail/actions/ActionList.java
+++ b/src/main/java/de/srsoftware/web4rail/actions/ActionList.java
@@ -225,4 +225,9 @@ public class ActionList extends Action implements Iterable<Action>{
 		actions.remove(child);
 		super.removeChild(child);
 	}
+	
+	@Override
+	public String toString() {
+		return actions.toString();
+	}
 }
diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Contact.java b/src/main/java/de/srsoftware/web4rail/tiles/Contact.java
index 47d28a4..6b51c80 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/Contact.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/Contact.java
@@ -78,12 +78,16 @@ public class Contact extends Tile{
 			Context context = null;
 			if (isSet(route)) {
 				context = route.context();
+				actions.fire(context);
 				route.contact(this);
 			} else if (getClass() != Contact.class) {
 				plan.warn(this);	
 			}
-			if (isNull(context)) context = new Context(this);
-			actions.fire(context);
+			if (isNull(context)) {
+				context = new Context(this);
+				actions.fire(context);
+			}
+			
 			stream();
 		}
 	}
diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Relay.java b/src/main/java/de/srsoftware/web4rail/tiles/Relay.java
index 4b48e97..eff9165 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/Relay.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/Relay.java
@@ -174,7 +174,7 @@ public class Relay extends Tile implements Device{
 	public Reply state(boolean newState) {
 		Reply reply = init();
 		if (reply != null && !reply.succeeded()) return reply;
-		LOG.debug("Setting {} to {}",this,newState);
+		LOG.debug("Setting {} to {}",this,newState?1:0);
 		try {
 			String cmd = commandFor(newState);
 			return plan.queue(new Command(cmd) {