This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d4f2db82d0783e5d59d5afbdf817a611d552a426 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 13:27:54 2016 +0100 Mémorisation du dernier dossier utilisé (Fixes #8864) --- .../src/main/config/ObserveSwingApplication.ini | 8 ++++++++ .../i18n/application-swing-configuration_en_GB.properties | 1 + .../i18n/application-swing-configuration_es_ES.properties | 1 + .../i18n/application-swing-configuration_fr_FR.properties | 1 + .../application/swing/ui/actions/ImportStorageFromFileAction.java | 8 ++++++++ .../observe/application/swing/ui/actions/ShowConfigAction.java | 1 + 6 files changed, 20 insertions(+) diff --git a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini index 34e1816..2c03b37 100644 --- a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini +++ b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini @@ -53,6 +53,14 @@ defaultValue = ${data.directory}/backup transient = true final = true +[option importDirectory] +description = observe.config.importDirectory.description +key = import.directory +type = file +defaultValue = ${data.directory}/backup +transient = true +final = true + [option resourcesDirectory] description = observe.config.defaultResourcesDirectory.description key = resources.directory diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties index 11ed12d..6ee062e 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -31,6 +31,7 @@ observe.config.h2.can.migrate.description=Flag to know if you can migrate h2 dat observe.config.h2.login.description=H2 Login observe.config.h2.password.description=H2 Password observe.config.h2.serverPort.description=Server port number +observe.config.importDirectory.description=Import directory observe.config.logConfigurationFile.description=Log file configuration observe.config.map.background.description=Color of background observe.config.map.layer1.description=File (shapefile) for layer 1 of map diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties index 98e5260..9a29a6f 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -31,6 +31,7 @@ observe.config.h2.can.migrate.description=Autorizar la actualización de las bas observe.config.h2.login.description=Login h2 observe.config.h2.password.description=Contraseña h2 observe.config.h2.serverPort.description=Puerto del servidor h2 +observe.config.importDirectory.description=Répertoire où chercher les imports \#TODO observe.config.logConfigurationFile.description=Archivo de configuration de los logs observe.config.map.background.description=Color del fondo del mapa observe.config.map.layer1.description=Archivo (shapeFiles) del primer calco del mapa diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index 9ab7026..58a6ef2 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -31,6 +31,7 @@ observe.config.h2.can.migrate.description=Autoriser la mise à jour des bases lo observe.config.h2.login.description=Le login h2 observe.config.h2.password.description=Le mot de passe h2 observe.config.h2.serverPort.description=Port du serveur h2 +observe.config.importDirectory.description=Répertoire où chercher les imports observe.config.logConfigurationFile.description=Fichier de configuration des logs observe.config.map.background.description=Couleur du fond de carte observe.config.map.layer1.description=Fichier (shapeFiles) du premier calque de la carte diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java index d8b0a42..78eb2bc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ImportStorageFromFileAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.actions; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.configuration.constants.CreationMode; import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.ui.ObserveMainUI; @@ -35,6 +36,7 @@ import jaxx.runtime.SwingUtil; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; +import java.io.File; import static org.nuiton.i18n.I18n.t; @@ -71,6 +73,7 @@ public class ImportStorageFromFileAction extends AbstractAction { super.init(ui); StorageUIModel model = ui.getModel(); + model.setDumpFile(ImportStorageFromFileAction.this.ui.getConfig().getImportDirectory()); model.setCanCreateLocalService(true); model.setCanUseLocalService(false); model.setCanUseRemoteService(false); @@ -95,6 +98,11 @@ public class ImportStorageFromFileAction extends AbstractAction { super.doAction(ui); StorageUIHandler handler = getStorageUIHandler(); handler.doChangeStorage(ui.getModel()); + + File importDirectory = ui.getModel().getDumpFile().getParentFile(); + ObserveSwingApplicationConfig config = ImportStorageFromFileAction.this.ui.getConfig(); + config.setImportDirectory(importDirectory); + config.saveForUser(); } }.start(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java index dba3337..22f05b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java @@ -259,6 +259,7 @@ public class ShowConfigAction extends AbstractAction { helper.addOption(ObserveSwingApplicationConfigOption.DATA_DIRECTORY); helper.addOption(ObserveSwingApplicationConfigOption.DB_DIRECTORY); helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY); + helper.addOption(ObserveSwingApplicationConfigOption.IMPORT_DIRECTORY); helper.addOption(ObserveSwingApplicationConfigOption.TMP_DIRECTORY); helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY); helper.addOption(ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.