Rename packages in order to make future stable documentation clearer.

[lgpl/argeo-commons.git] / org.argeo.cms.e4.rap / src / org / argeo / cms / e4 / rap / CmsLoginLifecycle.java

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 047fb371e46e1efa464e9b53e8c88f9a5c90f03b..f7a1ed667c8aee878928f453d6ffe5da4fd84024 100644 (file)
--- 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
@@ -8,15 +8,17 @@ import javax.security.auth.login.LoginException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
 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.SimpleUxContext;
-import org.argeo.cms.widgets.auth.CmsLoginShell;
-import org.argeo.node.NodeConstants;
+import org.argeo.cms.ui.util.SimpleImageManager;
+import org.argeo.cms.ui.util.SimpleUxContext;
+import org.argeo.cms.ui.widgets.auth.CmsLoginShell;
+import org.argeo.eclipse.ui.specific.UiContext;
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.workbench.UIEvents;
 import org.eclipse.e4.ui.workbench.lifecycle.PostContextCreate;
@@ -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() {