Use UI context http request

[lgpl/argeo-commons.git] / org.argeo.eclipse.ui.rap / src / org / argeo / eclipse / ui / specific / UiContext.java

diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
index ebececf154cae3d0bed8b6f2d209761cf56c5ad7..ec3b2e96a62eb18cd162a25b167625223e03e984 100644 (file)
--- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
+++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
@@ -9,18 +9,23 @@ import org.eclipse.swt.widgets.Display;
 
 /** Singleton class providing single sources infos about the UI context. */
 public class UiContext {
-
+       /** Can be null, thus indicating that we are not in a web context. */
        public static HttpServletRequest getHttpRequest() {
                return RWT.getRequest();
        }
 
        public static Locale getLocale() {
-               return RWT.getUISession().getLocale();
+               if (Display.getCurrent() != null)
+                       return RWT.getUISession().getLocale();
+               else
+                       return Locale.getDefault();
        }
 
        public static void setLocale(Locale locale) {
                if (Display.getCurrent() != null)
                        RWT.getUISession().setLocale(locale);
+               else
+                       Locale.setDefault(locale);
        }
 
        /** Can always be null */