X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebEntryPoint.java;h=d07735c064831d2c41e1cda72feb34e568e38fe1;hb=b8e02481f46240932ad2eb18fd4372edef835842;hp=2961eead9c386951f21b2156d62f909a77f6b90b;hpb=94bd4b03ff3ca9d1875bf6424383d648e604b93a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
index 2961eead9..d07735c06 100644
--- a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
+++ b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
@@ -14,6 +14,7 @@ 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.auth.CmsSession;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
 import org.argeo.cms.ui.CmsApp;
@@ -39,6 +40,7 @@ import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 
 /** The {@link CmsView} for a {@link CmsWebApp}. */
+@SuppressWarnings("restriction")
 public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationListener {
 	private static final long serialVersionUID = 7733510691684570402L;
 	private final static Log log = LogFactory.getLog(CmsWebEntryPoint.class);
@@ -116,6 +118,10 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 		return loginContext.getSubject();
 	}
 
+	public <T> T doAs(PrivilegedAction<T> action) {
+		return Subject.doAs(getSubject(), action);
+	}
+
 	@Override
 	public boolean isAnonymous() {
 		return CurrentUser.isAnonymous(getSubject());
@@ -153,9 +159,12 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 
 	@Override
 	public void exception(final Throwable e) {
-		exception = e;
-		log.error("Unexpected exception in CMS", e);
-		doRefresh();
+		ui.getDisplay().syncExec(() -> {
+			CmsFeedback.show("Unexpected exception in CMS", e);
+			exception = e;
+//		log.error("Unexpected exception in CMS", e);
+			doRefresh();
+		});
 	}
 
 	protected synchronized void doRefresh() {
@@ -196,7 +205,8 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 	public void navigateTo(String state) {
 		exception = null;
 		String title = setState(state);
-		doRefresh();
+		if (title != null)
+			doRefresh();
 		if (browserNavigation != null)
 			browserNavigation.pushState(state, title);
 	}
@@ -209,7 +219,7 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 	@Override
 	public void navigated(BrowserNavigationEvent event) {
 		setState(event.getState());
-		doRefresh();
+		// doRefresh();
 	}
 
 	@Override
@@ -223,6 +233,17 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 		eventAdmin.sendEvent(new Event(topic, properties));
 	}
 
+	@Override
+	public void stateChanged(String state, String title) {
+		browserNavigation.pushState(state, title);
+	}
+
+	@Override
+	public CmsSession getCmsSession() {
+		CmsSession cmsSession = CmsSession.getCmsSession(cmsWebApp.getBundleContext(), getSubject());
+		return cmsSession;
+	}
+
 	/*
 	 * EntryPoint IMPLEMENTATION
 	 */