Browse Source

minor improvements

lookup-tables
Stephan Richter 5 years ago
parent
commit
49185e79a2
  1. 2
      pom.xml
  2. 4
      src/main/java/de/srsoftware/web4rail/Route.java
  3. 5
      src/main/java/de/srsoftware/web4rail/actions/ActionList.java
  4. 8
      src/main/java/de/srsoftware/web4rail/tiles/Contact.java
  5. 2
      src/main/java/de/srsoftware/web4rail/tiles/Relay.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.39</version> <version>1.2.40</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>

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

@ -347,7 +347,7 @@ public class Route extends BaseClass {
add(lastContact.trigger(), new BrakeStop(this)); add(lastContact.trigger(), new BrakeStop(this));
add(lastContact.trigger(), new FinishRoute(this)); add(lastContact.trigger(), new FinishRoute(this));
} }
for (Signal signal : signals) add(ROUTE_SETUP,new SetSignal(this).set(signal).to(Signal.GO)); for (Signal signal : signals) add(ROUTE_START,new SetSignal(this).set(signal).to(Signal.GO));
add(ROUTE_START,new SetSpeed(this).to(999)); add(ROUTE_START,new SetSpeed(this).to(999));
return this; return this;
} }
@ -363,7 +363,7 @@ public class Route extends BaseClass {
LOG.debug("{} on {} activated {}.",train,this,contact); LOG.debug("{} on {} activated {}.",train,this,contact);
traceTrainFrom(contact); traceTrainFrom(contact);
ActionList actions = triggeredActions.get(contact.trigger()); ActionList actions = triggeredActions.get(contact.trigger());
LOG.debug("Contact has id {} / trigger {} and is assigned with {}",contact.id(),contact.trigger(),actions); LOG.debug("Contact has id {} / trigger {} and is assigned with {}",contact.id(),contact.trigger(),isNull(actions)?t("nothing"):actions);
if (isNull(actions)) return; if (isNull(actions)) return;
context.contact(contact); context.contact(contact);
actions.fire(context); actions.fire(context);

5
src/main/java/de/srsoftware/web4rail/actions/ActionList.java

@ -225,4 +225,9 @@ public class ActionList extends Action implements Iterable<Action>{
actions.remove(child); actions.remove(child);
super.removeChild(child); super.removeChild(child);
} }
@Override
public String toString() {
return actions.toString();
}
} }

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

@ -78,12 +78,16 @@ public class Contact extends Tile{
Context context = null; Context context = null;
if (isSet(route)) { if (isSet(route)) {
context = route.context(); context = route.context();
actions.fire(context);
route.contact(this); route.contact(this);
} else if (getClass() != Contact.class) { } else if (getClass() != Contact.class) {
plan.warn(this); plan.warn(this);
} }
if (isNull(context)) context = new Context(this); if (isNull(context)) {
actions.fire(context); context = new Context(this);
actions.fire(context);
}
stream(); stream();
} }
} }

2
src/main/java/de/srsoftware/web4rail/tiles/Relay.java

@ -174,7 +174,7 @@ public class Relay extends Tile implements Device{
public Reply state(boolean newState) { public Reply state(boolean newState) {
Reply reply = init(); Reply reply = init();
if (reply != null && !reply.succeeded()) return reply; if (reply != null && !reply.succeeded()) return reply;
LOG.debug("Setting {} to {}",this,newState); LOG.debug("Setting {} to {}",this,newState?1:0);
try { try {
String cmd = commandFor(newState); String cmd = commandFor(newState);
return plan.queue(new Command(cmd) { return plan.queue(new Command(cmd) {

Loading…
Cancel
Save