Mercurial > dive4elements > river
diff 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 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Wed Apr 04 10:32:45 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Wed Apr 04 14:17:36 2012 +0000 @@ -430,7 +430,7 @@ for (SectorRange src: sectors) { SectorRange dst = new SectorRange(src); - if (dst.clip(range)) { + if (range == null || dst.clip(range)) { result.add(dst); } } @@ -555,7 +555,8 @@ Filter filter ) { for (Column column: columns) { - if (column.intersects(range) && filter.accept(column)) { + if ((range == null || column.intersects(range)) + && (filter == null || filter.accept(column))) { allColumns.add(column); } }