bugfixes
This commit is contained in:
2
pom.xml
2
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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user