X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebApp.java;h=e5b6c7efca1e37b6d76b1ffb5086a5505047e84f;hb=af817c9bebfa3187f9a64c3e6aadb933dac148c8;hp=25b30c9b3c6ef6d0ec10674668eb7126640775f6;hpb=6a44d45d5e60b6187ddca5fa280f468d5763c2ad;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
index 25b30c9b3..e5b6c7efc 100644
--- a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
+++ b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
@@ -3,21 +3,25 @@ package org.argeo.cms.web;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.ui.CmsApp;
-import org.argeo.cms.ui.CmsAppListener;
-import org.argeo.cms.ui.CmsTheme;
-import org.argeo.cms.ui.CmsView;
+import org.argeo.api.cms.CmsApp;
+import org.argeo.api.cms.CmsAppListener;
+import org.argeo.api.cms.CmsTheme;
+import org.argeo.api.cms.CmsView;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.util.LangUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.Application;
+import org.eclipse.rap.rwt.application.Application.OperationMode;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.eclipse.rap.rwt.application.ExceptionHandler;
 import org.eclipse.rap.rwt.client.WebClient;
 import org.eclipse.swt.widgets.Display;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.event.EventAdmin;
 
@@ -27,6 +31,7 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 
 	private BundleContext bundleContext;
 	private CmsApp cmsApp;
+	private String cmsAppId;
 	private EventAdmin eventAdmin;
 
 	private ServiceRegistration<ApplicationConfiguration> rwtAppReg;
@@ -34,20 +39,31 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 	private final static String CONTEXT_NAME = "contextName";
 	private String contextName;
 
+	private final static String FAVICON_PNG = "favicon.png";
+
 	public void init(BundleContext bundleContext, Map<String, String> properties) {
 		this.bundleContext = bundleContext;
 		contextName = properties.get(CONTEXT_NAME);
-		if (cmsApp != null)
-			themingUpdated();
+		if (cmsApp != null) {
+			if (cmsApp.allThemesAvailable())
+				publishWebApp();
+		}
 	}
 
 	public void destroy(BundleContext bundleContext, Map<String, String> properties) {
-		if (cmsApp != null)
+		if (cmsApp != null) {
 			cmsApp.removeCmsAppListener(this);
+			cmsApp = null;
+		}
 	}
 
 	@Override
 	public void configure(Application application) {
+		// TODO make it configurable?
+		// SWT compatibility is required for:
+		// - Browser.execute()
+		// - blocking dialogs
+		application.setOperationMode(OperationMode.SWT_COMPATIBILITY);
 		for (String uiName : cmsApp.getUiNames()) {
 			CmsTheme theme = cmsApp.getTheme(uiName);
 			if (theme != null)
@@ -63,7 +79,7 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 	public void handleException(Throwable throwable) {
 		Display display = Display.getCurrent();
 		if (display != null && !display.isDisposed()) {
-			CmsView cmsView = CmsView.getCmsView(display.getActiveShell());
+			CmsView cmsView = CmsSwtUtils.getCmsView(display.getActiveShell());
 			cmsView.exception(throwable);
 		} else {
 			log.error("Unexpected exception outside an UI thread", throwable);
@@ -78,6 +94,11 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 			if (theme != null) {
 				properties.put(WebClient.THEME_ID, theme.getThemeId());
 				properties.put(WebClient.HEAD_HTML, theme.getHtmlHeaders());
+				properties.put(WebClient.BODY_HTML, theme.getBodyHtml());
+				Set<String> imagePaths = theme.getImagesPaths();
+				if (imagePaths.contains(FAVICON_PNG)) {
+					properties.put(WebClient.FAVICON, FAVICON_PNG);
+				}
 			} else {
 				properties.put(WebClient.THEME_ID, RWT.DEFAULT_THEME_ID);
 			}
@@ -90,8 +111,8 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 			if (log.isDebugEnabled())
 				log.info("Added web entry point " + (contextName != null ? "/" + contextName : "") + entryPointName);
 		}
-		if (log.isDebugEnabled())
-			log.debug("Published CMS web app /" + (contextName != null ? contextName : ""));
+//		if (log.isDebugEnabled())
+//			log.debug("Published CMS web app /" + (contextName != null ? contextName : ""));
 	}
 
 	CmsApp getCmsApp() {
@@ -104,10 +125,17 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 
 	public void setCmsApp(CmsApp cmsApp, Map<String, String> properties) {
 		this.cmsApp = cmsApp;
+		this.cmsAppId = properties.get(Constants.SERVICE_PID);
 		this.cmsApp.addCmsAppListener(this);
 	}
 
 	public void unsetCmsApp(CmsApp cmsApp, Map<String, String> properties) {
+		String cmsAppId = properties.get(Constants.SERVICE_PID);
+		if (!cmsAppId.equals(this.cmsAppId))
+			return;
+		if (this.cmsApp != null) {
+			this.cmsApp.removeCmsAppListener(this);
+		}
 		if (rwtAppReg != null)
 			rwtAppReg.unregister();
 		this.cmsApp = null;
@@ -115,6 +143,11 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 
 	@Override
 	public void themingUpdated() {
+		if (cmsApp != null && cmsApp.allThemesAvailable())
+			publishWebApp();
+	}
+
+	protected void publishWebApp() {
 		Dictionary<String, Object> regProps = LangUtils.dict(CONTEXT_NAME, contextName);
 		if (rwtAppReg != null)
 			rwtAppReg.unregister();