X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=rap%2Forg.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebApp.java;h=a1d54cfef8eda8c634731b139b131cd9c948f62f;hb=55d1a78150b6be0004f6bcb28703bcdd6daf55a1;hp=4008b49eb58d5f776b4081d599dab1c294e39f16;hpb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;p=lgpl%2Fargeo-commons.git

diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
index 4008b49eb..a1d54cfef 100644
--- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
+++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
@@ -7,9 +7,9 @@ import java.util.Set;
 
 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.api.cms.CmsLog;
+import org.argeo.api.cms.ux.CmsTheme;
+import org.argeo.api.cms.ux.CmsView;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.util.LangUtils;
 import org.eclipse.rap.rwt.RWT;
@@ -20,7 +20,6 @@ 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;
 
@@ -30,7 +29,7 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 
 	private BundleContext bundleContext;
 	private CmsApp cmsApp;
-	private String cmsAppId;
+//	private String cmsAppId;
 	private EventAdmin eventAdmin;
 
 	private ServiceRegistration<ApplicationConfiguration> rwtAppReg;
@@ -124,13 +123,13 @@ 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.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))
+		String contextName = properties.get(CmsApp.CONTEXT_NAME_PROPERTY);
+		if (!contextName.equals(this.contextName))
 			return;
 		if (this.cmsApp != null) {
 			this.cmsApp.removeCmsAppListener(this);