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

Route.analyze now preserves route conditions

Browse Source
This commit is contained in:
Stephan Richter
2020-11-18 22:44:33 +01:00
parent eb76efe2e0
commit 591d9d26f5
2 changed files with 4 additions and 1 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.0.3</version> <version>1.0.4</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>

3
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -234,6 +234,9 @@ public class Route extends BaseClass implements Comparable<Route>{
public void addPropertiesFrom(Route existingRoute) { public void addPropertiesFrom(Route existingRoute) {
LOG.debug("addPropertiesFrom({})",existingRoute); LOG.debug("addPropertiesFrom({})",existingRoute);
disabled = existingRoute.disabled; disabled = existingRoute.disabled;
conditions.addAll(existingRoute.conditions);
setupActions.addActionsFrom(existingRoute.setupActions); setupActions.addActionsFrom(existingRoute.setupActions);
for (Entry<String, ActionList> entry : triggers.entrySet()) { for (Entry<String, ActionList> entry : triggers.entrySet()) {
String trigger = entry.getKey(); String trigger = entry.getKey();