diff --git a/pom.xml b/pom.xml index 7887748..1242d98 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.11.12 + 0.11.13 Web4Rail jar Java Model Railway Control diff --git a/resources/logback.xml b/resources/logback.xml index a795224..0a48ec6 100644 --- a/resources/logback.xml +++ b/resources/logback.xml @@ -1,14 +1,17 @@ - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n - + + + + + + - - \ No newline at end of file + diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index df37413..0ad2ce3 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -525,7 +525,6 @@ public class Route extends BaseClass implements Comparable{ if (o instanceof JSONObject) new Route().load((JSONObject)o, plan); } fis.close(); - LOG.debug("json: {}",json.getClass()); } private void loadConditions(JSONArray arr) { diff --git a/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java b/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java index 8af53fe..f56017a 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java +++ b/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java @@ -55,6 +55,7 @@ public class DelayedAction extends Action { public void run() { try { Thread.sleep(delay); + LOG.debug("{} ms passed by, firing actions:",delay); } catch (InterruptedException e) { LOG.warn("Interrupted Exception thrown while waiting:",e); } diff --git a/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java b/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java index 5a46ca9..7b02587 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java +++ b/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java @@ -18,11 +18,9 @@ public class SetSpeed extends Action{ @Override public boolean fire(Context context) { - if (context.train != null && context.train.speed > maxSpeed) { - context.train.setSpeed(maxSpeed); - return true; - } - return false; + if (isNull(context.train)) return false; + context.train.setSpeed(maxSpeed); + return true; } @Override diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java index 5776238..ce4dbbc 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Train.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java @@ -631,6 +631,7 @@ public class Train extends BaseClass implements Comparable { if (isNull(error) && !route.train(this)) error = t("Was not able to assign {} to {}!",this,route); if (isSet(error)) { route.reset(); + route = null; return error; } setSpeed(128); diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Contact.java b/src/main/java/de/srsoftware/web4rail/tiles/Contact.java index d195159..ec0b234 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Contact.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Contact.java @@ -47,8 +47,9 @@ public class Contact extends Tile{ } public Contact addr(int address) { + contactsByAddr.remove(addr); // alte ID aus der Map löschen addr = address; - contactsByAddr.put(addr, this); + if (addr != 0) contactsByAddr.put(addr, this); // neue ID setzen return this; }