Remove dependency between CMS and CMS UI

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / ui / AbstractCmsEntryPoint.java

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
index 99989db19c0cdb58835d1b3ac218a864f3e53415..2d83f8ded0ab2c60f80fcb9641c2f09e53b8edbc 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/AbstractCmsEntryPoint.java
@@ -21,7 +21,6 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
-import org.argeo.cms.auth.CmsAuthenticated;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.NodeConstants;
@@ -110,7 +109,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 
        @Override
        protected final void createContents(final Composite parent) {
-               UiContext.setData(CmsAuthenticated.KEY, this);
+               UiContext.setData(CmsView.KEY, this);
                Subject.doAs(getSubject(), new PrivilegedAction<Void>() {
                        @Override
                        public Void run() {
@@ -167,10 +166,15 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
        // public LoginContext getLoginContext() {
        // return loginContext;
        // }
-       public Subject getSubject() {
+       protected Subject getSubject() {
                return loginContext.getSubject();
        }
 
+       @Override
+       public boolean isAnonymous() {
+               return CurrentUser.isAnonymous(getSubject());
+       }
+
        @Override
        public synchronized void logout() {
                if (loginContext == null)
@@ -341,7 +345,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
                @Override
                public void navigated(BrowserNavigationEvent event) {
                        setState(event.getState());
-                       refresh();
+                       doRefresh();
                }
        }
 }
\ No newline at end of file