bugfixes

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

@@ -38,7 +38,9 @@ public class DelayedAction extends ActionList {
 			@Override	
 			public void execute() {
 				LOG.debug("{} ms passed by, firing actions:",delay);
+				if (context.invalidated()) return;
 				DelayedAction.super.fire(context,cause);
+				plan.alter();
 			}
 		};
 		return true;		

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

@@ -24,7 +24,7 @@ public class DetermineTrainInBlock extends Action {
 	@Override
 	public boolean fire(Context context,Object cause) {
 		context.block(block);
-		context.train(block.train());		
+		context.train(block.occupyingTrain());		
 		return true;
 	}
 	

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

@@ -8,13 +8,13 @@ import org.json.JSONObject;
 
 import de.srsoftware.tools.Tag;
 import de.srsoftware.web4rail.BaseClass;
+import de.srsoftware.web4rail.EventListener;
 import de.srsoftware.web4rail.LoadCallback;
 import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Input;
 import de.srsoftware.web4rail.tags.Window;
 import de.srsoftware.web4rail.threads.DelayedExecution;
 import de.srsoftware.web4rail.tiles.Contact;
-import de.srsoftware.web4rail.tiles.Contact.Listener;
 import de.srsoftware.web4rail.tiles.Tile;
 
 public class WaitForContact extends ActionList {
@@ -35,9 +35,9 @@ public class WaitForContact extends ActionList {
 		LOG.debug("{}.fire(...) called, waiting for {}.",this,contact);
 		if (isNull(contact)) return false;
 		fired = false;
-		Listener listener = new Listener() {
+		EventListener listener = new EventListener() {
 			@Override
-			public void fired(Object cause) {
+			public void fire() {
 				LOG.debug("{} triggered, firing {}",contact,actions);
 				fired = true;
 				contact.removeListener(this);