Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsOverview.java @ 6999:3e93f29281bc
Fix for flys/issue1479: The indices of the dates of the analysis periods where re-mapped wrong.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Thu, 12 Sep 2013 16:35:07 +0200 |
parents | c5ce9812388b |
children | 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsOverview.java Thu Sep 12 11:50:39 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsOverview.java Thu Sep 12 16:35:07 2013 +0200 @@ -770,14 +770,21 @@ protected Date end; public DateRangeFilter(Date start, Date end) { - this.start = start; - this.end = end; + if (start.before(end)) { + this.start = start; + this.end = end; + } + else { + this.start = end; + this.end = start; + } } @Override public boolean accept(Fixing.Column column) { Date date = column.getStartTime(); - return start.compareTo(date) <= 0 && end.compareTo(date) >= 0; + // start <= date <= end + return !(date.before(start) || date.after(end)); } } // class DateRangeFilter