diff --git a/pom.xml b/pom.xml index 1a6954d..742e34c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.11.10 + 0.11.11 Web4Rail jar Java Model Railway Control diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index f8a2bc1..df37413 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -48,7 +48,7 @@ import de.srsoftware.web4rail.tiles.Turnout.State; * @author Stephan Richter, SRSoftware * */ -public class Route extends BaseClass{ +public class Route extends BaseClass implements Comparable{ private static final Logger LOG = LoggerFactory.getLogger(Route.class); private static final String ACTION_LISTS = "action_lists"; @@ -295,6 +295,11 @@ public class Route extends BaseClass{ clone.path = new Vector<>(path); return clone; } + + @Override + public int compareTo(Route other) { + return name().compareTo(other.name()); + } public void complete() { if (contacts.size()>1) { // mindestens 2 Kontakte: erster Kontakt aktiviert Block, vorletzter Kontakt leitet Bremsung ein diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java index b1f13d4..5776238 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Train.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java @@ -259,6 +259,7 @@ public class Train extends BaseClass implements Comparable { public String directedName() { String result = name(); + if (isSet(autopilot)) result="•"+result; if (isNull(direction)) return result; switch (direction) { case NORTH: diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java index 92901d0..1ee88fd 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Scanner; +import java.util.TreeSet; import java.util.Vector; import org.json.JSONObject; @@ -60,7 +61,7 @@ public abstract class Tile extends BaseClass{ private int length = DEFAUT_LENGTH; protected Direction oneWay = null; protected Route route = null; - private HashSet routes = new HashSet<>(); + private TreeSet routes = new TreeSet<>(); protected HashSet shadows = new HashSet<>(); protected Train train = null; public Integer x = null; @@ -277,7 +278,7 @@ public abstract class Tile extends BaseClass{ return route; } - public HashSet routes() { + public TreeSet routes() { return routes; }