diff --git a/pom.xml b/pom.xml index 9a3c8e4..22b2222 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 1.2.9 + 1.2.10 Web4Rail jar Java Model Railway Control diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index 6994b4b..2c3ecfd 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -108,7 +108,7 @@ Manage cars : Waggons verwalten Manage locos : Lokomotiven verwalten Manage trains : Züge verwalten Maximum Speed : Höchstgeschwindigkeit -Maximum train length\: : maximale Zug-Länge +Maximum train length : maximale Zug-Länge Minimum and maximum times (in Miliseconds) trains with the respective tag have to wait in this block. : Minamle und maximale Block-Haltezeit (in Millisekunden) für Züge mit der entsprchender Markierung. Move tiles : Kacheln verschieben name\: : Name: @@ -155,7 +155,7 @@ Select contact\: : Kotakt auswählen: Select display : Anzeige auswählen Select from plan : Auf Plan auswählen Select relay\: : Relais auswählen: -Select train: : Zug auswählen +Select train : Zug auswählen SendCommand : Kommando senden Send command "{}" to control unit : Kommando „{}“ an Zentrale senden Set {} as context : {} als Kontext setzen diff --git a/src/main/java/de/srsoftware/web4rail/actions/ActionList.java b/src/main/java/de/srsoftware/web4rail/actions/ActionList.java index ce10ecf..24510e7 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/ActionList.java +++ b/src/main/java/de/srsoftware/web4rail/actions/ActionList.java @@ -41,6 +41,7 @@ public class ActionList extends Action implements Iterable{ } public ActionList add(Action action) { + action.parent(this); actions.add(action); return this; } diff --git a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java index ab49412..1aa88a3 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java +++ b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java @@ -72,6 +72,7 @@ public class ConditionalAction extends ActionList { @Override public void removeChild(BaseClass child) { conditions.remove(child); + actions.remove(child); } @Override