diff --git a/pom.xml b/pom.xml index 63089eb..2d7fea7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.11.27 + 0.11.28 Web4Rail jar Java Model Railway Control diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index 7fafef5..976db2a 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -55,6 +55,7 @@ FreeStartBlock : Start-Block freigeben Hardware settings : Hardware-Einstellungen Height : Höhe Help : Hilfe +(id: {}, length: {}) : (Id: {}, Länge: {}) if ({})\: : falls ({}): inverted : invertiert learn : lernen diff --git a/src/main/java/de/srsoftware/web4rail/moving/Car.java b/src/main/java/de/srsoftware/web4rail/moving/Car.java index 759fd33..4d836f2 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Car.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Car.java @@ -41,7 +41,7 @@ public class Car extends BaseClass { private int id; private String name; public int length; - private String stockId = ""; + protected String stockId = ""; private Train train; protected Plan plan; @@ -84,7 +84,9 @@ public class Car extends BaseClass { Tag list = new Tag("ul"); for (Car car : cars.values()) { if (!(car instanceof Locomotive)) { - car.link("li").addTo(list); + Tag tag = car.link("li"); + if (isSet(car.stockId) && !car.stockId.isEmpty()) tag.content(NBSP+t("(id: {}, length: {})",car.stockId,car.length)); + tag.addTo(list); } } list.addTo(win); diff --git a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java index 05df195..2365b76 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java @@ -204,7 +204,10 @@ public class Locomotive extends Car implements Constants,Device{ for (Car car : cars.values()) { if (car instanceof Locomotive) { Locomotive loco = (Locomotive) car; - loco.link("li").addTo(list); + Tag tag = loco.link("li"); + if (isSet(loco.stockId) && !loco.stockId.isEmpty()) tag.content(NBSP+t("(id: {}, length: {})",loco.stockId,loco.length)); + tag.addTo(list); + } } list.addTo(win);