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

EngageDecoupler now using new assignment function

Browse Source
This commit is contained in:
Stephan Richter
2021-01-16 01:24:45 +01:00
parent fc95444fd8
commit bf234e19bb
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.3.24</version> <version>1.3.25</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

4
resources/translations/Application.de.translation
View File

@@ -90,7 +90,9 @@ Current location : Aufenthaltsort
Current location\: {} : Aufenthaltsort: {} Current location\: {} : Aufenthaltsort: {}
Current velocity\: {} {} : Aktuelle Geschwindigkeit: {} {} Current velocity\: {} {} : Aktuelle Geschwindigkeit: {} {}
custom fields : benutzerdefinierte Felder custom fields : benutzerdefinierte Felder
Decoder address : Decoder-Adresse Decoder address : Decoder-Adresse
decoupler : decoupler
Decoupler : Entkuppler
DelayedAction : verzögerte Aktion DelayedAction : verzögerte Aktion
delete : entfernen delete : entfernen
delete route : Route löschen delete route : Route löschen

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

@@ -2,6 +2,7 @@ package de.srsoftware.web4rail.actions;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import org.json.JSONObject; import org.json.JSONObject;
@@ -10,6 +11,7 @@ import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Window; import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset; import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tiles.Decoupler; import de.srsoftware.web4rail.tiles.Decoupler;
import de.srsoftware.web4rail.tiles.Tile;
public class EngageDecoupler extends Action { public class EngageDecoupler extends Action {
@@ -57,8 +59,7 @@ public class EngageDecoupler extends Action {
@Override @Override
protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) { protected Window properties(List<Fieldset> preForm, FormInput formInputs, List<Fieldset> postForm) {
formInputs.add(t("Decoupler")+": "+(isNull(decoupler) ? t("unset") : decoupler),button(t("Select from plan"),Map.of(ACTION,ACTION_UPDATE,ASSIGN,DECOUPLER)));
formInputs.add(t("Select decoupler"),Decoupler.selector(decoupler,null));
return super.properties(preForm, formInputs, postForm); return super.properties(preForm, formInputs, postForm);
} }
@@ -77,8 +78,12 @@ public class EngageDecoupler extends Action {
@Override @Override
protected Object update(HashMap<String, String> params) { protected Object update(HashMap<String, String> params) {
LOG.debug("update: {}",params); LOG.debug("update: {}",params);
Id decouplerId = new Id(params.get(DECOUPLER)); if (params.containsKey(DECOUPLER)) {
decoupler = BaseClass.get(decouplerId); 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"));
}
return context().properties(); return context().properties();
} }
} }

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

@@ -133,9 +133,7 @@ public class WaitForContact extends ActionList {
Tile tile = BaseClass.get(new Id(params.get(CONTACT))); Tile tile = BaseClass.get(new Id(params.get(CONTACT)));
if (tile instanceof Contact) { if (tile instanceof Contact) {
contact = (Contact) tile; contact = (Contact) tile;
} else { } else return t("Clicked tile is not a {}!",t("contact"));
return t("Clicked tile is not a {}!",t("contact"));
}
} }
if (params.containsKey(TIMEOUT)) timeout = Integer.parseInt(params.get(TIMEOUT)); if (params.containsKey(TIMEOUT)) timeout = Integer.parseInt(params.get(TIMEOUT));
return super.update(params); return super.update(params);