Author: fdesbois Date: 2012-09-26 15:12:26 +0200 (Wed, 26 Sep 2012) New Revision: 597 Url: http://forge.codelutin.com/repositories/revision/sammoa/597 Log: fixes #1533 : during export maps, use default sub directory "export" + allow mkdirs 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/ExportMapUIHandler.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-09-26 13:12:08 UTC (rev 596) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-09-26 13:12:26 UTC (rev 597) @@ -58,6 +58,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -659,8 +660,16 @@ EsriGraphicList graphicList) { DbfTableModel tableModel = builder.getModel(); - String pathFile = dataModel.getExportFileWithoutExtension("").getAbsolutePath(); - EsriShapeExport shapeExport = new EsriShapeExport(graphicList, tableModel, pathFile); + File file = dataModel.getExportFileWithoutExtension(""); + if (!file.getParentFile().exists()) { + boolean mkdirs = file.getParentFile().mkdirs(); + if (mkdirs && logger.isDebugEnabled()) { + logger.debug("Create sub directories for export : {}", + file.getParentFile().getAbsolutePath()); + } + } + EsriShapeExport shapeExport = new EsriShapeExport( + graphicList, tableModel, file.getAbsolutePath()); shapeExport.export(); } 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-09-26 13:12:08 UTC (rev 596) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/io/output/map/ExportMapUIHandler.java 2012-09-26 13:12:26 UTC (rev 597) @@ -164,6 +164,7 @@ if (absolutePath.endsWith(File.separator + ".")) { currentDirectory = new File(absolutePath.substring(0, absolutePath.length() - 2)); } + currentDirectory = new File(currentDirectory, "export"); if (logger.isInfoEnabled()) { logger.info("Current directory to use: {}", currentDirectory); }