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

GUI improvements

Browse Source
This commit is contained in:
Stephan Richter
2020-11-02 14:11:56 +01:00
parent 7d5d5f3bb2
commit a2cb3d813e
10 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ public abstract class Turnout extends Tile implements Device{
}
protected Reply init() {
if (address == 0) return new Reply(200,"OK");
if (!initialized) {
Command command = new Command("INIT {} GA "+address+" "+proto()) {
@@ -109,7 +110,7 @@ public abstract class Turnout extends Tile implements Device{
new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == this.protocol).addTo(protocol);
}
protocol.addTo(fieldset).addTo(form);
new Input(ADDRESS, address).numeric().addTo(new Label(t("Address"))).addTo(fieldset);
new Input(ADDRESS, address).numeric().addTo(new Label(t("Address:")+NBSP)).addTo(fieldset);
return form;
}
@@ -137,9 +138,13 @@ public abstract class Turnout extends Tile implements Device{
Reply reply = init();
if (reply != null && !reply.succeeded()) return reply;
LOG.debug("Setting {} to {}",this,newState);
if (address == 0) {
state = newState;
plan.place(this);
return new Reply(200,"OK");
}
try {
String cmd = commandFor(newState);
return plan.queue(new Command(cmd) {
return plan.queue(new Command(commandFor(newState)) {
@Override
public void onSuccess() {