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

implemented storing of loco and car properties

Browse Source
This commit is contained in:
Stephan Richter
2020-09-30 22:28:07 +02:00
parent 29888379c6
commit e8d5e1ab56
6 changed files with 111 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
View File

@@ -1,5 +1,6 @@
package de.srsoftware.web4rail.moving;
import java.util.HashMap;
import java.util.Vector;
import org.json.JSONObject;
@@ -12,12 +13,21 @@ import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
import de.srsoftware.web4rail.tags.Radio;
public class Locomotive extends Car {
public enum Protocol{
DCC14,DCC27,DCC28,DCC128,MOTO;
}
private static final String REVERSE = "reverse";
public static final String LOCOMOTIVE = "locomotive";
private static final String PROTOCOL = "protocol";
private static final String ADDRESS = "address";
private boolean reverse = false;
private Protocol proto = Protocol.DCC128;
private int address = 3;
public Locomotive(String name) {
super(name);
@@ -32,6 +42,9 @@ public class Locomotive extends Car {
JSONObject json = super.json();
JSONObject loco = new JSONObject();
loco.put(REVERSE, reverse);
loco.put(PROTOCOL, proto);
loco.put(ADDRESS, address);
json.put(LOCOMOTIVE, loco);
return json;
}
@@ -47,13 +60,13 @@ public class Locomotive extends Car {
@Override
protected void load(JSONObject json) {
super.load(json);
if (json.has(REVERSE)) reverse = json.getBoolean(REVERSE);
}
public void setSpeed(int v) {
// TODO Auto-generated method stub
}
if (json.has(LOCOMOTIVE)) {
JSONObject loco = json.getJSONObject(LOCOMOTIVE);
if (loco.has(REVERSE)) reverse = loco.getBoolean(REVERSE);
if (loco.has(PROTOCOL)) proto = Protocol.valueOf(loco.getString(PROTOCOL));
if (loco.has(ADDRESS)) address = loco.getInt(ADDRESS);
}
}
public static Object manager() {
Window win = new Window("loco-manager", t("Locomotive manager"));
@@ -75,5 +88,31 @@ public class Locomotive extends Car {
fieldset.addTo(form).addTo(win);
return win;
}
@Override
public Tag propertyForm() {
Tag form = super.propertyForm();
Fieldset fieldset = new Fieldset("Decoder settings");
Label protocol = new Label(t("Protocol:"));
for (Protocol proto : Protocol.values()) {
new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == this.proto).addTo(protocol);
}
protocol.addTo(fieldset);
new Input(ADDRESS, address).attr("type", "number").addTo(new Label(t("Address:"))).addTo(fieldset);
fieldset.addTo(form);
return form;
}
public void setSpeed(int v) {
// TODO Auto-generated method stub
}
@Override
public Object update(HashMap<String, String> params) {
super.update(params);
if (params.containsKey(PROTOCOL)) proto = Protocol.valueOf(params.get(PROTOCOL));
if (params.containsKey(ADDRESS)) address = Integer.parseInt(params.get(ADDRESS));
return t("Updated locomotive.");
}
}