From fa87201ef8a3a9ef6e77c7372e95ac61c3e0d0f9 Mon Sep 17 00:00:00 2001
From: Stephan Richter <github@keawe.de>
Date: Sun, 4 Apr 2021 18:53:53 +0200
Subject: [PATCH] bugfixes

---
 pom.xml                                                  | 2 +-
 resources/translations/Application.de.translation        | 5 +++--
 src/main/java/de/srsoftware/web4rail/MaintnanceTask.java | 2 +-
 src/main/java/de/srsoftware/web4rail/moving/Car.java     | 7 +++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e70a6c..425ec20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.srsoftware</groupId>
 	<artifactId>web4rail</artifactId>
-	<version>1.4.15</version>
+	<version>1.4.16</version>
 	<name>Web4Rail</name>
 	<packaging>jar</packaging>
 	<description>Java Model Railway Control</description>
diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation
index 4293612..d0f422a 100644
--- a/resources/translations/Application.de.translation
+++ b/resources/translations/Application.de.translation
@@ -152,7 +152,7 @@ Enter new name for plan : Neuen Namen für den Plan eingeben
 executed : ausgeführt
 extended address : erweiterte Adresse
 export : exportieren
-Faster (10 {}) : 10 {} schneller
+Faster ({} {}) : {} {} schneller
 Final speed after breaking, before halting : Endgeschwindigkeit nach Bremsvorgang, vor dem Anhalten
 FinishRoute : Route abschließen
 Firing {} : starte {}
@@ -323,7 +323,7 @@ Signals : Signale
 simplify all names : alle Namen vereinfachen
 simplify name : Name vereinfachen
 Simulating movement of {}... : Simuliere Fahrt von {}...
-Slower (10 {}) : 10 {} langsamer
+Slower ({} {}) : {} {} langsamer
 SOUTH : Süden
 Speed unit : Geschwindigkeits-Einheit
 Split behind : Nach 
@@ -360,6 +360,7 @@ SYSTEM : Betriebssystem
 Tag : Markierung
 Tags : Markierungen
 Task : Aufgabe
+Task name must not be empty : Aufgaben-Name darf nicht leer sein
 Task type : Aufgabe
 Text to display on clients : Text, welcher auf den Clients angezeigt werden soll
 Text to show on display : Text, welcher in der Anzeige dargestellt werden soll
diff --git a/src/main/java/de/srsoftware/web4rail/MaintnanceTask.java b/src/main/java/de/srsoftware/web4rail/MaintnanceTask.java
index 7fd4ae6..2a6d2a8 100644
--- a/src/main/java/de/srsoftware/web4rail/MaintnanceTask.java
+++ b/src/main/java/de/srsoftware/web4rail/MaintnanceTask.java
@@ -63,6 +63,7 @@ public class MaintnanceTask extends BaseClass{
 	
 	private static MaintnanceTask createTask(HashMap<String, String> params) {
 		String name = params.get(NAME);
+		if (isNull(name)||name.trim().isEmpty()) return null;
 		long interval = Long.parseLong(params.get(INTERVAL));
 		Car car = BaseClass.get(Id.from(params, REALM_CAR));
 		return new MaintnanceTask(car, name,interval);		
@@ -138,7 +139,6 @@ public class MaintnanceTask extends BaseClass{
 
 	public static AddSelect selector() {
 		AddSelect select = new AddSelect(NAME);
-		select.addOption(t("create new task type"));
 		tasks.forEach(task -> select.addOption(task));
 		return select;
 	}
diff --git a/src/main/java/de/srsoftware/web4rail/moving/Car.java b/src/main/java/de/srsoftware/web4rail/moving/Car.java
index b1618dc..22967d8 100644
--- a/src/main/java/de/srsoftware/web4rail/moving/Car.java
+++ b/src/main/java/de/srsoftware/web4rail/moving/Car.java
@@ -102,8 +102,11 @@ public class Car extends BaseClass implements Comparable<Car>{
 	}
 	
 	public Object addTask(MaintnanceTask newTask) {
-		tasks.add(newTask);
-		return properties();
+		if (isSet(newTask))	{
+			tasks.add(newTask);
+			return properties();
+		}
+		return properties(t("Task name must not be empty"));
 	}
 	
 	public Car clone() {