dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataValueFilter.java comparison

The existing implementation respects the fact that months are 0-based.

author	Tom Gottfried <tom@intevation.de>
date	Wed, 03 Sep 2014 18:21:35 +0200
parents	9ecd6267323b
children	a1ceacf15d3a

comparison

equal deleted inserted replaced

-:705f8b92fd66
+:00066d3add94
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import org.dive4elements.river.utils.DateUtil;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData.Value;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData.Value.Filter;
 public final class SedimentLoadDataValueFilter {
 public TimeRangeIntersects(int year) {
 this(year, year);
 }
 public TimeRangeIntersects(int startYear, int endYear) {
-this(firstJan(Math.min(startYear, endYear)),
+this(DateUtil.getStartDateFromYear(Math.min(startYear, endYear)),
-lastDec(Math.max(startYear, endYear)));
+DateUtil.getEndDateFromYear(Math.max(startYear, endYear)));
-}
-private static Date firstJan(int year) {
-Calendar cal = Calendar.getInstance();
-cal.set(year, 1, 1, 0, 0, 0);
-return cal.getTime();
-}
-private static Date lastDec(int year) {
-Calendar cal = Calendar.getInstance();
-cal.set(year, 12, 31, 23, 59, 59);
-return cal.getTime();
 }
 public TimeRangeIntersects(Date a, Date b) {
 if (a.after(b)) {
 this.b = a;

Mercurial > dive4elements > river