Mercurial > dive4elements > river
diff gwt-client/src/main/java/org/dive4elements/river/client/shared/model/SalixZone.java @ 9241:cbe393451ab0
minor bugfixes
author | gernotbelger |
---|---|
date | Tue, 10 Jul 2018 18:53:04 +0200 |
parents | 1c756bfee472 |
children | 2ea7b61797d3 |
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/SalixZone.java Tue Jul 10 14:47:10 2018 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/shared/model/SalixZone.java Tue Jul 10 18:53:04 2018 +0200 @@ -110,10 +110,12 @@ treeList.addAll(list); double lowerCompare = lower + DELTA; for (final SalixZone zone : treeList) { - if (zone.getLowerFromTo() > lowerCompare) { - return true; + if ((zone.getUpperFromTo() - zone.getLowerFromTo()) > DELTA) { + if (zone.getLowerFromTo() > lowerCompare) { + return true; + } + lowerCompare = zone.getUpperFromTo() + DELTA; } - lowerCompare = zone.getUpperFromTo() + DELTA; } if ((lowerCompare + DELTA) < upper) return true; // am Ende nicht geschlossen @@ -149,6 +151,9 @@ @Override public int compareTo(final SalixZone o) { final int basicCompare = this.getLowerFromTo().compareTo(o.getLowerFromTo()); + if (basicCompare == 0) { + return 1; // necessary for the treeSet! + } return basicCompare; }