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

bugfixes

Browse Source
This commit is contained in:
Stephan Richter
2020-11-05 23:23:33 +01:00
parent 5499d5a82b
commit e1d3384110
8 changed files with 69 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import de.srsoftware.web4rail.tags.Button;
import de.srsoftware.web4rail.tags.Checkbox;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
import de.srsoftware.web4rail.tags.Radio;
/**
@@ -118,8 +119,11 @@ public abstract class Tile extends BaseClass{
plan.set(tile.x, tile.y, tile);
}
public boolean isFree() {
return !(disabled || isSet(route) || isSet(train));
public boolean isFreeFor(Train newTrain) {
if (disabled) return false;
if (isSet(route)) return false;
if (isSet(train) && newTrain != train) return false;
return true;
}
public JSONObject json() {
@@ -169,7 +173,6 @@ public abstract class Tile extends BaseClass{
if (json.has(DISABLED)) disabled = json.getBoolean(DISABLED);
if (json.has(LENGTH)) length = json.getInt(LENGTH);
if (json.has(ONEW_WAY)) oneWay = Direction.valueOf(json.getString(ONEW_WAY));
if (json.has(REALM_TRAIN)) train = Train.get(json.getInt(REALM_TRAIN));
return this;
}
@@ -214,7 +217,7 @@ public abstract class Tile extends BaseClass{
String formId = "tile-properties-"+id();
Tag form = propForm(formId);
new Tag("h4").content(t("Length")).addTo(form);
new Input(LENGTH,length).numeric().addTo(form);
new Input(LENGTH,length).numeric().addTo(new Label(t("Length")+":"+NBSP)).addTo(form);
new Tag("h4").content(t("Availability")).addTo(form);
new Checkbox(DISABLED, t("disabled"), disabled).addTo(form);
new Button(t("Apply"),"submitForm('"+formId+"')").addTo(form);

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

@@ -93,6 +93,7 @@ public abstract class Turnout extends Tile implements Device{
if (portB != 1) json.put(PORT_B, portB);
if (address != 0) json.put(ADDRESS, address);
json.put(PROTOCOL, protocol);
json.put(STATE, state);
return json;
}
@@ -102,6 +103,7 @@ public abstract class Turnout extends Tile implements Device{
if (json.has(PORT_A)) portA = json.getInt(PORT_A);
if (json.has(PORT_B)) portB = json.getInt(PORT_B);
if (json.has(PROTOCOL)) protocol = Protocol.valueOf(json.getString(PROTOCOL));
if (json.has(STATE)) state = State.valueOf(json.getString(STATE));
return super.load(json);
}
@@ -139,9 +141,9 @@ public abstract class Turnout extends Tile implements Device{
}
public Reply state(State newState) throws IOException {
if (train != null && newState != state) return new Reply(415, t("{} locked by {}!",this,train));
Reply reply = init();
if (reply != null && !reply.succeeded()) return reply;
LOG.debug("Setting {} to {}",this,newState);
if (address == 0) {
state = newState;
plan.place(this);