This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3b79e6e4c122806bba0195fc241bd72f280c816a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 19 16:44:15 2016 +0200 Add new options for auto backup + add nice method to get next backup file --- .../configuration/ObserveSwingApplicationConfig.java | 6 +++++- .../ObserveSwingApplicationConfigOption.java | 14 ++++++++++++++ .../application-swing-configuration_en_GB.properties | 2 ++ .../application-swing-configuration_es_ES.properties | 2 ++ .../application-swing-configuration_fr_FR.properties | 2 ++ .../application/swing/ui/actions/ShowConfigAction.java | 2 ++ .../application/swing/ui/admin/AdminUIModel.java | 2 +- .../application/swing/ui/storage/StorageUIHandler.java | 17 ++++++++--------- .../application/swing/ui/storage/StorageUIModel.java | 4 ++-- 9 files changed, 38 insertions(+), 13 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java index b017de2..e418b8c 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java @@ -56,7 +56,7 @@ import static org.nuiton.i18n.I18n.t; public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicationConfig { /** le pattern du fichier de sauvegarde d'une base locale */ - public static final String BACKUP_DB_PATTERN = "obstuna-local-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; + private static final String BACKUP_DB_PATTERN = "obstuna-local-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; public static final String DB_NAME = "obstuna"; @@ -310,6 +310,10 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat setTreeOpenNodes(StringUtils.join(ids, ",")); } + public File newBackupDataFile() { + return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, new Date())); + } + public void saveForUser() { if (log.isInfoEnabled()) { log.info(t("observe.message.save.configuration", get().getUserConfigFile())); diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java index 7750204..0c5df74 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java @@ -654,6 +654,20 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "validation.speedMaxValue", n("observe.config.validation.speedMaxValue"), "30.0" + ), + /** Pour activer les sauvegarde automatiques. */ + BACKUP_USE( + Boolean.class, + "backup.use", + n("observe.config.backup.use"), + "true" + ), + /** Le nombre de minutes avant de lancer une sauvegarde de la base locale. */ + BACKUP_DELAY( + Integer.class, + "backup.delay", + n("observe.config.backup.delay"), + "30" ); public static final List<ObserveSwingApplicationConfigOption> MAP_LAYERS = 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 ae486f4..ff9503d 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 @@ -7,6 +7,8 @@ observe.action.commandline.launch.admin.ui=Launch an administration task observe.action.commandline.launch.h2.server.mode=Launch ObServe in server mode observe.action.commandline.launch.obstuna.admin.ui=Launch an adminstration task on obstuna observe.action.commandline.use.jmx=Add JMX support +observe.config.backup.delay=Delay in minutes between local data source backup +observe.config.backup.use=To activate auto backup of local source observe.config.configFileName.description=Configuration filename observe.config.db.locale=Language of data source observe.config.defaultBackupDirectory.description=Default directory where are stored backup of data sources 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 4b13684..150d075 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 @@ -7,6 +7,8 @@ observe.action.commandline.launch.admin.ui=Ejecutar una operación de administra observe.action.commandline.launch.h2.server.mode=Ejecutar ObServe en modo servidor observe.action.commandline.launch.obstuna.admin.ui=Ejecutar una operación de administración sobre Obstuna observe.action.commandline.use.jmx=Mostrar el soporte JMX +observe.config.backup.delay=Delay in minutes between local data source backup #TODO +observe.config.backup.use=To activate auto backup of local source #TODO observe.config.configFileName.description=Nombre del archivo de configuración observe.config.db.locale=Idioma del referencial observe.config.defaultBackupDirectory.description=Carpeta por defecto para copia de seguridad de bases locales 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 3106d75..fcc3cd3 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 @@ -7,6 +7,8 @@ observe.action.commandline.launch.admin.ui=Lancer une opération d'administratio observe.action.commandline.launch.h2.server.mode=Lancer ObServe en mode serveur observe.action.commandline.launch.obstuna.admin.ui=Lancer une opération d'administration sur Obstuna observe.action.commandline.use.jmx=Ajouter le support JMX +observe.config.backup.delay=Temps en minutes entre chaque sauvegarde de la base locale +observe.config.backup.use=Pour activer la sauvegarde automatique observe.config.configFileName.description=Le nom du fichier de configuration observe.config.db.locale=La langue du référentiel observe.config.defaultBackupDirectory.description=Répertoire par défaut où sauvegarder les bases locales 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 f39dd0d..6f9296a 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 @@ -329,6 +329,8 @@ public class ShowConfigAction extends AbstractAction { helper.addOption(ObserveSwingApplicationConfigOption.LOAD_LOCAL_STORAGE, ObserveUICallback.application); helper.addOption(ObserveSwingApplicationConfigOption.LOCALE, ObserveUICallback.ui); helper.addOption(ObserveSwingApplicationConfigOption.DB_LOCALE, ObserveUICallback.ui); + helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_USE, ObserveUICallback.application); + helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_DELAY, ObserveUICallback.application); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index de2c1d4..86d0c31 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -565,7 +565,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (containsOperation(AdminStep.SAVE_LOCAL)) { - File backupfile = new File(config.getBackupDirectory(), storageHandler.getDefaultBackupFilename()); + File backupfile = config.newBackupDataFile(); getSaveLocalModel().setBackupFile(backupfile); getSaveLocalModel().setDoBackup(true); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index 340d85c..9525a32 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -66,7 +66,6 @@ import java.awt.Window; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.util.Date; import java.util.Set; import java.util.stream.Collectors; @@ -604,14 +603,14 @@ public class StorageUIHandler { } } - /** - * @return le lastName par defaut du fichier de sauvegarde de la base locale - * (expression calculée à partir de la date courante et du pattern - * {@link ObserveSwingApplicationConfig#BACKUP_DB_PATTERN}). - */ - public String getDefaultBackupFilename() { - return String.format(ObserveSwingApplicationConfig.BACKUP_DB_PATTERN, new Date()); - } +// /** +// * @return le lastName par defaut du fichier de sauvegarde de la base locale +// * (expression calculée à partir de la date courante et du pattern +// * {@link ObserveSwingApplicationConfig#BACKUP_DB_PATTERN}). +// */ +// public String getDefaultBackupFilename() { +// return String.format(ObserveSwingApplicationConfig.BACKUP_DB_PATTERN, new Date()); +// } /** * Effectue une sauvegarde de la base locale vers le fichier choisi. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index 7534458..fb5866b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -367,7 +367,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { } setStoreRemoteConfig(config.isStoreRemoteStorage()); - setBackupFile(new File(config.getBackupDirectory(), storageUIHandler.getDefaultBackupFilename())); + setBackupFile(config.newBackupDataFile()); setDumpFile(config.getBackupDirectory()); setShowMigrationProgression(config.isShowMigrationProgression()); setShowMigrationSql(config.isShowMigrationSql()); @@ -482,7 +482,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { } setStoreRemoteConfig(config.isStoreRemoteStorage()); - setBackupFile(new File(config.getBackupDirectory(), storageUIHandler.getDefaultBackupFilename())); + setBackupFile(config.newBackupDataFile()); setDumpFile(config.getBackupDirectory()); setShowMigrationProgression(config.isShowMigrationProgression()); setShowMigrationSql(config.isShowMigrationSql()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.