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=67fa5ceac2b37efd000f18e5032ea6e2e63f948b;hb=54df376a9c2dd458a82eaa09bfbb718fe699dd0d;hp=0270933c0d3b24ed771eebc0e35860ff0c8aceec;hpb=7b242851c0094d13cbaca5b68261ad92c873a59f;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 0270933c0..67fa5ceac 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,11 +7,12 @@ 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;
 import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.util.LangUtils;
+import org.argeo.cms.util.LangUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.application.Application.OperationMode;
@@ -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())
@@ -113,7 +112,7 @@ public class CmsWebApp implements ApplicationConfiguration, ExceptionHandler, Cm
 //			log.debug("Published CMS web app /" + (contextName != null ? contextName : ""));
 	}
 
-	CmsApp getCmsApp() {
+	public CmsApp getCmsApp() {
 		return cmsApp;
 	}
 
@@ -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) {