X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FLoginEntryPoint.java;h=0bbed1d77dfa06a7fda5573805b09f0ee7f8210c;hb=03f646fd0d7e7ce393694c836c779bc67a4eef55;hp=50d844fcb4c33424891703196b2235ca807533e7;hpb=5b3108fe285bca50565b58b63fa4feddc96c0765;p=lgpl%2Fargeo-commons.git
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/LoginEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/LoginEntryPoint.java
index 50d844fcb..0bbed1d77 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/LoginEntryPoint.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/LoginEntryPoint.java
@@ -1,6 +1,7 @@
package org.argeo.cms.ui.util;
import java.util.Locale;
+import java.util.UUID;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
@@ -30,12 +31,16 @@ public class LoginEntryPoint implements EntryPoint, CmsView {
private final static Log log = LogFactory.getLog(LoginEntryPoint.class);
private LoginContext loginContext;
private UxContext uxContext = null;
+ private String uid;
@Override
public int createUI() {
+ uid = UUID.randomUUID().toString();
final Display display = createDisplay();
- UiContext.setData(CmsView.KEY, this);
+// UiContext.setData(CmsView.KEY, this);
+
CmsLoginShell loginShell = createCmsLoginShell();
+ CmsView.registerCmsView(loginShell.getShell(), this);
try {
// try pre-auth
loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, loginShell);
@@ -102,9 +107,9 @@ public class LoginEntryPoint implements EntryPoint, CmsView {
}
/**
- * To be overridden. CmsLogin#createCredentialsBlock() should be called at
- * some point in order to create the credentials composite. In order to use
- * the default layout, call CmsLogin#defaultCreateContents() but not
+ * To be overridden. CmsLogin#createCredentialsBlock() should be called at some
+ * point in order to create the credentials composite. In order to use the
+ * default layout, call CmsLogin#defaultCreateContents() but not
* CmsLogin#createContent(), since it would lead to a stack overflow.
*/
protected void createLoginPage(Composite parent, CmsLogin login) {
@@ -116,6 +121,11 @@ public class LoginEntryPoint implements EntryPoint, CmsView {
}
+ @Override
+ public String getUid() {
+ return uid;
+ }
+
@Override
public void navigateTo(String state) {
// TODO Auto-generated method stub