Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 9240:54173301bc34 | 9241:cbe393451ab0 |
|---|---|
| 108 | 108 |
| 109 final TreeSet<SalixZone> treeList = new TreeSet<SalixZone>(); | 109 final TreeSet<SalixZone> treeList = new TreeSet<SalixZone>(); |
| 110 treeList.addAll(list); | 110 treeList.addAll(list); |
| 111 double lowerCompare = lower + DELTA; | 111 double lowerCompare = lower + DELTA; |
| 112 for (final SalixZone zone : treeList) { | 112 for (final SalixZone zone : treeList) { |
| 113 if (zone.getLowerFromTo() > lowerCompare) { | 113 if ((zone.getUpperFromTo() - zone.getLowerFromTo()) > DELTA) { |
| 114 return true; | 114 if (zone.getLowerFromTo() > lowerCompare) { |
| 115 return true; | |
| 116 } | |
| 117 lowerCompare = zone.getUpperFromTo() + DELTA; | |
| 115 } | 118 } |
| 116 lowerCompare = zone.getUpperFromTo() + DELTA; | |
| 117 } | 119 } |
| 118 if ((lowerCompare + DELTA) < upper) | 120 if ((lowerCompare + DELTA) < upper) |
| 119 return true; // am Ende nicht geschlossen | 121 return true; // am Ende nicht geschlossen |
| 120 | 122 |
| 121 return false; | 123 return false; |
| 147 } | 149 } |
| 148 | 150 |
| 149 @Override | 151 @Override |
| 150 public int compareTo(final SalixZone o) { | 152 public int compareTo(final SalixZone o) { |
| 151 final int basicCompare = this.getLowerFromTo().compareTo(o.getLowerFromTo()); | 153 final int basicCompare = this.getLowerFromTo().compareTo(o.getLowerFromTo()); |
| 154 if (basicCompare == 0) { | |
| 155 return 1; // necessary for the treeSet! | |
| 156 } | |
| 152 return basicCompare; | 157 return basicCompare; |
| 153 } | 158 } |
| 154 | 159 |
| 155 public static boolean isValidAnschlussRange(final double fromTest, final double toTest, final List<SalixZone> list, final double minKm) { | 160 public static boolean isValidAnschlussRange(final double fromTest, final double toTest, final List<SalixZone> list, final double minKm) { |
| 156 final SalixZone zone = new SalixZone(0, fromTest, toTest); | 161 final SalixZone zone = new SalixZone(0, fromTest, toTest); |