Browse Source

bugfixes

lookup-tables
Stephan Richter 5 years ago
parent
commit
1b7103ffbd
  1. 2
      pom.xml
  2. 1
      resources/translations/Application.de.translation
  3. 4
      src/main/java/de/srsoftware/web4rail/Route.java
  4. 1
      src/main/java/de/srsoftware/web4rail/tiles/Block.java
  5. 5
      src/main/java/de/srsoftware/web4rail/tiles/Contact.java

2
pom.xml

@ -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.37</version> <version>1.2.38</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>

1
resources/translations/Application.de.translation

@ -7,6 +7,7 @@ ActivateRoute : Route aktivieren
add : hinzufügen add : hinzufügen
Added {} : {} hinzugefügt Added {} : {} hinzugefügt
add action : Aktion hinzufügen add action : Aktion hinzufügen
Add action to action list : Aktion zur Liste hinzufügen
add car\: : Waggon hinzufügen: add car\: : Waggon hinzufügen:
Add condition : Bedingung hinzufügen Add condition : Bedingung hinzufügen
add locomotive\: : Lok hinzufügen: add locomotive\: : Lok hinzufügen:

4
src/main/java/de/srsoftware/web4rail/Route.java

@ -406,6 +406,10 @@ public class Route extends BaseClass {
return win; return win;
} }
public Context context() {
return context.clone();
}
public Block endBlock() { public Block endBlock() {
return endBlock; return endBlock;
} }

1
src/main/java/de/srsoftware/web4rail/tiles/Block.java

@ -274,6 +274,7 @@ public abstract class Block extends StretchableTile{
Id trainId = Id.from(params,Train.class.getSimpleName()); Id trainId = Id.from(params,Train.class.getSimpleName());
if (trainId.equals(0)) { // TODO: this is rubbish if (trainId.equals(0)) { // TODO: this is rubbish
if (isSet(train)) train.dropTrace(); if (isSet(train)) train.dropTrace();
train.set(null);
train = null; train = null;
} else { } else {
Train newTrain = Train.get(trainId); Train newTrain = Train.get(trainId);

5
src/main/java/de/srsoftware/web4rail/tiles/Contact.java

@ -75,12 +75,15 @@ public class Contact extends Tile{
LOG.debug("{} activated.",this); LOG.debug("{} activated.",this);
state = true; state = true;
if (isSet(timer)) timer.abort(); if (isSet(timer)) timer.abort();
Context context = null;
if (isSet(route)) { if (isSet(route)) {
context = route.context();
route.contact(this); route.contact(this);
} else if (getClass() != Contact.class) { } else if (getClass() != Contact.class) {
plan.warn(this); plan.warn(this);
} }
actions.fire(new Context(this)); if (isNull(context)) context = new Context(this);
actions.fire(context);
stream(); stream();
} }
} }

Loading…
Cancel
Save