Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java @ 5804:948d07aa988a
FixA: Fixes flys/issue1138 (Ausgel. WSPL: Streckenintelligenz bei Generierung Balkendiagramm)
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 24 Apr 2013 11:14:29 +0200 |
| parents | 0cab1c884e72 |
| children |
comparison
equal
deleted
inserted
replaced
| 5803:948be49754c5 | 5804:948d07aa988a |
|---|---|
| 192 | 192 |
| 193 public List<SectorRange> getSectors() { | 193 public List<SectorRange> getSectors() { |
| 194 return sectors; | 194 return sectors; |
| 195 } | 195 } |
| 196 | 196 |
| 197 public boolean hasSectorsInRange(Range range) { | |
| 198 for (SectorRange sector: sectors) { | |
| 199 if (sector.intersects(range)) { | |
| 200 return true; | |
| 201 } | |
| 202 } | |
| 203 return false; | |
| 204 } | |
| 205 | |
| 197 public List<SectorRange> getSectors(Range range) { | 206 public List<SectorRange> getSectors(Range range) { |
| 198 | 207 |
| 199 List<SectorRange> result = | 208 List<SectorRange> result = |
| 200 new ArrayList<SectorRange>(sectors.size()); | 209 new ArrayList<SectorRange>(sectors.size()); |
| 201 | 210 |
| 338 List<Column> allColumns, | 347 List<Column> allColumns, |
| 339 Range range, | 348 Range range, |
| 340 Filter filter | 349 Filter filter |
| 341 ) { | 350 ) { |
| 342 for (Column column: columns) { | 351 for (Column column: columns) { |
| 343 if ((range == null || column.intersects(range)) | 352 if ((range == null || column.hasSectorsInRange(range)) |
| 344 && (filter == null || filter.accept(column))) { | 353 && (filter == null || filter.accept(column))) { |
| 345 allColumns.add(column); | 354 allColumns.add(column); |
| 346 } | 355 } |
| 347 } | 356 } |
| 348 } | 357 } |