r4018 - in trunk/src/main: java/fr/ifremer/isisfish/datastore java/fr/ifremer/isisfish/ui/input resources/i18n
Author: echatellier Date: 2014-06-17 11:02:25 +0200 (Tue, 17 Jun 2014) New Revision: 4018 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4018 Log: Remove import from v2 Removed: trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-06-16 16:04:46 UTC (rev 4017) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-06-17 09:02:25 UTC (rev 4018) @@ -61,7 +61,6 @@ import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.StorageException; -import fr.ifremer.isisfish.datastore.update.ImportFromV2; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.Gear; @@ -314,29 +313,6 @@ } /** - * Importer la region depuis un fichier XML de la version 2. - * - * @param inputUI inputUI - */ - public void importV2Region(InputUI inputUI) { - - setStatusMessage(inputUI, t("isisfish.message.import.xml.v2.file"), true); - - try { - File file = FileUtil.getFile(".*.xml$", t("isisfish.message.import.region.xml")); - if (file != null) { - new ImportFromV2(true).importXML(file); - - refreshRegionList(inputUI, null); - } - } catch (Exception eee) { - throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); - } - - setStatusMessage(inputUI, t("isisfish.message.import.finished")); - } - - /** * Extract from a simulation the region, and rename it with name given * by user. * Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-06-16 16:04:46 UTC (rev 4017) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-06-17 09:02:25 UTC (rev 4018) @@ -32,7 +32,6 @@ <JMenu text="isisfish.common.region"> <JMenuItem text="isisfish.input.menu.importRegion" onActionPerformed="getHandler().importRegion(this)" /> <JMenuItem text="isisfish.input.menu.importRenameRegion" onActionPerformed="getHandler().importRegionAndRename(this)" /> - <JMenuItem text="isisfish.input.menu.importRegionV2" onActionPerformed="getHandler().importV2Region(this)" /> <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="getHandler().importRegionFromSimulation(this)" /> <JMenuItem text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().exportRegion(this)" /> <JMenuItem text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().copyRegion(this)" /> Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-06-16 16:04:46 UTC (rev 4017) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2014-06-17 09:02:25 UTC (rev 4018) @@ -211,6 +211,7 @@ isisfish.config.main.simulation.ssh.pbsbinpath.description=PBS executables (qsub, qdel...) directory isisfish.config.main.simulation.ssh.pbsqsuboptions=Qsub arguments isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments used at qsub job sumbit. Default to '-m n' don't send mail. +isisfish.config.main.simulation.ssh.proxy.command.description= isisfish.config.main.simulation.ssh.server=Simulation server isisfish.config.main.simulation.ssh.server.description=Simulation server address isisfish.config.main.simulation.ssh.tmppath=Server temp directory Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-06-16 16:04:46 UTC (rev 4017) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-06-17 09:02:25 UTC (rev 4018) @@ -211,6 +211,7 @@ isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur isisfish.config.main.simulation.ssh.pbsqsuboptions=Arguments qsub isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments utilisés lors de la soumission des jobs. Par défaut '-m n' pas d'envoi de mails. +isisfish.config.main.simulation.ssh.proxy.command.description= isisfish.config.main.simulation.ssh.server=Serveur de simulation isisfish.config.main.simulation.ssh.server.description=Adresse du serveur de simulation isisfish.config.main.simulation.ssh.tmppath=Dossier temporaire
participants (1)
-
echatellier@users.forge.codelutin.com