X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebEntryPoint.java;h=1ad09d1022ba0cac6020782245de1dcb2e45b66e;hb=8347fed7b1f7f7ca1a7f66945e2f1876e597f2ab;hp=3d353d6b15ea18f816367ad574a6cbbe9fa5c40c;hpb=b5644c1dac96afe8b9bdcd68068c054a9f780926;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 3d353d6b1..1ad09d102 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
@@ -4,6 +4,7 @@ import static org.eclipse.rap.rwt.internal.service.ContextProvider.getApplicatio
 
 import java.security.PrivilegedAction;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 
@@ -14,6 +15,8 @@ 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.LocaleUtils;
+import org.argeo.cms.auth.CmsSession;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
 import org.argeo.cms.ui.CmsApp;
@@ -32,6 +35,7 @@ import org.eclipse.rap.rwt.client.service.BrowserNavigationEvent;
 import org.eclipse.rap.rwt.client.service.BrowserNavigationListener;
 import org.eclipse.rap.rwt.internal.lifecycle.RWTLifeCycle;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -102,6 +106,14 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 				try {
 					uxContext = new SimpleUxContext();
 					imageManager = new DefaultImageManager();
+					CmsSession cmsSession = getCmsSession();
+					if (cmsSession != null) {
+						UiContext.setLocale(cmsSession.getLocale());
+						LocaleUtils.setThreadLocale(cmsSession.getLocale());
+					} else {
+						Locale rwtLocale = RWT.getUISession().getLocale();
+						LocaleUtils.setThreadLocale(rwtLocale);
+					}
 					ui = cmsWebApp.getCmsApp().initUi(parent);
 					ui.setData(CmsApp.UI_NAME_PROPERTY, uiName);
 					ui.setLayoutData(CmsUiUtils.fillAll());
@@ -158,10 +170,17 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 
 	@Override
 	public void exception(final Throwable e) {
-		CmsFeedback.show("Unexpected exception in CMS", e).block();
-		exception = e;
+		if (e instanceof SWTError) {
+			SWTError swtError = (SWTError) e;
+			if (swtError.code == SWT.ERROR_FUNCTION_DISPOSED)
+				return;
+		}
+		ui.getDisplay().syncExec(() -> {
+//			CmsFeedback.show("Unexpected exception in CMS", e);
+			exception = e;
 //		log.error("Unexpected exception in CMS", e);
-		doRefresh();
+			doRefresh();
+		});
 	}
 
 	protected synchronized void doRefresh() {
@@ -202,7 +221,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);
 	}
@@ -215,7 +235,7 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 	@Override
 	public void navigated(BrowserNavigationEvent event) {
 		setState(event.getState());
-		doRefresh();
+		// doRefresh();
 	}
 
 	@Override
@@ -229,6 +249,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
 	 */
@@ -248,12 +279,34 @@ public class CmsWebEntryPoint implements EntryPoint, CmsView, BrowserNavigationL
 //		}
 		shell.open();
 		if (getApplicationContext().getLifeCycleFactory().getLifeCycle() instanceof RWTLifeCycle) {
-			while (!shell.isDisposed()) {
-				if (!display.readAndDispatch()) {
-					display.sleep();
+			eventLoop: while (!shell.isDisposed()) {
+				try {
+					if (!display.readAndDispatch()) {
+						display.sleep();
+					}
+				} catch (Throwable e) {
+					if (e instanceof SWTError) {
+						SWTError swtError = (SWTError) e;
+						if (swtError.code == SWT.ERROR_FUNCTION_DISPOSED) {
+							log.error("Unexpected SWT error in event loop, ignoring it. " + e.getMessage());
+							continue eventLoop;
+						} else {
+							log.error("Unexpected SWT error in event loop, shutting down...", e);
+							break eventLoop;
+						}
+					} else if (e instanceof ThreadDeath) {
+						throw (ThreadDeath) e;
+					} else if (e instanceof Error) {
+						log.error("Unexpected error in event loop, shutting down...", e);
+						break eventLoop;
+					} else {
+						log.error("Unexpected exception in event loop, ignoring it. " + e.getMessage());
+						continue eventLoop;
+					}
 				}
 			}
-			display.dispose();
+			if (!display.isDisposed())
+				display.dispose();
 		}
 		return 0;
 	}