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=9b98c6de943ac2e5b6c258566252d9fd15483a0a;hp=047fb371e46e1efa464e9b53e8c88f9a5c90f03b;hpb=b73edb765859b2193c67380c33fbc6c694468fe4;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 047fb371e..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; @@ -57,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 { @@ -75,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 @@ -138,7 +143,7 @@ public class CmsLoginLifecycle implements CmsView { @Override public CmsImageManager getImageManager() { - throw new UnsupportedOperationException(); + return imageManager; } protected Subject getSubject() {