StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sorted locomotive list

Browse Source
This commit is contained in:
Stephan Richter
2020-11-01 19:01:15 +01:00
parent efe93ff448
commit c790e8e8db
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

1
resources/translations/Application.de.translation
View File

@@ -52,3 +52,4 @@ Turn allowed : Wenden erlaubt
Turnouts : Weichen Turnouts : Weichen
TurnTrain : Fahrtrichtung umkehren TurnTrain : Fahrtrichtung umkehren
Unknown action\: {} : Unbekannte Aktion: {} Unknown action\: {} : Unbekannte Aktion: {}
unset : ungesetzt

11
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -38,7 +38,7 @@ import de.srsoftware.web4rail.tags.Select;
import de.srsoftware.web4rail.tiles.Block; import de.srsoftware.web4rail.tiles.Block;
import de.srsoftware.web4rail.tiles.Signal; 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 Logger LOG = LoggerFactory.getLogger(Train.class);
private static final HashMap<Integer, Train> trains = new HashMap<>(); private static final HashMap<Integer, Train> 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()); return new Tag(tagClass).clazz("link").attr("onclick","train("+id+",'"+ACTION_PROPS+"')").content(name());
} }
public static Collection<Train> list() { public static TreeSet<Train> list() {
return trains.values(); return new TreeSet<Train>(trains.values());
} }
public static void loadAll(String filename, Plan plan) throws IOException { public static void loadAll(String filename, Plan plan) throws IOException {
@@ -514,4 +514,9 @@ public class Train implements Constants {
return this; return this;
} }
@Override
public int compareTo(Object o) {
return name().compareTo(o.toString());
}
} }