X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Frap%2FCmsLoginLifecycle.java;h=a062bea6bd013d062d0ea598907a76168a4e84f4;hb=21171ced2bce875e64db47d95bf4a00a0e141a9a;hp=78c4747f608ceb231d4414003ddb09be6ba88739;hpb=5044fd730feba048c6b6647222881f7b3eeb8a33;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
index 78c4747f6..a062bea6b 100644
--- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
+++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
@@ -14,8 +14,10 @@ import org.argeo.cms.ui.CmsImageManager;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.UxContext;
 import org.argeo.cms.ui.dialogs.CmsFeedback;
+import org.argeo.cms.util.SimpleImageManager;
 import org.argeo.cms.util.SimpleUxContext;
 import org.argeo.cms.widgets.auth.CmsLoginShell;
+import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.node.NodeConstants;
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.workbench.UIEvents;
@@ -34,6 +36,7 @@ public class CmsLoginLifecycle implements CmsView {
 	private final static Log log = LogFactory.getLog(CmsLoginLifecycle.class);
 
 	private UxContext uxContext;
+	private CmsImageManager imageManager;
 
 	private LoginContext loginContext;
 	private BrowserNavigation browserNavigation;
@@ -50,7 +53,6 @@ public class CmsLoginLifecycle implements CmsView {
 				@Override
 				public void navigated(BrowserNavigationEvent event) {
 					state = event.getState();
-					System.out.println("state=" + state);
 					if (uxContext != null)// is logged in
 						stateChanged();
 				}
@@ -58,6 +60,7 @@ 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);
 		loginShell.setSubject(subject);
 		try {
@@ -76,6 +79,7 @@ public class CmsLoginLifecycle implements CmsView {
 		if (CurrentUser.getUsername(getSubject()) == null)
 			return false;
 		uxContext = new SimpleUxContext();
+		imageManager = new SimpleImageManager();
 
 		eventBroker.subscribe(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE, new EventHandler() {
 			@Override
@@ -121,7 +125,7 @@ public class CmsLoginLifecycle implements CmsView {
 	@Override
 	public void logout() {
 		if (loginContext == null)
-			throw new CmsException("Login context should not bet null");
+			throw new CmsException("Login context should not be null");
 		try {
 			CurrentUser.logoutCmsSession(loginContext.getSubject());
 			loginContext.logout();
@@ -139,7 +143,7 @@ public class CmsLoginLifecycle implements CmsView {
 
 	@Override
 	public CmsImageManager getImageManager() {
-		throw new UnsupportedOperationException();
+		return imageManager;
 	}
 
 	protected Subject getSubject() {