minor fixes
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.32</version>
|
||||
<version>1.4.33</version>
|
||||
<name>Web4Rail</name>
|
||||
<packaging>jar</packaging>
|
||||
<description>Java Model Railway Control</description>
|
||||
|
||||
@@ -713,6 +713,7 @@ public class Route extends BaseClass {
|
||||
});
|
||||
nextRoutePrepper.onFail(() -> {
|
||||
LOG.debug("preparing route next to {} failed, resetting.",this);
|
||||
if (isNull(nextRoutePrepper)) return;
|
||||
Route rt = nextRoutePrepper.route(); // Nachfolgeroute kann ja schon reserviert sein, oder gar schon teilweise vorbereitet!
|
||||
if (isSet(rt)) rt.resetIgnoring(this); // angefangene Route freigeben ohne Teile der aktuellen Route freizugeben
|
||||
nextRoutePrepper = null;
|
||||
|
||||
@@ -478,9 +478,13 @@ public abstract class Block extends StretchableTile{
|
||||
|
||||
@Override
|
||||
public String title() {
|
||||
return name;
|
||||
StringBuilder sb = new StringBuilder(name);
|
||||
Train occupyingTrain = occupyingTrain();
|
||||
if (isSet(occupyingTrain)) sb.append(title(occupyingTrain));
|
||||
if (isSet(parkedTrains)) for (Train parked : parkedTrains.trains) sb.append(title(parked));
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return name + " @ ("+x+","+y+")";
|
||||
|
||||
@@ -531,8 +531,34 @@ public abstract class Tile extends BaseClass implements Comparable<Tile> {
|
||||
}
|
||||
|
||||
public String title() {
|
||||
return getClass().getSimpleName() + " @ (" + x + ", " + y + ")";
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append(getClass().getSimpleName());
|
||||
sb.append(" @ (");
|
||||
sb.append(x);
|
||||
sb.append(", ");
|
||||
sb.append(y);
|
||||
sb.append(")");
|
||||
if (isSet(occupyingTrain)) {
|
||||
sb.append("\n");
|
||||
sb.append(occupyingTrain);
|
||||
sb.append(":\n");
|
||||
occupyingTrain.cars().forEach(car -> sb.append("\t"+car+"\n"));
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
public String title(Train train) {
|
||||
StringBuilder sb = new StringBuilder("\n");
|
||||
sb.append(train);
|
||||
sb.append(" (");
|
||||
sb.append(train.length());
|
||||
sb.append(" ");
|
||||
sb.append(t(lengthUnit));
|
||||
sb.append("):\n");
|
||||
train.cars().forEach(car -> sb.append("\t"+car+"\n"));
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
|
||||
Reference in New Issue
Block a user