From 810dadef8c5bf7c10f0d991056d66c927b63e4c9 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Sat, 14 Nov 2020 14:24:56 +0100 Subject: [PATCH] bugfix --- pom.xml | 2 +- src/main/java/de/srsoftware/web4rail/Range.java | 8 ++++++++ src/main/java/de/srsoftware/web4rail/tiles/Block.java | 8 ++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 81fbe60..16211a9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.srsoftware web4rail - 0.11.25 + 0.11.26 Web4Rail jar Java Model Railway Control diff --git a/src/main/java/de/srsoftware/web4rail/Range.java b/src/main/java/de/srsoftware/web4rail/Range.java index ac49bf1..2b37776 100644 --- a/src/main/java/de/srsoftware/web4rail/Range.java +++ b/src/main/java/de/srsoftware/web4rail/Range.java @@ -33,4 +33,12 @@ public class Range extends BaseClass{ public String toString() { return min+"…"+max; } + + public void validate() { + if (min>max) { + int dummy = min; + min = max; + max = dummy; + } + } } diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Block.java b/src/main/java/de/srsoftware/web4rail/tiles/Block.java index ef30653..94d052b 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Block.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Block.java @@ -93,13 +93,11 @@ public abstract class Block extends StretchableTile implements Comparable public WaitTime setMax(Direction dir,int max) { get(dir).max = max; - if (get(dir).min > max) setMin(dir,max); return this; } public WaitTime setMin(Direction dir,int min) { get(dir).min = min; - if (get(dir).max > min) setMax(dir,min); return this; } @@ -112,6 +110,11 @@ public abstract class Block extends StretchableTile implements Comparable public String toString() { return "WaitTime("+tag+", "+dirs+")"; } + + public void validate() { + for (Entry entry: dirs.entrySet()) entry.getValue().validate(); + + } } @@ -376,6 +379,7 @@ public abstract class Block extends StretchableTile implements Comparable } else wt.setMax(dir, Integer.parseInt(val)); } } + for (WaitTime wt: waitTimes) wt.validate(); return this; }