Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/BedQualityPeriodsSelect.java @ 8639:97d60b0afe24
(issue1755) Fix check for valid date range.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 27 Mar 2015 17:26:34 +0100 |
| parents | 5a5331dd3e8d |
| children | 22f01b7e802e |
comparison
equal
deleted
inserted
replaced
| 8638:3c78fc83fc6d | 8639:97d60b0afe24 |
|---|---|
| 132 | 132 |
| 133 long min = minMax[0]; | 133 long min = minMax[0]; |
| 134 long max = minMax[1]; | 134 long max = minMax[1]; |
| 135 for (DateRange range: access.getDateRanges()) { | 135 for (DateRange range: access.getDateRanges()) { |
| 136 long a = range.getFrom().getTime(); | 136 long a = range.getFrom().getTime(); |
| 137 long b = range.getFrom().getTime(); | 137 long b = range.getTo().getTime(); |
| 138 if ((a < min || a > max) && | 138 log.debug("min max a b " + min + " " + max + " " + a + " " + b); |
| 139 ( b < min || b > max)) { | 139 if (b < min || a > max || a > b) { |
| 140 DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy"); | 140 DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy"); |
| 141 throw new IllegalArgumentException(Resources.getMsg(context.getMeta(), | 141 throw new IllegalArgumentException(Resources.getMsg(context.getMeta(), |
| 142 I18N_NO_DATA_FOR_PERIOD, | 142 I18N_NO_DATA_FOR_PERIOD, |
| 143 I18N_NO_DATA_FOR_PERIOD, | 143 I18N_NO_DATA_FOR_PERIOD, |
| 144 new Object[] {df.format(range.getFrom()), | 144 new Object[] {df.format(range.getFrom()), |