Author: fdesbois Date: 2012-09-10 13:10:56 +0200 (Mon, 10 Sep 2012) New Revision: 565 Url: http://forge.codelutin.com/repositories/revision/sammoa/565 Log: fixes #1480: use min and max seconds for begin and end date in export maps Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java 2012-09-10 11:10:41 UTC (rev 564) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java 2012-09-10 11:10:56 UTC (rev 565) @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import fr.ulr.sammoa.application.io.output.map.ExportMapModel; import fr.ulr.sammoa.persistence.Campaign; +import fr.ulr.sammoa.persistence.Dates; import fr.ulr.sammoa.persistence.RouteType; import fr.ulr.sammoa.persistence.Species; import fr.ulr.sammoa.persistence.Species2; @@ -323,13 +324,21 @@ if (beginDate == null || beginDate.before(campaignBeginDate)) { beginDate = campaignBeginDate; } - beginDate = new Date(beginDate.getTime()); + beginDate = Dates.toDateTime(beginDate) + .secondOfDay() + .withMinimumValue() + .toDate(); + Date endDate = getEndDate(); Date campaignEndDate = getSelectedCampaign().getEndDate(); if (endDate == null || endDate.after(campaignEndDate)) { endDate = campaignEndDate; } - endDate = new Date(endDate.getTime()); + endDate = Dates.toDateTime(endDate) + .secondOfDay() + .withMaximumValue() + .toDate(); + ExportMapModel result = ExportMapModel.newModel( getExportDirectory(), filename,