This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 35c7b9e85062eb09c79863186c319e253e069d90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 13 15:52:49 2016 +0100 Ajout d'une méthode pour récupérer le chemin d'un fichier par défaut de sauvegarde d'une base locale --- .../src/main/java/fr/ird/observe/IObserveConfig.java | 7 +++++++ observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java | 7 +++++++ .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +-- .../main/java/fr/ird/observe/ui/storage/StorageUIHandler.java | 10 ---------- .../main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 6 ++---- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java index 6cc673b..912f5c2 100644 --- a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java +++ b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java @@ -263,6 +263,13 @@ public interface IObserveConfig { File getLogConfigurationFile(); + /** + * + * @return un fichier de backup pour une data source locale. + * @since 4.0.6 + */ + File newLocalDataSourceBackupFile(); + boolean isDisplayMainUI(); boolean isCanUseUI(); diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java b/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java index 0302e1a..b60fd2e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java @@ -391,6 +391,13 @@ public class ObserveConfig extends ApplicationConfig implements IObserveConfig { } @Override + public File newLocalDataSourceBackupFile() { + String filename = String.format(BACKUP_DB_PATTERN, new Date()); + File backupFile = new File(getBackupDirectory(), filename); + return backupFile; + } + + @Override public String getH2Login() { String result = getOption(H2_LOGIN.key); return result; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 23569e8..7610334 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -531,8 +531,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (containsOperation(AdminStep.SAVE_LOCAL)) { - File backupfile = new File(config.getBackupDirectory(), - storageHandler.getDefaultBackupFilename()); + File backupfile = config.newLocalDataSourceBackupFile(); getSaveLocalModel().setBackupFile(backupfile); getSaveLocalModel().setDoBackup(true); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index e74d350..21555f6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -70,7 +70,6 @@ import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; import java.sql.SQLException; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -597,15 +596,6 @@ 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 ObserveConfig#BACKUP_DB_PATTERN}). - */ - public String getDefaultBackupFilename() { - return String.format(ObserveConfig.BACKUP_DB_PATTERN, new Date()); - } - - /** * Effectue une sauvegarde de la base locale vers le fichier choisi. * * @param service le service locale qui encapsule la base locale diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 74635ff..1a79c89 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -274,8 +274,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { } setStoreRemoteConfig(config.isStoreRemoteStorage()); - setBackupFile(new File(config.getBackupDirectory(), - storageUIHandler.getDefaultBackupFilename())); + setBackupFile(config.newLocalDataSourceBackupFile()); setDumpFile(config.getBackupDirectory()); setShowMigrationProgression(config.isShowMigrationProgression()); setShowMigrationSql(config.isShowMigrationSql()); @@ -399,8 +398,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { } setStoreRemoteConfig(config.isStoreRemoteStorage()); - setBackupFile(new File(config.getBackupDirectory(), - storageUIHandler.getDefaultBackupFilename())); + setBackupFile(config.newLocalDataSourceBackupFile()); 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>.