From d02f66ddffae20fe365a8ba0ea8013455cf3d722 Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Wed, 9 Dec 2020 08:58:02 +0100
Subject: [PATCH] Minor code improvements

---
 .gitignore                                         |  1 +
 .../java/de/srsoftware/web4rail/moving/Train.java  | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index fefddc6..570b5b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /bin/
 /target/
 /default.*
+/backup
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java
index d7d1476..bc2b0bb 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Train.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java
@@ -222,9 +222,8 @@ public class Train extends BaseClass implements Comparable<Train> {
 
 		for (Car car : this.cars) {
 			Tag li = new Tag("li");
-			car.link(car.name()+(car.stockId.isEmpty() ? "" : " ("+car.stockId+")")).addTo(li).content(NBSP);
-			Map<String, Object> params = Map.of(REALM,REALM_TRAIN,ID,id,ACTION,ACTION_DROP,CAR_ID,car.id());
-			new Button(t("delete"),params).addTo(li);
+			car.link(car.name()+(car.stockId.isEmpty() ? "" : " ("+car.stockId+")")).addTo(li).content(NBSP);			
+			button(t("delete"),Map.of(ACTION,ACTION_DROP,CAR_ID,car.id().toString())).addTo(li);
 			li.addTo(locoList);
 		}
 
@@ -411,10 +410,9 @@ public class Train extends BaseClass implements Comparable<Train> {
 		for (Locomotive loco : this.locos) {
 			Tag li = new Tag("li");
 			loco.link(loco.name()+(loco.stockId.isEmpty() ? "" : " ("+loco.stockId+")")).addTo(li);
-			Map<String, Object> props = Map.of(REALM,REALM_LOCO,ID,loco.id(),ACTION,ACTION_TURN);
-			new Button(t("turn within train"),props).addTo(li).addTo(locoList);
-			Map<String, Object> params = Map.of(REALM,REALM_TRAIN,ID,id,ACTION,ACTION_DROP,LOCO_ID,loco.id()+(loco.stockId.isEmpty()?"":" ("+loco.stockId+")"));
-			new Button(t("delete"),params).addTo(li);
+			loco.button(t("turn within train"),Map.of(ACTION,ACTION_TURN)).addTo(li);
+			button(t("delete"),Map.of(ACTION,ACTION_DROP,LOCO_ID,loco.id().toString())).addTo(li);
+			li.addTo(locoList);
 		}
 
 		Form addLocoForm = new Form("append-loco-form");
@@ -518,7 +516,7 @@ public class Train extends BaseClass implements Comparable<Train> {
 		locoList().addTo(propList);
 		carList().addTo(propList);
 		
-		if (isSet(currentBlock)) currentBlock.link("span",currentBlock.toString()).addTo(new Tag("li").content(t("Current location:")+NBSP)).addTo(propList);
+		if (isSet(currentBlock)) currentBlock.button(currentBlock.toString()).addTo(new Tag("li").content(t("Current location:")+NBSP)).addTo(propList);
 		if (isSet(direction)) new Tag("li").content(t("Direction: heading {}",direction)).addTo(propList);
 
 		Tag dest = new Tag("li").content(t("Destination:")+NBSP);