Browse Source

minor fixes

lookup-tables
Stephan Richter 4 years ago
parent
commit
cb8d642ba7
  1. 2
      pom.xml
  2. 1
      src/main/java/de/srsoftware/web4rail/Route.java
  3. 0
      src/main/java/de/srsoftware/web4rail/devices/Device.java
  4. 8
      src/main/java/de/srsoftware/web4rail/tiles/Block.java
  5. 28
      src/main/java/de/srsoftware/web4rail/tiles/Tile.java

2
pom.xml

@ -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>1.4.32</version> <version>1.4.33</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
src/main/java/de/srsoftware/web4rail/Route.java

@ -713,6 +713,7 @@ public class Route extends BaseClass {
}); });
nextRoutePrepper.onFail(() -> { nextRoutePrepper.onFail(() -> {
LOG.debug("preparing route next to {} failed, resetting.",this); 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! 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 if (isSet(rt)) rt.resetIgnoring(this); // angefangene Route freigeben ohne Teile der aktuellen Route freizugeben
nextRoutePrepper = null; nextRoutePrepper = null;

0
src/main/java/de/srsoftware/web4rail/Device.java → src/main/java/de/srsoftware/web4rail/devices/Device.java

8
src/main/java/de/srsoftware/web4rail/tiles/Block.java

@ -478,9 +478,13 @@ public abstract class Block extends StretchableTile{
@Override @Override
public String title() { 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 @Override
public String toString() { public String toString() {
return name + " @ ("+x+","+y+")"; return name + " @ ("+x+","+y+")";

28
src/main/java/de/srsoftware/web4rail/tiles/Tile.java

@ -531,8 +531,34 @@ public abstract class Tile extends BaseClass implements Comparable<Tile> {
} }
public String title() { 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 @Override
public String toString() { public String toString() {

Loading…
Cancel
Save