# HG changeset patch # User Sascha L. Teichmann # Date 1366794869 -7200 # Node ID 948d07aa988a1308a79df2b4e4c9493563564939 # Parent 948be49754c5d092560c9365cf6434522b9ab2f4 FixA: Fixes flys/issue1138 (Ausgel. WSPL: Streckenintelligenz bei Generierung Balkendiagramm) diff -r 948be49754c5 -r 948d07aa988a flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Wed Apr 24 09:10:48 2013 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Wed Apr 24 11:14:29 2013 +0200 @@ -194,6 +194,15 @@ return sectors; } + public boolean hasSectorsInRange(Range range) { + for (SectorRange sector: sectors) { + if (sector.intersects(range)) { + return true; + } + } + return false; + } + public List getSectors(Range range) { List result = @@ -340,7 +349,7 @@ Filter filter ) { for (Column column: columns) { - if ((range == null || column.intersects(range)) + if ((range == null || column.hasSectorsInRange(range)) && (filter == null || filter.accept(column))) { allColumns.add(column); }