Author: tchemit Date: 2012-08-29 13:58:57 +0200 (Wed, 29 Aug 2012) New Revision: 489 Url: http://forge.codelutin.com/repositories/revision/sammoa/489 Log: fixes #1425: Nom des fichiers ?\195?\160 l'export Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java 2012-08-29 11:58:12 UTC (rev 488) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/application/ExportApplicationUIHandler.java 2012-08-29 11:58:57 UTC (rev 489) @@ -413,7 +413,8 @@ flights = flightService.getFlights(newCampaign); // add a null value to unselect flights flights.add(0, null); - filename = String.format("campaign-%s.sammoa", newCampaign.getCode()); + filename = String.format("campaign-%1$s_%2$tY_%2$tm_%2$td.sammoa", + newCampaign.getCode(), new Date()); } if (logger.isDebugEnabled()) { logger.debug("New flights: {}", flights.size()); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-08-29 11:58:12 UTC (rev 488) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-08-29 11:58:57 UTC (rev 489) @@ -63,6 +63,7 @@ import java.beans.PropertyChangeListener; import java.io.File; import java.util.Collections; +import java.util.Date; import java.util.List; import static org.nuiton.i18n.I18n._; @@ -153,9 +154,10 @@ ExportMapUIModel model = getModel(); - model.setExportEffortsFilename("Efforts"); - model.setExportObservationsFilename("Observations"); - model.setExportGeoPointsFilename("GeoPoints"); + String suffix = String.format("_%1$tY_%1$tm_%1$td", new Date()); + model.setExportEffortsFilename("Efforts" + suffix); + model.setExportObservationsFilename("Observations" + suffix); + model.setExportGeoPointsFilename("GeoPoints" + suffix); File currentDirectory = FileUtil.getCurrentDirectory(); String absolutePath = currentDirectory.getAbsolutePath();