X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Frap%2Forg.argeo.cms.swt.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebApp.java;h=31555d168d10b1c2f8f1a44984014f20c458230a;hb=8c6e16aa43d9523e1ec57a41a06b3ceba7d23fdb;hp=fec9e2485d6bdc64c3a065574994ef325916e495;hpb=79c14508549e1af042485b4f888a3c54f5a68833;p=lgpl%2Fargeo-commons.git

diff --git a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java
index fec9e2485..31555d168 100644
--- a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java
+++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java
@@ -7,6 +7,7 @@ import java.util.Set;
 
 import org.argeo.api.cms.CmsApp;
 import org.argeo.api.cms.CmsAppListener;
+import org.argeo.api.cms.CmsEventBus;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.ux.CmsTheme;
 import org.argeo.api.cms.ux.CmsView;
@@ -21,7 +22,6 @@ import org.eclipse.rap.rwt.client.WebClient;
 import org.eclipse.swt.widgets.Display;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.event.EventAdmin;
 
 /** An RWT web app integrating with a {@link CmsApp}. */
 public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, CmsAppListener {
@@ -29,8 +29,8 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 
 	private BundleContext bundleContext;
 	private CmsApp cmsApp;
-//	private String cmsAppId;
-	private EventAdmin eventAdmin;
+
+	private CmsEventBus cmsEventBus;
 
 	private ServiceRegistration<ApplicationConfiguration> rwtAppReg;
 
@@ -103,7 +103,6 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 			String entryPointName = !uiName.equals("") ? "/" + uiName : "/";
 			application.addEntryPoint(entryPointName, () -> {
 				CmsWebEntryPoint entryPoint = new CmsWebEntryPoint(this, uiName);
-				entryPoint.setEventAdmin(eventAdmin);
 				return entryPoint;
 			}, properties);
 			if (log.isDebugEnabled())
@@ -156,8 +155,12 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 		}
 	}
 
-	public void setEventAdmin(EventAdmin eventAdmin) {
-		this.eventAdmin = eventAdmin;
+	public void setCmsEventBus(CmsEventBus cmsEventBus) {
+		this.cmsEventBus = cmsEventBus;
+	}
+
+	public CmsEventBus getCmsEventBus() {
+		return cmsEventBus;
 	}
 
 	public void setContextName(String contextName) {