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

bugfixes, added debug output

Browse Source
This commit is contained in:
Stephan Richter
2020-12-18 14:12:22 +01:00
parent 8fb23eec1a
commit 6d9a4d9120
12 changed files with 158 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/de/srsoftware/web4rail/tiles/Bridge.java
View File

@@ -66,12 +66,6 @@ public abstract class Bridge extends Tile {
return super.load(json);
}
public Tile set(Train train) {
super.set(train);
if (isSet(counterpart) && counterpart.train != train) counterpart.set(train);
return this;
}
@Override
public Tile setRoute(Route route) {
super.setRoute(route);
@@ -79,6 +73,12 @@ public abstract class Bridge extends Tile {
return this;
}
public Tile setTrain(Train train) {
super.setTrain(train);
if (isSet(counterpart) && counterpart.train != train) counterpart.setTrain(train);
return this;
}
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
Fieldset fieldset = new Fieldset(t("Counterpart"));
@@ -113,4 +113,11 @@ public abstract class Bridge extends Tile {
if (isNull(counterpart)) tag.clazz(tag.get("class")+" disconnected");
return tag;
}
@Override
public Tile unset(Route oldRoute) {
super.unset(oldRoute);
if (isSet(counterpart) && isSet(counterpart.route)) counterpart.unset(oldRoute);
return this;
}
}

1
src/main/java/de/srsoftware/web4rail/tiles/Signal.java
View File

@@ -32,6 +32,7 @@ public abstract class Signal extends Tile {
public abstract boolean isAffectedFrom(Direction dir);
public boolean state(String state) {
LOG.debug("{}.state({})",this,state);
this.state = state;
plan.place(this);
return true;

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

@@ -112,10 +112,46 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
plan.place(tile);
}
public boolean isFreeFor(Train newTrain) {
if (disabled) return false;
if (isSet(route) && isSet(route.train()) && route.train() != newTrain) return false;
if (isSet(train) && train != newTrain) return false;
public boolean isFreeFor(Context context) {
LOG.debug("{}.isFreeFor({})",this,context);
if (disabled) {
LOG.debug("{} is disabled!",this);
return false;
}
if (isNull(context)) {
if (isSet(train)) {
LOG.debug("{} is occupied by {}",this,train);
return false;
}
if (isSet(route)) {
LOG.debug("{} is occupied by {}",this,route);
return false;
}
}
if (isSet(train)) {
boolean free = train == context.train(); // during train.reserveNext, we may encounter, parts, that are already reserved by the respective train, but having another route. do not compare routes in that case!
if (free) {
LOG.debug("already reserved by {} → true",train);
} else {
LOG.debug("occupied by {} → false",train);
}
return free;
}
// if we get here, the tile is not occupied by a train, but reserved by a route, yet. thus, the tile is not available for another route
if (isSet(route) && route != context.route()) {
LOG.debug("reserved by other route: {}",route);
if (isSet(route.train())) {
if (route.train() == context.train()) {
LOG.debug("that route is used by {}, which is also requesting this tile → true",route.train());
return true;
}
}
LOG.debug("{}.route.train = {} → false",this,route.train());
return false;
}
LOG.debug("free");
return true;
}
@@ -179,6 +215,19 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
return this;
}
public boolean move(int dx, int dy) {
int destX = x+(dx > 0 ? width() : dx);
int destY = y+(dy > 0 ? height() : dy);
if (destX < 0 || destY < 0) return false;
Tile tileAtDestination = plan.get(id(destX, destY),true);
if (isSet(tileAtDestination) && !tileAtDestination.move(dx, dy)) return false;
plan.drop(this);
position(x+dx, y+dy);
plan.place(this);
return true;
}
protected void noTrack() {
isTrack = false;
}
@@ -310,15 +359,20 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
file.close();
}
public Tile set(Train newTrain) {
public Tile setTrain(Train newTrain) {
LOG.debug("{}.set({})",this,newTrain);
if (newTrain == train) return this; // nothing to update
this.train = newTrain;
return plan.place(this);
}
public Tile setRoute(Route lockingRoute) {
if (route == lockingRoute) return this; // nothing changed
if (isSet(route) && isSet(lockingRoute)) throw new IllegalStateException(this.toString()); // tile already locked by other route
LOG.debug("{}.setRoute({})",this,lockingRoute);
if (isNull(lockingRoute)) throw new NullPointerException();
if (isSet(route)) {
if (route == lockingRoute) return this; // nothing changed
throw new IllegalStateException(this.toString()); // tile already locked by other route
}
route = lockingRoute;
return plan.place(this);
}
@@ -426,6 +480,16 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
train = null;
plan.place(this);
}
public Tile unset(Route oldRoute) {
LOG.debug("{}.unset({})",this,oldRoute);
if (route == null) return this;
if (route == oldRoute) {
route = null;
return plan.place(this);
}
throw new IllegalArgumentException(t("{} not occupied by {}!",this,oldRoute));
}
public Tile update(HashMap<String, String> params) {
LOG.debug("{}.update({})",getClass().getSimpleName(),params);
@@ -449,16 +513,5 @@ public abstract class Tile extends BaseClass implements Comparable<Tile>{
return 1;
}
public boolean move(int dx, int dy) {
int destX = x+(dx > 0 ? width() : dx);
int destY = y+(dy > 0 ? height() : dy);
if (destX < 0 || destY < 0) return false;
Tile tileAtDestination = plan.get(id(destX, destY),true);
if (isSet(tileAtDestination) && !tileAtDestination.move(dx, dy)) return false;
plan.drop(this);
position(x+dx, y+dy);
plan.place(this);
return true;
}
}