This commit is contained in:
Stephan Richter
2020-11-13 10:26:49 +01:00
parent c046d999fb
commit fb61b7b033
4 changed files with 11 additions and 4 deletions

View File

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

View File

@@ -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<Route>{
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

View File

@@ -259,6 +259,7 @@ public class Train extends BaseClass implements Comparable<Train> {
public String directedName() {
String result = name();
if (isSet(autopilot)) result=""+result;
if (isNull(direction)) return result;
switch (direction) {
case NORTH:

View File

@@ -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<Route> routes = new HashSet<>();
private TreeSet<Route> routes = new TreeSet<>();
protected HashSet<Shadow> 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<Route> routes() {
public TreeSet<Route> routes() {
return routes;
}