X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fwidgets%2Fauth%2FCmsLogin.java;h=8f00c457708d31322bde2b1937a286dc3de78b9e;hb=c873a0359345503b8e3ca07828bd99d525ec7cc0;hp=1051bd7239e0564f408711809c2b40f0ab4603c1;hpb=cba35caa1a083661c8e113f5295b2dbfc90a16cd;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java index 1051bd723..8f00c4577 100644 --- a/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java +++ b/org.argeo.cms/src/org/argeo/cms/widgets/auth/CmsLogin.java @@ -4,7 +4,7 @@ import static org.argeo.cms.CmsMsg.password; import static org.argeo.cms.CmsMsg.username; import static org.argeo.cms.auth.AuthConstants.LOGIN_CONTEXT_ANONYMOUS; import static org.argeo.cms.auth.AuthConstants.LOGIN_CONTEXT_USER; -import static org.argeo.cms.internal.kernel.Activator.getKernelHeader; +import static org.argeo.cms.internal.kernel.Activator.getNodeState; import java.io.IOException; import java.util.List; @@ -29,8 +29,9 @@ import org.argeo.cms.CmsView; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.HttpRequestCallback; import org.argeo.cms.i18n.LocaleUtils; +import org.argeo.cms.internal.auth.LocaleChoice; import org.argeo.cms.util.CmsUtils; -import org.argeo.util.LocaleChoice; +import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; @@ -64,8 +65,8 @@ public class CmsLogin implements CmsStyles, CallbackHandler { public CmsLogin(CmsView cmsView) { this.cmsView = cmsView; - defaultLocale = getKernelHeader().getDefaultLocale(); - List locales = getKernelHeader().getLocales(); + defaultLocale = getNodeState().getDefaultLocale(); + List locales = getNodeState().getLocales(); if (locales != null) localeChoice = new LocaleChoice(locales, defaultLocale); loginSelectionListener = new SelectionListener() { @@ -266,6 +267,12 @@ public class CmsLogin implements CmsStyles, CallbackHandler { loginContext.login(); } catch (FailedLoginException e) { log.warn(e.getMessage()); + try { + Thread.sleep(3000); + } catch (InterruptedException e2) { + // silent + } +// ErrorFeedback.show("Login failed", e); return false; } catch (LoginException e) { log.error("Cannot login", e);