bugfixes, added new Condition AutopilotActive, extended StopAutopilot action to StartStopAutopilot, implemented ActionList export

This commit is contained in:
Stephan Richter
2020-12-04 22:45:30 +01:00
parent 3eea978c31
commit 8901973808
11 changed files with 108 additions and 33 deletions

View File

@@ -0,0 +1,15 @@
package de.srsoftware.web4rail.conditions;
public class AutopilotActive extends Condition {
@Override
public boolean fulfilledBy(Context context) {
if (isNull(context.train())) return false;
return context.train().usesAutopilot() != inverted;
}
@Override
public String toString() {
return t(inverted ? "autopilot inactive for train":"autopilot active for train") ;
}
}

View File

@@ -114,6 +114,7 @@ public abstract class Condition extends BaseClass {
private static List<Class<? extends Condition>> list() {
return List.of(
AutopilotActive.class,
BlockFree.class,
OrCondition.class,
PushPullTrain.class,
@@ -157,6 +158,6 @@ public abstract class Condition extends BaseClass {
protected Object update(HashMap<String, String> params) {
inverted = "on".equals(params.get(INVERTED));
return this;
return super.update(params);
}
}

View File

@@ -1,7 +1,5 @@
package de.srsoftware.web4rail.conditions;
import de.srsoftware.web4rail.BaseClass;
public class PushPullTrain extends Condition {
@Override

View File

@@ -5,7 +5,6 @@ import java.util.List;
import org.json.JSONObject;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;

View File

@@ -6,7 +6,6 @@ import java.util.List;
import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.BaseClass;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;