Adapt to changes in Argeo Commons
[gpl/argeo-suite.git] / org.argeo.app.ui / src / org / argeo / app / ui / SuiteApp.java
index 63e332450bfdaf3e10e4c6a181c7e46637e0c9f7..50a7f80a82f90bc14fe622aadfbe1f8769fd027f 100644 (file)
@@ -1,7 +1,6 @@
 package org.argeo.app.ui;
 
-import static org.argeo.api.cms.CmsView.CMS_VIEW_UID_PROPERTY;
-import static org.argeo.cms.acr.ContentUtils.SLASH;
+import static org.argeo.api.cms.ux.CmsView.CMS_VIEW_UID_PROPERTY;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -23,11 +22,12 @@ import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.CmsEventSubscriber;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsSession;
-import org.argeo.api.cms.CmsTheme;
-import org.argeo.api.cms.CmsUi;
-import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.ux.CmsTheme;
+import org.argeo.api.cms.ux.CmsUi;
+import org.argeo.api.cms.ux.CmsView;
 import org.argeo.app.api.EntityConstants;
 import org.argeo.app.api.EntityNames;
 import org.argeo.app.api.EntityType;
@@ -36,7 +36,7 @@ import org.argeo.cms.AbstractCmsApp;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.LocaleUtils;
 import org.argeo.cms.Localized;
-import org.argeo.cms.acr.CmsContentRepository;
+import org.argeo.cms.acr.ContentUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.jcr.acr.JcrContent;
 import org.argeo.cms.swt.CmsSwtUtils;
@@ -45,17 +45,14 @@ import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ux.CmsUxUtils;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrException;
-import org.argeo.osgi.useradmin.UserDirectory;
 import org.argeo.util.LangUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.osgi.framework.Constants;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventHandler;
 import org.osgi.service.useradmin.User;
 
 /** The Argeo Suite App. */
-public class SuiteApp extends AbstractCmsApp implements EventHandler {
+public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber {
        private final static CmsLog log = CmsLog.getLog(SuiteApp.class);
 
        public final static String PUBLIC_BASE_PATH_PROPERTY = "publicBasePath";
@@ -101,6 +98,10 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 //     private Repository repository;
 
        public void init(Map<String, Object> properties) {
+               for (SuiteEvent event : SuiteEvent.values()) {
+                       getCmsContext().getCmsEventBus().addEventSubscriber(event.topic(), this);
+               }
+
                if (log.isDebugEnabled())
                        log.info("Argeo Suite App started");
 
@@ -353,7 +354,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
                } else {
 
-                       List<QName> objectClasses = content.getTypes();
+                       List<QName> objectClasses = content.getContentClasses();
                        Set<String> types = new TreeSet<>();
                        for (QName cc : objectClasses) {
                                String type = cc.getPrefix() + ":" + cc.getLocalPart();
@@ -476,83 +477,84 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
         */
 
        @Override
-       public void handleEvent(Event event) {
+       public void onEvent(String topic, Map<String, Object> event) {
 
                // Specific UI related events
                SuiteUi ui = getRelatedUi(event);
                if (ui == null)
                        return;
-               try {
-                       String appTitle = "";
-                       if (ui.getTitle() != null)
-                               appTitle = ui.getTitle().lead() + " - ";
+               ui.getCmsView().runAs(() -> {
+                       try {
+                               String appTitle = "";
+                               if (ui.getTitle() != null)
+                                       appTitle = ui.getTitle().lead() + " - ";
 
 //                     String currentLayerId = ui.getCurrentLayerId();
 //                     SuiteLayer currentLayer = currentLayerId != null ? layersByPid.get(currentLayerId).get() : null;
-                       if (SuiteUiUtils.isTopic(event, SuiteEvent.refreshPart)) {
-                               Content node = getNode(ui, event);
-                               if (node == null)
-                                       return;
-                               CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
-                               SuiteLayer layer = findByType(layersByType, node);
-                               ui.switchToLayer(layer, node);
-                               ui.getCmsView().runAs(() -> layer.view(uiProvider, ui.getCurrentWorkArea(), node));
-                               ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
-                       } else if (SuiteUiUtils.isTopic(event, SuiteEvent.openNewPart)) {
-                               Content node = getNode(ui, event);
-                               if (node == null)
-                                       return;
-                               CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
-                               SuiteLayer layer = findByType(layersByType, node);
-                               ui.switchToLayer(layer, node);
-                               ui.getCmsView().runAs(() -> layer.open(uiProvider, ui.getCurrentWorkArea(), node));
-                               ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
-                       } else if (SuiteUiUtils.isTopic(event, SuiteEvent.switchLayer)) {
-                               String layerId = get(event, SuiteEvent.LAYER);
-                               if (layerId != null) {
+                               if (SuiteUiUtils.isTopic(topic, SuiteEvent.refreshPart)) {
+                                       Content node = getNode(ui, event);
+                                       if (node == null)
+                                               return;
+                                       CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
+                                       SuiteLayer layer = findByType(layersByType, node);
+                                       ui.switchToLayer(layer, node);
+                                       layer.view(uiProvider, ui.getCurrentWorkArea(), node);
+                                       ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
+                               } else if (SuiteUiUtils.isTopic(topic, SuiteEvent.openNewPart)) {
+                                       Content node = getNode(ui, event);
+                                       if (node == null)
+                                               return;
+                                       CmsUiProvider uiProvider = findByType(uiProvidersByType, node);
+                                       SuiteLayer layer = findByType(layersByType, node);
+                                       ui.switchToLayer(layer, node);
+                                       layer.open(uiProvider, ui.getCurrentWorkArea(), node);
+                                       ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node));
+                               } else if (SuiteUiUtils.isTopic(topic, SuiteEvent.switchLayer)) {
+                                       String layerId = get(event, SuiteEvent.LAYER);
+                                       if (layerId != null) {
 //                                     ui.switchToLayer(layerId, ui.getUserDir());
-                                       SuiteLayer suiteLayer = findLayer(layerId);
-                                       if (suiteLayer == null)
-                                               throw new IllegalArgumentException("No layer '" + layerId + "' available.");
-                                       Localized layerTitle = suiteLayer.getTitle();
-                                       // FIXME make sure we don't rebuild the work area twice
-                                       Composite workArea = ui.getCmsView().doAs(() -> ui.switchToLayer(layerId, ui.getUserDirNode()));
-                                       String title = null;
-                                       if (layerTitle != null)
-                                               title = layerTitle.lead();
-                                       Content nodeFromState = getNode(ui, event);
-                                       if (nodeFromState != null && nodeFromState.getPath().equals(ui.getUserDirNode().getPath())) {
-                                               // default layer view is forced
-                                               String state = defaultLayerPid.equals(layerId) ? "~" : layerId;
-                                               ui.getCmsView().stateChanged(state, appTitle + title);
-                                               suiteLayer.view(null, workArea, nodeFromState);
-                                       } else {
-                                               Content layerCurrentContext = suiteLayer.getCurrentContext(workArea);
-                                               if (layerCurrentContext != null) {
-                                                       // layer was already showing a context so we set the state to it
-                                                       ui.getCmsView().stateChanged(nodeToState(layerCurrentContext),
-                                                                       appTitle + CmsUxUtils.getTitle(layerCurrentContext));
+                                               SuiteLayer suiteLayer = findLayer(layerId);
+                                               if (suiteLayer == null)
+                                                       throw new IllegalArgumentException("No layer '" + layerId + "' available.");
+                                               Localized layerTitle = suiteLayer.getTitle();
+                                               // FIXME make sure we don't rebuild the work area twice
+                                               Composite workArea = ui.switchToLayer(layerId, ui.getUserDirNode());
+                                               String title = null;
+                                               if (layerTitle != null)
+                                                       title = layerTitle.lead();
+                                               Content nodeFromState = getNode(ui, event);
+                                               if (nodeFromState != null && nodeFromState.getPath().equals(ui.getUserDirNode().getPath())) {
+                                                       // default layer view is forced
+                                                       String state = defaultLayerPid.equals(layerId) ? "~" : layerId;
+                                                       ui.getCmsView().stateChanged(state, appTitle + title);
+                                                       suiteLayer.view(null, workArea, nodeFromState);
                                                } else {
-                                                       // no context was shown
-                                                       ui.getCmsView().stateChanged(layerId, appTitle + title);
+                                                       Content layerCurrentContext = suiteLayer.getCurrentContext(workArea);
+                                                       if (layerCurrentContext != null) {
+                                                               // layer was already showing a context so we set the state to it
+                                                               ui.getCmsView().stateChanged(nodeToState(layerCurrentContext),
+                                                                               appTitle + CmsUxUtils.getTitle(layerCurrentContext));
+                                                       } else {
+                                                               // no context was shown
+                                                               ui.getCmsView().stateChanged(layerId, appTitle + title);
+                                                       }
+                                               }
+                                       } else {
+                                               Content node = getNode(ui, event);
+                                               if (node != null) {
+                                                       SuiteLayer layer = findByType(layersByType, node);
+                                                       ui.switchToLayer(layer, node);
                                                }
-                                       }
-                               } else {
-                                       Content node = getNode(ui, event);
-                                       if (node != null) {
-                                               SuiteLayer layer = findByType(layersByType, node);
-                                               ui.getCmsView().runAs(() -> ui.switchToLayer(layer, node));
                                        }
                                }
-                       }
-               } catch (Exception e) {
-                       log.error("Cannot handle event " + event, e);
+                       } catch (Exception e) {
+                               log.error("Cannot handle event " + event, e);
 //                     CmsView.getCmsView(ui).exception(e);
-               }
-
+                       }
+               });
        }
 
-       private Content getNode(SuiteUi ui, Event event) {
+       private Content getNode(SuiteUi ui, Map<String, Object> event) {
                ProvidedSession contentSession = (ProvidedSession) CmsUxUtils.getContentSession(contentRepository,
                                ui.getCmsView());
 
@@ -574,10 +576,7 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                        User user = cmsUserManager.getUser(username);
                        if (user == null)
                                return null;
-                       UserDirectory userDirectory = cmsUserManager.getUserDirectory(user);
-                       path = CmsContentRepository.DIRECTORY_BASE + SLASH + userDirectory.getGlobalId() + SLASH
-                                       + userDirectory.getRolePath(user);
-                       node = contentSession.get(path);
+                       node = ContentUtils.roleToContent(cmsUserManager, contentSession, user);
 //                     LdapName userDn;
 //                     try {
 //                             userDn = new LdapName(user.getName());
@@ -605,12 +604,12 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                return node;
        }
 
-       private SuiteUi getRelatedUi(Event event) {
-               return managedUis.get(get(event, CMS_VIEW_UID_PROPERTY));
+       private SuiteUi getRelatedUi(Map<String, Object> eventProperties) {
+               return managedUis.get(get(eventProperties, CMS_VIEW_UID_PROPERTY));
        }
 
-       public static String get(Event event, String key) {
-               Object value = event.getProperty(key);
+       public static String get(Map<String, Object> eventProperties, String key) {
+               Object value = eventProperties.get(key);
                if (value == null)
                        return null;
 //                     throw new IllegalArgumentException("Property " + key + " must be set");