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

WaitForContact now using new assignment function

Browse Source
This commit is contained in:
Stephan Richter
2021-01-16 01:20:19 +01:00
parent 901577dec6
commit fc95444fd8
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/srsoftware/web4rail/actions/WaitForContact.java
View File

@@ -2,6 +2,7 @@ package de.srsoftware.web4rail.actions;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.json.JSONObject;
@@ -13,6 +14,7 @@ import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tiles.Contact;
import de.srsoftware.web4rail.tiles.Contact.Listener;
import de.srsoftware.web4rail.tiles.Tile;
public class WaitForContact extends ActionList {
@@ -109,7 +111,7 @@ public class WaitForContact extends ActionList {
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(t("Contact"),Contact.selector(contact));
formInputs.add(t("Contact")+": "+(isNull(contact) ? t("unset") : contact),button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,CONTACT)));
formInputs.add(t("Timeout"),new Input(TIMEOUT,timeout).numeric().addTo(new Tag("span")).content(NBSP+"ms"));
Fieldset fieldset = new Fieldset(t("Actions on timeout"));
@@ -127,7 +129,14 @@ public class WaitForContact extends ActionList {
@Override
protected Object update(HashMap<String, String> params) {
if (params.containsKey(CONTACT)) contact = BaseClass.get(new Id(params.get(CONTACT)));
if (params.containsKey(CONTACT)) {
Tile tile = BaseClass.get(new Id(params.get(CONTACT)));
if (tile instanceof Contact) {
contact = (Contact) tile;
} else {
return t("Clicked tile is not a {}!",t("contact"));
}
}
if (params.containsKey(TIMEOUT)) timeout = Integer.parseInt(params.get(TIMEOUT));
return super.update(params);
}

4
src/main/java/de/srsoftware/web4rail/conditions/BlockFree.java
View File

@@ -57,7 +57,7 @@ public class BlockFree extends Condition {
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(t("Block: {}",isNull(block) ? t("unset") : block),button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,BLOCK)));
formInputs.add(t("Block")+": "+(isNull(block) ? t("unset") : block),button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,BLOCK)));
return super.properties(preForm, formInputs, postForm);
}
@@ -83,7 +83,7 @@ public class BlockFree extends Condition {
if (tile instanceof Block) {
block = (Block) tile;
} else {
return t("Clicked tile is not a block!");
return t("Clicked tile is not a {}!",t("block"));
}
return super.update(params);