Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java @ 2613:2e129754d450
Fixed NPE bug in filter builder for fixings overview.
flys-artifacts/trunk@4197 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Wed, 04 Apr 2012 14:17:36 +0000 |
| parents | 938e2f6c0c9a |
| children | 7d163c2c6e6d |
comparison
equal
deleted
inserted
replaced
| 2612:49cfa5c66651 | 2613:2e129754d450 |
|---|---|
| 428 List<SectorRange> result = | 428 List<SectorRange> result = |
| 429 new ArrayList<SectorRange>(sectors.size()); | 429 new ArrayList<SectorRange>(sectors.size()); |
| 430 | 430 |
| 431 for (SectorRange src: sectors) { | 431 for (SectorRange src: sectors) { |
| 432 SectorRange dst = new SectorRange(src); | 432 SectorRange dst = new SectorRange(src); |
| 433 if (dst.clip(range)) { | 433 if (range == null || dst.clip(range)) { |
| 434 result.add(dst); | 434 result.add(dst); |
| 435 } | 435 } |
| 436 } | 436 } |
| 437 | 437 |
| 438 return result; | 438 return result; |
| 553 List<Column> allColumns, | 553 List<Column> allColumns, |
| 554 Range range, | 554 Range range, |
| 555 Filter filter | 555 Filter filter |
| 556 ) { | 556 ) { |
| 557 for (Column column: columns) { | 557 for (Column column: columns) { |
| 558 if (column.intersects(range) && filter.accept(column)) { | 558 if ((range == null || column.intersects(range)) |
| 559 && (filter == null || filter.accept(column))) { | |
| 559 allColumns.add(column); | 560 allColumns.add(column); |
| 560 } | 561 } |
| 561 } | 562 } |
| 562 } | 563 } |
| 563 } // class Fixing | 564 } // class Fixing |