From efe93ff44878b46f6556803cb451f7804c30dd5d Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Sun, 1 Nov 2020 18:58:00 +0100
Subject: [PATCH] improved code related to tag condition

---
 pom.xml                                               |  2 +-
 resources/css/style.css                               |  2 +-
 resources/translations/Application.de.translation     |  1 +
 src/main/java/de/srsoftware/web4rail/Route.java       | 11 +++++++----
 .../web4rail/actions/ConditionalAction.java           |  5 +++--
 .../de/srsoftware/web4rail/conditions/Condition.java  |  8 +++-----
 .../srsoftware/web4rail/conditions/TrainHasTag.java   |  8 ++++----
 .../srsoftware/web4rail/conditions/TrainLength.java   |  8 ++++----
 .../srsoftware/web4rail/conditions/TrainSelect.java   |  7 ++++---
 9 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec76b3f..320ffa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>0.9.8</version>
+	<version>0.9.9</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/resources/css/style.css b/resources/css/style.css
index 9faf007..ed5fba5 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -220,7 +220,7 @@ fieldset{
 	background: red;
 }
 
-ul{
+h4,ul{
 	clear: both;
 }
 
diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation
index 350e92a..0488b8b 100644
--- a/resources/translations/Application.de.translation
+++ b/resources/translations/Application.de.translation
@@ -29,6 +29,7 @@ Properties of {} : Eigenschaften von {}
 Properties of {} @ ({},{}) : Eigenschaften von {} @ ({},{})
 Reduce speed to {} km/h : Geschwindigkeit auf {} km/h reduzieren
 Routes using this tile\: : Fahrstraßen, die diesen Abschnitt verwenden:
+Route will only be available to trains fulfilling all conditions. : Route ist nur für Züge verfügbar, die alle Bedingungen erfüllen.
 save : speichern
 Save plan : Plan speichern
 SetRelay : Relais schalten
diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java
index 0186af9..52bc377 100644
--- a/src/main/java/de/srsoftware/web4rail/Route.java
+++ b/src/main/java/de/srsoftware/web4rail/Route.java
@@ -32,6 +32,7 @@ import de.srsoftware.web4rail.actions.SetSpeed;
 import de.srsoftware.web4rail.conditions.Condition;
 import de.srsoftware.web4rail.moving.Train;
 import de.srsoftware.web4rail.tags.Button;
+import de.srsoftware.web4rail.tags.Fieldset;
 import de.srsoftware.web4rail.tags.Form;
 import de.srsoftware.web4rail.tags.Input;
 import de.srsoftware.web4rail.tiles.Block;
@@ -196,13 +197,15 @@ public class Route implements Constants{
 			list.addTo(win);
 		}
 
+		new Tag("div").content(t("Route will only be available to trains fulfilling all conditions.")).addTo(win);
 		Form form = new Form("action-prop-form-"+id);
+		Fieldset fieldset = new Fieldset(t("Add condition"));
 		new Input(REALM,REALM_ROUTE).hideIn(form);
 		new Input(ID,id()).hideIn(form);
 		new Input(ACTION,ACTION_UPDATE).hideIn(form);
 
-		Condition.selector().addTo(form);
-		new Button(t("Add condition"),form).addTo(form).addTo(win);
+		Condition.selector().addTo(fieldset);
+		new Button(t("Add condition"),form).addTo(fieldset).addTo(form).addTo(win);
 	}
 	
 	private void addContactsTo(Window win) {
@@ -475,8 +478,8 @@ public class Route implements Constants{
 	private void loadConditions(JSONArray arr) {
 		for (int i=0; i<arr.length(); i++) {
 			JSONObject json = arr.getJSONObject(i);
-			Condition condition = Condition.load(json);
-			if (condition != null) conditions.add(condition);
+			Condition condition = Condition.create(json.getString(TYPE));
+			if (condition != null) conditions.add(condition.load(json));
 		}
 	}
 	
diff --git a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java
index 74b004c..1c92377 100644
--- a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java
+++ b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java
@@ -74,8 +74,9 @@ public class ConditionalAction extends Action {
 		super.load(json);
 		for (Object o : json.getJSONArray(CONDITIONS)) {
 			if (o instanceof JSONObject) {
-				Condition condition = Condition.load((JSONObject)o);
-				if (condition != null) conditions.add(condition);
+				JSONObject j = (JSONObject) o;
+				Condition condition = Condition.create(j.getString(TYPE));
+				if (condition != null) conditions.add(condition.load(j));
 			}
 		}
 		actions = ActionList.load(json.getJSONArray(ACTIONS));
diff --git a/src/main/java/de/srsoftware/web4rail/conditions/Condition.java b/src/main/java/de/srsoftware/web4rail/conditions/Condition.java
index 54fd46b..97a9061 100644
--- a/src/main/java/de/srsoftware/web4rail/conditions/Condition.java
+++ b/src/main/java/de/srsoftware/web4rail/conditions/Condition.java
@@ -80,11 +80,9 @@ public abstract class Condition implements Constants {
 		return json;
 	}
 	
-	public static Condition load(JSONObject json) {
-		String type = json.getString(TYPE);
-		Condition condition = Condition.create(type);
-		if (condition != null) condition.inverted = json.has(INVERTED) && json.getBoolean(INVERTED);
-		return condition;
+	public Condition load(JSONObject json) {
+		inverted = json.has(INVERTED) && json.getBoolean(INVERTED);
+		return this;
 	}
 
 	public Tag link(String tagClass,String context) {
diff --git a/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java b/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java
index 695ddc3..b6dc232 100644
--- a/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java
+++ b/src/main/java/de/srsoftware/web4rail/conditions/TrainHasTag.java
@@ -25,10 +25,10 @@ public class TrainHasTag extends Condition {
 		return super.json().put(TAG, tag);
 	}
 	
-	public static TrainHasTag load(JSONObject json) {		
-		TrainHasTag tl = new TrainHasTag();
-		if (json.has(TAG)) tl.tag = json.getString(TAG);
-		return tl;
+	public Condition load(JSONObject json) {
+		super.load(json);
+		if (json.has(TAG)) tag = json.getString(TAG);
+		return this;
 	}
 
 	@Override
diff --git a/src/main/java/de/srsoftware/web4rail/conditions/TrainLength.java b/src/main/java/de/srsoftware/web4rail/conditions/TrainLength.java
index d169649..7d2e487 100644
--- a/src/main/java/de/srsoftware/web4rail/conditions/TrainLength.java
+++ b/src/main/java/de/srsoftware/web4rail/conditions/TrainLength.java
@@ -25,10 +25,10 @@ public class TrainLength extends Condition {
 		return super.json().put(MAX_LENGTH, maxLength);
 	}
 	
-	public static TrainLength load(JSONObject json) {		
-		TrainLength tl = new TrainLength();
-		if (json.has(MAX_LENGTH)) tl.maxLength = json.getInt(MAX_LENGTH);
-		return tl;
+	public Condition load(JSONObject json) {
+		super.load(json);
+		if (json.has(MAX_LENGTH)) maxLength = json.getInt(MAX_LENGTH);
+		return this;
 	}
 
 	@Override
diff --git a/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java b/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java
index eb1cb37..4a0232e 100644
--- a/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java
+++ b/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java
@@ -24,9 +24,10 @@ public class TrainSelect extends Condition {
 		return super.json().put(REALM_TRAIN, train.id);
 	}
 	
-	public static TrainSelect load(JSONObject json) {
-		int trainId = json.getInt(REALM_TRAIN);
-		return new TrainSelect().train(Train.get(trainId));		
+	public Condition load(JSONObject json) {
+		super.load(json);
+		train(Train.get(json.getInt(REALM_TRAIN)));
+		return this;
 	}
 	
 	@Override