diff --git a/pom.xml b/pom.xml index 320ffa1..ac705af 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.9.9 + 0.9.10 Web4Rail jar Java Model Railway Control diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index 0488b8b..e2ad8e1 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -51,4 +51,5 @@ TrainSelect : Zug-Auswahl Turn allowed : Wenden erlaubt Turnouts : Weichen TurnTrain : Fahrtrichtung umkehren -Unknown action\: {} : Unbekannte Aktion: {} \ No newline at end of file +Unknown action\: {} : Unbekannte Aktion: {} +unset : ungesetzt \ No newline at end of file diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java index 4b28e73..1cf421c 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Train.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java @@ -38,7 +38,7 @@ import de.srsoftware.web4rail.tags.Select; import de.srsoftware.web4rail.tiles.Block; import de.srsoftware.web4rail.tiles.Signal; -public class Train implements Constants { +public class Train implements Comparable,Constants { private static final Logger LOG = LoggerFactory.getLogger(Train.class); private static final HashMap trains = new HashMap<>(); @@ -229,8 +229,8 @@ public class Train implements Constants { return new Tag(tagClass).clazz("link").attr("onclick","train("+id+",'"+ACTION_PROPS+"')").content(name()); } - public static Collection list() { - return trains.values(); + public static TreeSet list() { + return new TreeSet(trains.values()); } public static void loadAll(String filename, Plan plan) throws IOException { @@ -514,4 +514,9 @@ public class Train implements Constants { return this; } + + @Override + public int compareTo(Object o) { + return name().compareTo(o.toString()); + } }