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

implemented adding of locos to train

Browse Source
This commit is contained in:
Stephan Richter
2020-10-27 18:29:17 +01:00
parent ad25dd8166
commit 7b8aea89f2
6 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/srsoftware/web4rail/tiles/Block.java
View File

@@ -105,11 +105,11 @@ public abstract class Block extends StretchableTile{
return getClass().getSimpleName()+"("+name+") @ ("+x+","+y+")";
}
public void train(Train newTrain) throws IOException {
if (train == newTrain) return;
public Tile train(Train newTrain) throws IOException {
if (train == newTrain) return this;
if (train != null) train.block(null); // vorherigen Zug rauswerfen
if (newTrain != null) newTrain.block(this);
super.train(newTrain);
return super.train(newTrain);
}
@Override

4
src/main/java/de/srsoftware/web4rail/tiles/Tile.java
View File

@@ -341,9 +341,9 @@ public abstract class Tile implements Constants{
return train;
}
public void train(Train train) throws IOException {
public Tile train(Train train) throws IOException {
this.train = train;
plan.place(this);
return plan.place(this);
}
public void unlock() throws IOException {

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

@@ -153,7 +153,7 @@ public abstract class Turnout extends Tile implements Device{
@Override
protected void onFailure(Reply reply) {
super.onFailure(reply);
plan.stream(t("Unable to switch {}: {}",this,reply.message()));
plan.stream(t("Unable to switch \"{}\": {}",Turnout.this,reply.message()));
}
}).reply();