added device table

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.1.8</version>
+	<version>1.1.9</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>

resources/css/style.css

@@ -288,6 +288,7 @@ fieldset.notes textarea{
 	min-width: 100%;
 }
 
+table.turnouts,
 table.brake-times{
 	border-collapse: collapse;
 }
@@ -302,4 +303,10 @@ table.brake-times tr > *{
 
 table.brake-times th{
 	border-width: 0 1px 1px;
+}
+
+.turnouts .group > *{
+	border-color: black;
+	border-style: solid;
+	border-width: 1px 0 0;
 }

resources/translations/Application.de.translation

@@ -14,6 +14,7 @@ add new car : neuen Waggon anlegen
 add new locomotive : neue Lok anlegen
 add new train : neuen Zug anlegen
 Add tile : Kachel hinzufügen
+Address : Adresse
 Address\: : Adresse:
 Analyze : analysieren
 Apply : Übernehmen
@@ -70,6 +71,7 @@ Drop : Verwerfen
 Dropped destination of {}. : Ziel von {} verworfen.
 1) Duration between 5 {} steps during brake process. : 1) Zeit zwischen 5 {}-Schritten beim Bremsvorgang.
 EAST : Osten
+Editable properties : veränderliche Eigenschaften
 editable train properties : veränderliche Zug-Eigenschaften
 Emergency : Notfall
 Faster (10 {}) : 10 {} schneller
@@ -94,6 +96,7 @@ Length : Länge
 length\: : Länge:
 length\: {} : Länge: {}
 Length unit : Längeneinheit
+Locked by {} : Durch {} besetzt
 Locomotive manager : Lok-Verwaltung
 Locomotives\: : Lokomotiven:
 Manage cars : Waggons verwalten
@@ -129,6 +132,7 @@ PushPullTrain : Wendezug
 Push-pull train : Wendezug
 quit autopilot : Autopilot beenden
 {} reached it`s destination! : {} ist am Ziel angekommen!
+Relay/Turnout : Relais/Weiche
 Report Issue : Problem melden
 RIGHT : rechts
 Right port\: : Port für rechts
@@ -198,6 +202,11 @@ TriggerContact : Kontakt auslösen
 Turn : Richtung wechseln
 Turn allowed : Wenden erlaubt
 {} turned. : {} gewendet.
+Turnout : Weiche
+TurnoutLE : WeicheLE
+TurnoutLW : WeicheLW
+TurnoutRE : WeicheRE
+TurnoutRW : WeicheRW
 Turnouts : Weichen
 TurnTrain : Fahrtrichtung umkehren
 turn within train : innerhalb des Zugs drehen

src/main/java/de/srsoftware/web4rail/Device.java

@@ -4,4 +4,6 @@ public interface Device {
 	public static final String ADDRESS = "address";
 	public static final String PORT = "port";
 	public static final String PROTOCOL = "proto";
+	
+	public int address();
 }

src/main/java/de/srsoftware/web4rail/Plan.java

@@ -9,6 +9,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.security.InvalidParameterException;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,6 +36,7 @@ import de.srsoftware.web4rail.tags.Div;
 import de.srsoftware.web4rail.tags.Form;
 import de.srsoftware.web4rail.tags.Input;
 import de.srsoftware.web4rail.tags.Label;
+import de.srsoftware.web4rail.tags.Table;
 import de.srsoftware.web4rail.tiles.Block;
 import de.srsoftware.web4rail.tiles.BlockH;
 import de.srsoftware.web4rail.tiles.BlockV;
@@ -601,6 +603,8 @@ public class Plan extends BaseClass{
 		}
 		
 		Window win = new Window("plan-properties", t("Properties"));
+		
+		new Tag("h4").content(t("Editable properties")).addTo(win);
 		Form form = new Form("plan-properties-form");
 		new Input(REALM,REALM_PLAN).hideIn(form);
 		new Input(ACTION,ACTION_UPDATE).hideIn(form);
@@ -608,6 +612,21 @@ public class Plan extends BaseClass{
 		new Input(SPEED_UNIT, speedUnit).addTo(new Label(t("Speed unit")+":"+NBSP)).addTo(form);
 		new Button(t("Save"), form).addTo(form);
 		form.addTo(win);
+		
+		new Tag("h4").content(t("turnout properties")).addTo(win);
+		Table table = new Table();
+		table.addHead(t("Address"),t("Relay/Turnout"));
+		tiles.values()
+			.stream()
+			.filter(tile -> tile instanceof Device )
+			.map(tile -> (Device) tile)
+			.sorted(Comparator.comparing(Device::address))
+			.forEach(turnout -> {
+				table.addRow(turnout.address(),turnout);
+				if (turnout.address() % 4 == 1) table.children().lastElement().clazz("group");
+			});
+		table.clazz("turnouts").addTo(win);
+		
 		return win;
 	}
 

src/main/java/de/srsoftware/web4rail/moving/Locomotive.java

@@ -76,6 +76,11 @@ public class Locomotive extends Car implements Constants,Device{
 		return t("Unknown action: {}",params.get(ACTION));
 	}
 	
+	@Override
+	public int address() {
+		return address;
+	}
+	
 	public static Tag cockpit(Object locoOrTrain) {
 		int id = 0;
 		int speed = 0;

src/main/java/de/srsoftware/web4rail/tiles/Relay.java

@@ -44,6 +44,10 @@ public class Relay extends Tile implements Device{
 	private static final String LABEL_B = "label_b";
 	private static final String NAME = "name";
 	
+	public int address() {
+		return address;
+	}
+	
 	@Override
 	public Object click() throws IOException {
 		Object o = super.click();

src/main/java/de/srsoftware/web4rail/tiles/Turnout.java

@@ -41,6 +41,10 @@ public abstract class Turnout extends Tile implements Device{
 		LEFT,STRAIGHT,RIGHT,UNDEF;
 	}
 	
+	public int address() {
+		return address;
+	}
+	
 	@Override
 	public Object click() throws IOException {
 		LOG.debug(getClass().getSimpleName()+".click()");