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

setting turnouts for route now handeled by the setup actions

Browse Source
This commit is contained in:
Stephan Richter
2020-12-10 23:38:30 +01:00
parent 49185e79a2
commit 1e2edabcb1
10 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/srsoftware/web4rail/actions/SetRelay.java
View File

@@ -40,11 +40,8 @@ public class SetRelay extends Action {
@Override
public Action load(JSONObject json) {
super.load(json);
String relayId = json.getString(RELAY);
if (isSet(relayId)) {
relay = BaseClass.get(new Id(relayId));
state = json.getBoolean(Relay.STATE);
}
if (json.has(RELAY)) relay = BaseClass.get(new Id(json.getString(RELAY)));
if (json.has(Relay.STATE)) state = json.getBoolean(Relay.STATE);
return this;
}

18
src/main/java/de/srsoftware/web4rail/actions/SetTurnout.java
View File

@@ -25,7 +25,13 @@ public class SetTurnout extends Action {
@Override
public boolean fire(Context context) {
if (isNull(turnout)) return false;
return turnout.state(state).succeeded();
if (!turnout.state(state).succeeded()) return false;
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
return true;
}
@Override
@@ -73,6 +79,16 @@ public class SetTurnout extends Action {
super.removeChild(child);
}
public SetTurnout setState(State state) {
this.state = state;
return this;
}
public SetTurnout setTurnout(Turnout turnout) {
this.turnout = turnout;
return this;
}
public String toString() {
if (isNull(turnout)) return "["+t("click here to setup turnout")+"]";
return t("Set {} to {}",turnout,state);