Make CMS Login refresh more robust.

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / ui / widgets / auth / CmsLogin.java

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java
index 4533f649851361ad5605baa79b4d7dcc49284cfe..51c0ab4f55adb2fb204b32e4b70ab39e5770b902 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java
@@ -116,7 +116,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
                }
        }
 
-       protected Composite getCredentialsBlock() {
+       public Composite getCredentialsBlock() {
                return credentialsBlock;
        }
 
@@ -220,7 +220,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
                        child.dispose();
                createContents(parent);
                if (parent.getParent() != null)
-                       parent.getParent().layout();
+                       parent.getParent().layout(true, true);
                else
                        parent.layout();
                usernameT.setText(usernameStr);
@@ -251,7 +251,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
                        Button button = new Button(c, SWT.RADIO);
                        CmsUiUtils.style(button, CMS_USER_MENU_ITEM);
                        button.setData(i);
-                       button.setText(LocaleUtils.lead(locale.getDisplayName(locale), locale) + " (" + locale + ")");
+                       button.setText(LocaleUtils.toLead(locale.getDisplayName(locale), locale) + " (" + locale + ")");
                        // button.addListener(SWT.Selection, listener);
                        button.addSelectionListener(selectionListener);
                        if (i == localeChoice.getSelectedIndex())