diff --git a/pom.xml b/pom.xml index b25d98b..967a4d1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.11.22 + 0.11.23 Web4Rail jar Java Model Railway Control diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index 3ac34c7..7fafef5 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -50,6 +50,7 @@ editable train properties : veränderliche Zug-Eigenschaften Emergency : Notfall Firing {} : starte {} FinishRoute : Route abschließen +Found {} routes. : {} Routen gefunden. FreeStartBlock : Start-Block freigeben Hardware settings : Hardware-Einstellungen Height : Höhe diff --git a/src/main/java/de/srsoftware/web4rail/Plan.java b/src/main/java/de/srsoftware/web4rail/Plan.java index 755a4da..0d05a7f 100644 --- a/src/main/java/de/srsoftware/web4rail/Plan.java +++ b/src/main/java/de/srsoftware/web4rail/Plan.java @@ -231,10 +231,7 @@ public class Plan extends BaseClass{ for (Connector con : block.startPoints()) routes.addAll(follow(new Route().begin(block,con.from.inverse()),con)); } for (Tile tile : tiles.values()) tile.routes().clear(); - for (Route route : routes) { - route.complete(); - registerRoute(route); - } + for (Route route : routes) registerRoute(route.complete()); return t("Found {} routes.",routes.size()); } diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index 6e9f8dd..f022d8b 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -309,7 +309,7 @@ public class Route extends BaseClass implements Comparable{ return name().compareTo(other.name()); } - public void complete() { + public Route complete() { if (contacts.size()>1) { // mindestens 2 Kontakte: erster Kontakt aktiviert Block, vorletzter Kontakt leitet Bremsung ein Contact nextToLastContact = contacts.get(contacts.size()-2); String trigger = nextToLastContact.trigger(); @@ -323,6 +323,7 @@ public class Route extends BaseClass implements Comparable{ } for (Signal signal : signals) setupActions.add(new SetSignal().set(signal).to(Signal.GO)); startActions.add(new SetSpeed().to(100)); + return this; } /**