This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 79bfa048ccd925f5db4847e14305978c879d2175 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 10:07:28 2015 +0200 Ajout de la locale applicative (mais cela devra certainement être redescendu au niveau du service context) --- .../services/ObserveServiceApplicationContext.java | 15 +++++++++++++++ .../fr/ird/observe/services/ObserveServiceContext.java | 4 +++- .../ird/observe/services/ObserveServiceContextTopia.java | 6 ++++++ .../ird/observe/services/ApplicationContextResource.java | 2 ++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java index 5e80a74..a25b1e7 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java @@ -9,6 +9,7 @@ import java.nio.file.Path; import java.nio.file.attribute.FileAttribute; import java.nio.file.attribute.PosixFilePermission; import java.nio.file.attribute.PosixFilePermissions; +import java.util.Locale; import java.util.Set; /** @@ -19,6 +20,12 @@ import java.util.Set; public class ObserveServiceApplicationContext { /** + * FIXME peut-être pas le bon endroit, car la locale est en scope request. + * + * La locale de l'application. + */ + protected Locale applicationLocale; + /** * La locale du référentiel. */ protected ReferentialLocale referentialLocale; @@ -33,6 +40,14 @@ public class ObserveServiceApplicationContext { */ protected Path temporaryDirectoryRoot; + public Locale getApplicationLocale() { + return applicationLocale; + } + + public void setApplicationLocale(Locale applicationLocale) { + this.applicationLocale = applicationLocale; + } + public ReferentialLocale getReferentialLocale() { return referentialLocale; } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java index cd959c9..f811dd6 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java @@ -6,6 +6,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.File; import java.io.IOException; import java.util.Date; +import java.util.Locale; /** * Created on 16/08/15. @@ -16,6 +17,8 @@ public interface ObserveServiceContext { ReferentialLocale getReferentialLocale(); + Locale getApplicationLocale(); + Date now(); /** @@ -32,5 +35,4 @@ public interface ObserveServiceContext { * Pour créer un répertoire temporaire dont le nom commence par le préfixe donné. */ File createTemporaryDirectory(String prefix) throws IOException; - } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index c846e89..cee443b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -8,6 +8,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.File; import java.util.Date; +import java.util.Locale; /** * Created on 16/08/15. @@ -36,6 +37,11 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { } @Override + public Locale getApplicationLocale() { + return applicationContext.getApplicationLocale(); + } + + @Override public Date now() { return new Date(); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index e07f66c..9ed1d71 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -18,6 +18,7 @@ import org.nuiton.util.version.Version; import java.io.File; import java.nio.file.Path; +import java.util.Locale; /** * Created on 18/08/15. @@ -97,6 +98,7 @@ public class ApplicationContextResource implements TestRule { ObserveServiceTopia.init(); + serviceApplicationContext.setApplicationLocale(Locale.FRANCE); serviceApplicationContext.setReferentialLocale(ReferentialLocale.FR); serviceApplicationContext.setMainServiceFactory(serviceFactory); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.