Author: tchemit Date: 2012-08-22 11:08:00 +0200 (Wed, 22 Aug 2012) New Revision: 456 Url: http://forge.codelutin.com/repositories/revision/sammoa/456 Log: fixes 1409: Probl?\195?\168me d'export d'observation (ne pas utiliser directement les sql.Date retourner par ToPIA) Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-22 08:37:49 UTC (rev 455) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-22 09:08:00 UTC (rev 456) @@ -432,7 +432,8 @@ } // compute route period - Date beginTime = route.getBeginTime(); + Date beginTime = new Date(route.getBeginTime().getTime()); + Date routeEndTime; if (nextRouteIndex < nbRoutes) { @@ -446,6 +447,7 @@ routeEndTime = flight.getEndDate(); } if (routeEndTime != null) { + routeEndTime = new Date(routeEndTime.getTime()); Preconditions.checkState(routeEndTime.after(beginTime), String.format("Route debut de route %s - fin de route %s", beginTime, routeEndTime)); } 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-08-22 08:37:49 UTC (rev 455) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIModel.java 2012-08-22 09:08:00 UTC (rev 456) @@ -323,12 +323,13 @@ if (beginDate == null || beginDate.before(campaignBeginDate)) { beginDate = campaignBeginDate; } + beginDate = new Date(beginDate.getTime()); Date endDate = getEndDate(); Date campaignEndDate = getSelectedCampaign().getEndDate(); if (endDate == null || endDate.after(campaignEndDate)) { endDate = campaignEndDate; } - + endDate = new Date(endDate.getTime()); ExportMapModel result = ExportMapModel.newModel( getExportDirectory(), filename,