From f3fcdb6a0e71c94292cbb2d769d5d4f5ccd51caa Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Mon, 21 Dec 2020 11:06:42 +0100 Subject: [PATCH] added new action ReactivateContact --- pom.xml | 2 +- .../translations/Application.de.translation | 1 + src/main/java/de/srsoftware/web4rail/Route.java | 3 +++ .../de/srsoftware/web4rail/actions/Action.java | 1 + .../web4rail/actions/ReactivateContact.java | 17 +++++++++++++++++ 5 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/srsoftware/web4rail/actions/ReactivateContact.java diff --git a/pom.xml b/pom.xml index 72220c2..23c1faf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 1.2.52 + 1.2.53 Web4Rail jar Java Model Railway Control diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index c7a81f3..9587f09 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -172,6 +172,7 @@ PushPullTrain : Wendezug Push-pull train : Wendezug quit autopilot : Autopilot beenden {} reached it`s destination! : {} ist am Ziel angekommen! +ReactivateContact : Kontakt reaktivieren Relay : Relais Relays and Turnouts : Relais und Weichen Relay/Turnout : Relais/Weiche diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index b8ceaeb..9c85ae9 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -763,7 +763,10 @@ public class Route extends BaseClass { Window win = super.properties(preForm, formInputs, postForm); previewScript().addTo(win); return win; + } + public boolean reactivate(Contact contact) { + return triggeredContacts.remove(contact); } @Override diff --git a/src/main/java/de/srsoftware/web4rail/actions/Action.java b/src/main/java/de/srsoftware/web4rail/actions/Action.java index 4707da9..d690d28 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/Action.java +++ b/src/main/java/de/srsoftware/web4rail/actions/Action.java @@ -50,6 +50,7 @@ public abstract class Action extends BaseClass { FinishRoute.class, Loop.class, PreserveRoute.class, + ReactivateContact.class, SavePlan.class, SendCommand.class, SetContextTrain.class, diff --git a/src/main/java/de/srsoftware/web4rail/actions/ReactivateContact.java b/src/main/java/de/srsoftware/web4rail/actions/ReactivateContact.java new file mode 100644 index 0000000..b48421c --- /dev/null +++ b/src/main/java/de/srsoftware/web4rail/actions/ReactivateContact.java @@ -0,0 +1,17 @@ +package de.srsoftware.web4rail.actions; + +import de.srsoftware.web4rail.BaseClass; + +public class ReactivateContact extends Action{ + + public ReactivateContact(BaseClass parent) { + super(parent); + } + + @Override + public boolean fire(Context context) { + if (isNull(context.contact())) return false; + if (isNull(context.route())) return false; + return context.route().reactivate(context.contact()); + } +}