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

various minor improvements

Browse Source
This commit is contained in:
Stephan Richter
2021-02-19 19:54:44 +01:00
parent 80553efb29
commit 54961c1f14
9 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/srsoftware/web4rail/actions/DisableEnableBlock.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;
@@ -12,6 +13,8 @@ import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Radio;
import de.srsoftware.web4rail.tags.Window;
import de.srsoftware.web4rail.tiles.Block;
import de.srsoftware.web4rail.tiles.Shadow;
import de.srsoftware.web4rail.tiles.Tile;
public class DisableEnableBlock extends Action {
@@ -65,7 +68,7 @@ public class DisableEnableBlock extends Action {
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(t("Select block"),Block.selector(isSet(block) ? block : t("block from context"), null));
formInputs.add(t("Block")+": "+(isNull(block) ? t("block from context") : block),button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,Block.class.getSimpleName())));
Tag radios = new Tag("p");
new Radio(STATE, "enable", t("enable"), !disable).addTo(radios);
new Radio(STATE, "disable", t("disable"), disable).addTo(radios);
@@ -88,7 +91,9 @@ public class DisableEnableBlock extends Action {
protected Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params);
Id blockId = Id.from(params,Block.class.getSimpleName());
if (isSet(blockId)) block = Block.get(blockId);
Tile tile = isSet(blockId) ? BaseClass.get(blockId) : null;
if (tile instanceof Shadow) tile = ((Shadow)tile).overlay();
if (tile instanceof Block) block = (Block) tile;
disable = !"enable".equals(params.get(STATE));
return properties();
}

9
src/main/java/de/srsoftware/web4rail/actions/SetSignal.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;
@@ -59,13 +60,7 @@ public class SetSignal extends Action {
@Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
Select select = new Select(SIGNAL);
for (Signal signal : BaseClass.listElements(Signal.class)) {
Tag option = select.addOption(signal.id(),signal.title());
if (signal == this.signal) option.attr("selected", "selected");
}
formInputs.add(t("Select signal"),select);
formInputs.add(t("Signal")+": "+(isNull(signal) ? t("unset") : signal),button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,SIGNAL)));
Select state = new Select(Signal.STATE);
for (String st:Signal.knownStates) {
Tag option = state.addOption(st);

2
src/main/java/de/srsoftware/web4rail/actions/TriggerContact.java
View File

@@ -53,7 +53,7 @@ public class TriggerContact extends Action {
}
public String toString() {
return isSet(contact) ? t("Trigger {}",contact) : "["+t("click here to setup contact")+"]";
return isSet(contact) ? t("Trigger {}",contact) : "["+t("Click here to setup contact")+"]";
};
@Override