Author: bpoussin Date: 2016-11-30 14:31:05 +0100 (Wed, 30 Nov 2016) New Revision: 4377 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4377 Log: changement de l'extension du fichier .isonz -> .isis.json.gz Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java 2016-11-30 13:29:51 UTC (rev 4376) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java 2016-11-30 13:31:05 UTC (rev 4377) @@ -62,6 +62,7 @@ static private Log log = LogFactory.getLog(RegionExportJson.class); final static public int FORMAT_VERSION = 1; + final static public String FORMAT_EXTENSION = ".isis.json.gz"; protected LinkedList<TopiaEntity> toVisit; protected Set<String> visited; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2016-11-30 13:29:51 UTC (rev 4376) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2016-11-30 13:31:05 UTC (rev 4377) @@ -385,13 +385,12 @@ */ protected void exportJson(TopiaEntity e) { try { - File file = FileUtil.getFile(".*.isonz$", + File file = FileUtil.getFile(".*" + RegionExportJson.FORMAT_EXTENSION + "$", t("isisfish.message.import.region.zipped")); if (file != null) { - // add .isonz extension is not set - if (!file.getAbsolutePath().endsWith(".isonz")) { - file = new File(file.getAbsolutePath() + ".isonz"); + if (!file.getAbsolutePath().endsWith(RegionExportJson.FORMAT_EXTENSION)) { + file = new File(file.getAbsolutePath() + RegionExportJson.FORMAT_EXTENSION); } int resp = JOptionPane.YES_OPTION; @@ -431,35 +430,40 @@ public void importEntityJson() { setStatusMessage(inputUI, t("isisfish.message.import.zip"), true); try { - File file = FileUtil.getFile(".*\\.isonz$", - t("isisfish.message.import.region.zipped")); InputSaveVerifier inputSaveVerifier = inputUI.getContextValue(InputSaveVerifier.class); - if (file != null && inputSaveVerifier.checkEdit() != JOptionPane.CANCEL_OPTION) { - FisheryRegion fisheryRegion = inputUI.getContextValue(FisheryRegion.class); - TopiaContext tx = fisheryRegion.getTopiaContext(); - RegionImportJson.RegionMergeDatabase merge = - new RegionImportJson.RegionMergeDatabase(tx); - try (InputStream in = new BufferedInputStream( - new GZIPInputStream(new FileInputStream(file)))) { - RegionImportJson json = new RegionImportJson(new InputStreamReader(in, "UTF-8"), - merge); - Collection<TopiaEntity> entities = json.getEntities(); - log.info("Entities to importe: " + entities.size()); - for (TopiaEntity e : entities) { - tx.add(e); + if (inputSaveVerifier.checkEdit() != JOptionPane.CANCEL_OPTION) { + File file = FileUtil.getFile(".*" + RegionExportJson.FORMAT_EXTENSION + "$", + t("isisfish.message.import.region.zipped")); + if (file != null) { + if (!file.getAbsolutePath().endsWith(RegionExportJson.FORMAT_EXTENSION)) { + file = new File(file.getAbsolutePath() + RegionExportJson.FORMAT_EXTENSION); } - tx.commitTransaction(); - log.info("Import merged"); - } catch (Exception eee) { - tx.rollbackTransaction(); - if (!merge.isAbort()) { - throw eee; - } else { - log.info("Import aborted"); + FisheryRegion fisheryRegion = inputUI.getContextValue(FisheryRegion.class); + TopiaContext tx = fisheryRegion.getTopiaContext(); + RegionImportJson.RegionMergeDatabase merge = + new RegionImportJson.RegionMergeDatabase(tx); + try (InputStream in = new BufferedInputStream( + new GZIPInputStream(new FileInputStream(file)))) { + RegionImportJson json = new RegionImportJson(new InputStreamReader(in, "UTF-8"), + merge); + Collection<TopiaEntity> entities = json.getEntities(); + log.info("Entities to importe: " + entities.size()); + for (TopiaEntity e : entities) { + tx.add(e); + } + tx.commitTransaction(); + log.info("Import merged"); + } catch (Exception eee) { + tx.rollbackTransaction(); + if (!merge.isAbort()) { + throw eee; + } else { + log.info("Import aborted"); + } } + inputSaveVerifier.cancel(); + loadRegion(fisheryRegion.getName()); } - inputSaveVerifier.cancel(); - loadRegion(fisheryRegion.getName()); } } catch (Exception eee) { throw new IsisFishRuntimeException("Can't import region", eee);