- implemented load callback
- added waitTime field to context, wait time now determined in route.start
This commit is contained in:
@@ -7,14 +7,14 @@ import java.util.Map;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import de.srsoftware.web4rail.BaseClass;
|
||||
import de.srsoftware.web4rail.LoadCallback;
|
||||
import de.srsoftware.web4rail.tags.Fieldset;
|
||||
import de.srsoftware.web4rail.tags.Window;
|
||||
import de.srsoftware.web4rail.threads.DelayedExecution;
|
||||
import de.srsoftware.web4rail.tiles.Decoupler;
|
||||
import de.srsoftware.web4rail.tiles.Tile;
|
||||
|
||||
public class EngageDecoupler extends Action {
|
||||
|
||||
|
||||
private static final String DECOUPLER = Decoupler.class.getSimpleName();
|
||||
|
||||
public EngageDecoupler(BaseClass parent) {
|
||||
@@ -24,12 +24,12 @@ public class EngageDecoupler extends Action {
|
||||
private Decoupler decoupler = null;
|
||||
|
||||
@Override
|
||||
public boolean fire(Context context,Object cause) {
|
||||
public boolean fire(Context context, Object cause) {
|
||||
if (isNull(decoupler)) return false;
|
||||
decoupler.engage();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public JSONObject json() {
|
||||
JSONObject json = super.json();
|
||||
@@ -38,50 +38,44 @@ public class EngageDecoupler extends Action {
|
||||
}
|
||||
return json;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Action load(JSONObject json) {
|
||||
super.load(json);
|
||||
if (json.has(DECOUPLER)) {
|
||||
String decouplerId = json.getString(DECOUPLER);
|
||||
decoupler = BaseClass.get(new Id(decouplerId));
|
||||
if (isNull(decoupler)) new DelayedExecution(this) {
|
||||
|
||||
@Override
|
||||
public void execute() {
|
||||
decoupler = BaseClass.get(new Id(decouplerId));
|
||||
}
|
||||
};
|
||||
}
|
||||
return this;
|
||||
if (json.has(DECOUPLER)) new LoadCallback() {
|
||||
@Override
|
||||
public void afterLoad() {
|
||||
decoupler = BaseClass.get(Id.from(json, DECOUPLER));
|
||||
}
|
||||
};
|
||||
return super.load(json);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm,String...errors) {
|
||||
formInputs.add(t("Decoupler")+": "+(isNull(decoupler) ? t("unset") : decoupler),button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,DECOUPLER)));
|
||||
|
||||
return super.properties(preForm, formInputs, postForm,errors);
|
||||
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm, String... errors) {
|
||||
formInputs.add(t("Decoupler") + ": " + (isNull(decoupler) ? t("unset") : decoupler), button(t("Select from plan"), Map.of(ACTION, ACTION_UPDATE, ASSIGN, DECOUPLER)));
|
||||
|
||||
return super.properties(preForm, formInputs, postForm, errors);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void removeChild(BaseClass child) {
|
||||
if (child == decoupler) decoupler = null;
|
||||
super.removeChild(child);
|
||||
}
|
||||
|
||||
|
||||
public String toString() {
|
||||
if (isNull(decoupler)) return "["+t("Click here to setup decoupler")+"]";
|
||||
return t("Engage {}",decoupler);
|
||||
if (isNull(decoupler)) return "[" + t("Click here to setup decoupler") + "]";
|
||||
return t("Engage {}", decoupler);
|
||||
};
|
||||
|
||||
|
||||
@Override
|
||||
protected Object update(HashMap<String, String> params) {
|
||||
LOG.debug("update: {}",params);
|
||||
LOG.debug("update: {}", params);
|
||||
if (params.containsKey(DECOUPLER)) {
|
||||
Tile tile = BaseClass.get(new Id(params.get(DECOUPLER)));
|
||||
if (tile instanceof Decoupler) {
|
||||
decoupler = (Decoupler) tile;
|
||||
} else return t("Clicked tile is not a {}!",t("decoupler"));
|
||||
decoupler = (Decoupler) tile;
|
||||
} else return t("Clicked tile is not a {}!", t("decoupler"));
|
||||
}
|
||||
return context().properties();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user