Introduce CMS event bus and use it in UI.

[lgpl/argeo-commons.git] / swt / rap / org.argeo.cms.swt.rap / src / org / argeo / cms / web / osgi / CmsWebAppFactory.java

diff --git a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java
index 19b9fe80dcb0b9a8c5972fbfee97180f958755cd..83a83e2adb8b3d8ce3efa1ebb738f65dc6b39fb5 100644 (file)
--- a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java
+++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/osgi/CmsWebAppFactory.java
@@ -6,17 +6,17 @@ import java.util.Hashtable;
 import java.util.Map;
 
 import org.argeo.api.cms.CmsApp;
+import org.argeo.api.cms.CmsEventBus;
 import org.argeo.cms.web.CmsWebApp;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
-import org.osgi.service.event.EventAdmin;
 
 /** Publish a CmsApp as a RAP application. */
 public class CmsWebAppFactory {
        private BundleContext bundleContext = FrameworkUtil.getBundle(CmsWebAppFactory.class).getBundleContext();
        private final static String CONTEXT_NAME = "contextName";
 
-       private EventAdmin eventAdmin;
+       private CmsEventBus cmsEventBus;
 
        private Map<String, CmsWebApp> registrations = Collections.synchronizedMap(new HashMap<>());
 
@@ -24,7 +24,7 @@ public class CmsWebAppFactory {
                String contextName = properties.get(CmsApp.CONTEXT_NAME_PROPERTY);
                if (contextName != null) {
                        CmsWebApp cmsWebApp = new CmsWebApp();
-                       cmsWebApp.setEventAdmin(eventAdmin);
+                       cmsWebApp.setCmsEventBus(cmsEventBus);
                        cmsWebApp.setCmsApp(cmsApp);
                        Hashtable<String, String> serviceProperties = new Hashtable<>();
                        if (!contextName.equals(""))
@@ -47,8 +47,9 @@ public class CmsWebAppFactory {
                }
        }
 
-       public void setEventAdmin(EventAdmin eventAdmin) {
-               this.eventAdmin = eventAdmin;
+       public void setCmsEventBus(CmsEventBus cmsEventBus) {
+               this.cmsEventBus = cmsEventBus;
        }
 
+
 }