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 32aa66bb1e2d8866acb7b0b70ff58d2b3f2c7965 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 20:39:05 2016 +0200 Utilisation d'un meilleur nom de rapport de validation --- .../observe/configuration/ObserveSwingApplicationConfig.java | 3 --- .../java/fr/ird/observe/ui/admin/validate/ValidateModel.java | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java index e482d6e..006164a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java @@ -85,9 +85,6 @@ public class ObserveSwingApplicationConfig extends ApplicationConfig { /** le pattern du fichier de sauvegarde d'une base access importée */ public static final String ACCESS_DB_PATTERN = "import-access-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; - /** le pattern du fichier de rapport après validation */ - public static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; - public static final String DB_NAME = "obstuna"; /** diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java index c4b9cba..765027b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.admin.validate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; @@ -68,6 +67,9 @@ public class ValidateModel extends AdminActionModel { public static final String PROPERTY_MESSAGES = "messages"; + /** le pattern du fichier de rapport après validation */ + private static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.txt"; + /** Logger */ private static final Log log = LogFactory.getLog(ValidateModel.class); @@ -102,12 +104,10 @@ public class ValidateModel extends AdminActionModel { } /** - * @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#REPORT_PATTERN}). + * @return le nom par defaut du rapport de validation à enregistrer. */ public String getDefaultReportFilename() { - return String.format(ObserveSwingApplicationConfig.REPORT_PATTERN, new Date()); + return String.format(REPORT_PATTERN, new Date()); } public String getContextName() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.