Repair locale support

diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
index 9c8680c4d79660260c2b67e3e26ad56a5a7553ba..43e57396b6279097d13165b98ff761804f969c92 100644 (file)
--- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
+++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
@@ -62,13 +62,14 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
        // optional subject to be set explicitly
        private Subject subject = null;
 
-       public CmsLogin(CmsView cmsView) {
+       private CmsContext cmsContext;
+
+       public CmsLogin(CmsView cmsView, CmsContext cmsContext) {
                this.cmsView = cmsView;
-               CmsContext nodeState = null;// = Activator.getNodeState();
-               // FIXME reactivate locales
-               if (nodeState != null) {
-                       defaultLocale = nodeState.getDefaultLocale();
-                       List<Locale> locales = nodeState.getLocales();
+               this.cmsContext = cmsContext;
+               if (this.cmsContext != null) {
+                       defaultLocale = this.cmsContext.getDefaultLocale();
+                       List<Locale> locales = this.cmsContext.getLocales();
                        if (locales != null)
                                localeChoice = new LocaleChoice(locales, defaultLocale);
                } else {

diff --git a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java
index f6a35f136597b9f2e9963046b26515c2979e27d9..a4d7c07704a8eceed53b7b33280d6a8952a29dc9 100644 (file)
--- a/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java
+++ b/eclipse/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLoginShell.java
@@ -1,5 +1,6 @@
 package org.argeo.cms.swt.auth;
 
+import org.argeo.api.cms.CmsContext;
 import org.argeo.api.cms.CmsView;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.SWT;
@@ -11,8 +12,8 @@ import org.eclipse.swt.widgets.Shell;
 public class CmsLoginShell extends CmsLogin {
        private final Shell shell;
 
-       public CmsLoginShell(CmsView cmsView) {
-               super(cmsView);
+       public CmsLoginShell(CmsView cmsView, CmsContext cmsContext) {
+               super(cmsView, cmsContext);
                shell = createShell();
 //             createUi(shell);
        }
@@ -65,8 +66,8 @@ public class CmsLoginShell extends CmsLogin {
        public Shell getShell() {
                return shell;
        }
-       
-       public void createUi(){
+
+       public void createUi() {
                createUi(shell);
        }
 }

diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenu.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenu.java
index 316cb51c019019c82d2ae30dc5bf64f677b82f52..008ec2c161da3ded1feadafcf9b91b9f669a006e 100644 (file)
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenu.java
+++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/UserMenu.java
@@ -17,7 +17,8 @@ public class UserMenu extends CmsLoginShell {
        private final Node context;
 
        public UserMenu(Control source, Node context) {
-               super(CmsUiUtils.getCmsView());
+               // FIXME pass CMS context
+               super(CmsUiUtils.getCmsView(), null);
                this.context = context;
                createUi();
                if (source == null)

diff --git a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
index ac9ab1dbef14a37e51cf563862e984fd88d97d54..95be53d5fd6238ac96bdada8fab90786f8b287db 100644 (file)
--- a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
+++ b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
@@ -62,7 +62,8 @@ public class CmsLoginLifecycle implements CmsView {
                Subject subject = Subject.getSubject(AccessController.getContext());
                Display display = Display.getCurrent();
 //             UiContext.setData(CmsView.KEY, this);
-               CmsLoginShell loginShell = new CmsLoginShell(this);
+               // FIXME get CMS context
+               CmsLoginShell loginShell = new CmsLoginShell(this, null);
                CmsSwtUtils.registerCmsView(loginShell.getShell(), this);
                loginShell.setSubject(subject);
                try {