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

implemented correct behaviour of Train.stopNow

Browse Source
This commit is contained in:
Stephan Richter
2021-03-12 14:07:05 +01:00
parent a60e766dac
commit 2556ea7cd9
4 changed files with 10 additions and 6 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>1.3.55</version> <version>1.3.56</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>

6
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -386,7 +386,7 @@ public class Route extends BaseClass {
private void free() { private void free() {
for (Tile tile : path) { for (Tile tile : path) {
if (train.onTrace(tile)) { if (isSet(train) && train.onTrace(tile)) {
tile.setState(Status.OCCUPIED, train); tile.setState(Status.OCCUPIED, train);
} else tile.free(); } else tile.free();
} }
@@ -746,8 +746,8 @@ public class Route extends BaseClass {
public boolean reset() { public boolean reset() {
LOG.debug("{}.reset()",this); LOG.debug("{}.reset()",this);
free();
// TODO train = null;
return true; return true;
} }

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

@@ -932,7 +932,11 @@ public class Train extends BaseClass implements Comparable<Train> {
public Object stopNow() { public Object stopNow() {
setSpeed(0); setSpeed(0);
listeners.forEach(listener -> listener.on(Listener.Signal.STOP)); listeners.forEach(listener -> listener.on(Listener.Signal.STOP)); // abort PathFinder
if (isSet(route)) {
route.reset();
route = null;
}
return properties(); return properties();
} }

2
src/main/java/de/srsoftware/web4rail/tiles/Contact.java
View File

@@ -85,7 +85,7 @@ public class Contact extends Tile{
state = true; state = true;
if (isSet(timer)) timer.abort(); if (isSet(timer)) timer.abort();
Context context = new Context(this); Context context = new Context(this);
if (isSet(train)) { if (isSet(train())) {
train.contact(this); train.contact(this);
context.train(train); context.train(train);
} }