diff --git a/pom.xml b/pom.xml index 23cc3cb..361d955 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.11.31 + 0.11.32 Web4Rail jar Java Model Railway Control diff --git a/src/main/java/de/srsoftware/web4rail/moving/Car.java b/src/main/java/de/srsoftware/web4rail/moving/Car.java index bc22e96..ee4ddf5 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Car.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Car.java @@ -103,7 +103,7 @@ public class Car extends BaseClass implements Comparable{ } public Tag link(String tagClass) { - return link(tagClass, Map.of(REALM,REALM_CAR,ID,id,ACTION,ACTION_PROPS), name()); + return link(tagClass, Map.of(REALM,REALM_CAR,ID,id,ACTION,ACTION_PROPS), name()+(stockId.isEmpty()?"":" "+t("(id: {}, length: {})",stockId,length))); } static Vector list() { @@ -143,11 +143,7 @@ public class Car extends BaseClass implements Comparable{ new Tag("h4").content(t("known cars")).addTo(win); Tag list = new Tag("ul"); for (Car car : new TreeSet(cars.values())) { - if (!(car instanceof Locomotive)) { - 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); - } + if (!(car instanceof Locomotive)) car.link("li").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 214afa5..b0eb92f 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java @@ -209,10 +209,7 @@ public class Locomotive extends Car implements Constants,Device{ for (Car car : new TreeSet(cars.values())) { if (car instanceof Locomotive) { Locomotive loco = (Locomotive) car; - 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); - + loco.link("li").addTo(list); } } list.addTo(win);