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

bugfixes

Browse Source
This commit is contained in:
Stephan Richter
2020-12-03 23:28:11 +01:00
parent 500af0a547
commit d8d49135be
2 changed files with 8 additions and 3 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.2.11</version> <version>1.2.12</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>

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

@@ -136,7 +136,7 @@ public class Route extends BaseClass implements Comparable<Route>{
private BrakeProcessor brakeProcessor = null; private BrakeProcessor brakeProcessor = null;
private HashMap<String,Integer> brakeTimes = new HashMap<String, Integer>(); private HashMap<String,Integer> brakeTimes = new HashMap<String, Integer>();
private ConditionList conditions = new ConditionList(); private ConditionList conditions;
private Vector<Contact> contacts; private Vector<Contact> contacts;
private boolean disabled = false; private boolean disabled = false;
private Block endBlock = null; private Block endBlock = null;
@@ -149,6 +149,11 @@ public class Route extends BaseClass implements Comparable<Route>{
private Block startBlock = null; private Block startBlock = null;
public Direction startDirection; public Direction startDirection;
private HashSet<Contact> triggeredContacts = new HashSet<>(); private HashSet<Contact> triggeredContacts = new HashSet<>();
public Route() {
conditions = new ConditionList();
conditions.parent(this);
}
/** /**
* process commands from the client * process commands from the client
@@ -450,7 +455,7 @@ public class Route extends BaseClass implements Comparable<Route>{
} }
public Id id() { public Id id() {
if (id == null) id = new Id(md5sum(generateName())); if (id == null) id = new Id(""+(generateName().hashCode()));
return id; return id;
} }