X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.swt%2Fsrc%2Forg%2Fargeo%2Fapp%2Fswt%2Fux%2FSwtArgeoApp.java;h=d123aa09c1821b447b76d948c8eebe53b8eaf1c0;hb=616a062e9d061ce91589556624ed622298a21ac7;hp=e733e8a29626762c6011a789d1a191b359b1fb39;hpb=68ec16197ed4d4e3309d461782bcfc83b160f891;p=gpl%2Fargeo-suite.git diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java index e733e8a..d123aa0 100644 --- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java +++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java @@ -3,6 +3,7 @@ package org.argeo.app.swt.ux; import static org.argeo.api.cms.ux.CmsView.CMS_VIEW_UID_PROPERTY; import java.lang.ref.WeakReference; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -15,13 +16,17 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; import java.util.TreeMap; -import java.util.TreeSet; import javax.xml.namespace.QName; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentRepository; import org.argeo.api.acr.spi.ProvidedSession; +import org.argeo.api.app.AppUserState; +import org.argeo.api.app.EntityConstants; +import org.argeo.api.app.EntityName; +import org.argeo.api.app.EntityType; +import org.argeo.api.app.RankedObject; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsEvent; import org.argeo.api.cms.CmsEventSubscriber; @@ -30,11 +35,6 @@ import org.argeo.api.cms.CmsSession; 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.AppUserState; -import org.argeo.app.api.EntityConstants; -import org.argeo.app.api.EntityName; -import org.argeo.app.api.EntityType; -import org.argeo.app.api.RankedObject; import org.argeo.app.ux.AbstractArgeoApp; import org.argeo.app.ux.AppUi; import org.argeo.app.ux.SuiteUxEvent; @@ -128,36 +128,52 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber // TODO does it make sense to accept that? appPid = ""; } - if (log.isDebugEnabled()) - log.info("Argeo Suite App " + appPid + " started"); - Objects.requireNonNull(contentRepository, "Content repository must be provided"); Objects.requireNonNull(appUserState, "App user state must be provided"); long janitorPeriod = 60 * 60 * 1000;// 1h + // long janitorPeriod = 60 * 1000;// min janitorTimer.schedule(new TimerTask() { @Override public void run() { - Iterator> uiRefs = managedUis.values().iterator(); - refs: while (uiRefs.hasNext()) { - WeakReference uiRef = uiRefs.next(); - SwtAppUi ui = uiRef.get(); - if (ui == null) { - if (log.isTraceEnabled()) - log.warn("Unreferenced UI in " + appPid + ", removing it"); - uiRefs.remove(); - continue refs; - } - if (!ui.isDisposed() && !ui.getDisplay().isDisposed()) { - ui.getDisplay().asyncExec(() -> ui.disposeIfTimedout()); + try { + // copy Map in order to avoid concurrent modification exception + Iterator>> uiRefs = new HashMap<>(managedUis).entrySet() + .iterator(); + refs: while (uiRefs.hasNext()) { + Map.Entry> entry = uiRefs.next(); + String uiUuid = entry.getKey(); + WeakReference uiRef = entry.getValue(); + SwtAppUi ui = uiRef.get(); + if (ui == null) { + if (log.isTraceEnabled()) + log.warn("Unreferenced UI " + uiUuid + " in " + appPid + ", removing it"); + managedUis.remove(uiUuid); + continue refs; + } + if (!ui.isDisposed() && !ui.getDisplay().isDisposed()) { + if (ui.isTimedOut()) { + if (log.isTraceEnabled()) + log.trace("Killing timed-out UI " + uiUuid + " in " + appPid); + UiContext.killDisplay(ui.getDisplay()); + } + } else { + if (log.isTraceEnabled()) + log.warn("Disposed UI " + uiUuid + " still referenced in " + appPid + ", removing it"); + managedUis.remove(uiUuid); + } } + if (log.isTraceEnabled()) + log.trace(managedUis.size() + " UIs being managed by app " + appPid); + } catch (Exception e) { + log.error("Could not clean up timed-out UIs", e); } - if (log.isTraceEnabled()) - log.trace(managedUis.size() + " UIs being managed by app " + appPid); } }, janitorPeriod, janitorPeriod); + if (log.isDebugEnabled()) + log.info("Argeo Suite App " + appPid + " started"); } public void stop(Map properties) { @@ -197,6 +213,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber SwtAppUi argeoSuiteUi = new SwtAppUi(uiParent, SWT.INHERIT_DEFAULT); // TODO make timeout configurable argeoSuiteUi.setUiTimeout(6 * 60 * 60 * 1000);// 6 hours + // argeoSuiteUi.setUiTimeout(60 * 1000);// 1 min String uid = cmsView.getUid(); argeoSuiteUi.addDisposeListener(new CleanUpUi(uid)); managedUis.put(uid, new WeakReference<>(argeoSuiteUi)); @@ -340,65 +357,10 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber return layersByPid.get(pid).get(); } - private T findByType(Map> byType, Content content) { + private List listTypes(Map byType, Content content) { if (content == null) - throw new IllegalArgumentException("A node should be provided"); - -// boolean checkJcr = false; -// if (checkJcr && content instanceof JcrContent) { -// Node context = ((JcrContent) content).getJcrNode(); -// try { -// // mixins -// Set types = new TreeSet<>(); -// for (NodeType mixinType : context.getMixinNodeTypes()) { -// String mixinTypeName = mixinType.getName(); -// if (byType.containsKey(mixinTypeName)) { -// types.add(mixinTypeName); -// } -// for (NodeType superType : mixinType.getDeclaredSupertypes()) { -// if (byType.containsKey(superType.getName())) { -// types.add(superType.getName()); -// } -// } -// } -// // primary node type -// NodeType primaryType = context.getPrimaryNodeType(); -// String primaryTypeName = primaryType.getName(); -// if (byType.containsKey(primaryTypeName)) { -// types.add(primaryTypeName); -// } -// for (NodeType superType : primaryType.getDeclaredSupertypes()) { -// if (byType.containsKey(superType.getName())) { -// types.add(superType.getName()); -// } -// } -// // entity type -// if (context.isNodeType(EntityType.entity.get())) { -// if (context.hasProperty(EntityNames.ENTITY_TYPE)) { -// String entityTypeName = context.getProperty(EntityNames.ENTITY_TYPE).getString(); -// if (byType.containsKey(entityTypeName)) { -// types.add(entityTypeName); -// } -// } -// } -// -// if (CmsJcrUtils.isUserHome(context) && byType.containsKey("nt:folder")) {// home node -// types.add("nt:folder"); -// } -// -// if (types.size() == 0) -// throw new IllegalArgumentException( -// "No type found for " + context + " (" + listTypes(context) + ")"); -// String type = types.iterator().next(); -// if (!byType.containsKey(type)) -// throw new IllegalArgumentException("No component found for " + context + " with type " + type); -// return byType.get(type).get(); -// } catch (RepositoryException e) { -// throw new IllegalStateException(e); -// } -// -// } else { - Set types = new TreeSet<>(); + throw new IllegalArgumentException("A content should be provided"); + List types = new ArrayList<>(); if (content.hasContentClass(EntityType.entity.qName())) { String type = content.attr(EntityName.type.qName()); if (type != null && byType.containsKey(type)) @@ -411,40 +373,33 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber if (byType.containsKey(type)) types.add(type); } - if (types.size() == 0) { + if (types.isEmpty()) throw new IllegalArgumentException("No type found for " + content + " (" + objectClasses + ")"); + return types; + } + + private RankedObject findLayerByType(Content content) { + List types = listTypes(layersByType, content); + // we assume the types will be ordered by priority + // (no possible for LDAP at this stage) + for (String type : types) { + if (layersByType.containsKey(type)) + return layersByType.get(type); } - String type = types.iterator().next(); - if (!byType.containsKey(type)) - throw new IllegalArgumentException("No component found for " + content + " with type " + type); - return byType.get(type).get(); -// } + throw new IllegalArgumentException("No layer found for " + content + " with type " + types); } -// private static String listTypes(Node context) { -// try { -// StringBuilder sb = new StringBuilder(); -// sb.append(context.getPrimaryNodeType().getName()); -// for (NodeType superType : context.getPrimaryNodeType().getDeclaredSupertypes()) { -// sb.append(' '); -// sb.append(superType.getName()); -// } -// -// for (NodeType nodeType : context.getMixinNodeTypes()) { -// sb.append(' '); -// sb.append(nodeType.getName()); -// if (nodeType.getName().equals(EntityType.local.get())) -// sb.append('/').append(context.getProperty(EntityNames.ENTITY_TYPE).getString()); -// for (NodeType superType : nodeType.getDeclaredSupertypes()) { -// sb.append(' '); -// sb.append(superType.getName()); -// } -// } -// return sb.toString(); -// } catch (RepositoryException e) { -// throw new JcrException(e); -// } -// } + private RankedObject findUiProviderByType(Content content) { + RankedObject layerRO = findLayerByType(content); + List layerTypes = LangUtils.toStringList(layerRO.getProperties().get(EntityConstants.TYPE)); + List types = listTypes(uiProvidersByType, content); + // layer types are ordered by priority + for (String type : layerTypes) { + if (types.contains(type) && uiProvidersByType.containsKey(type)) + return uiProvidersByType.get(type); + } + throw new IllegalArgumentException("No UI provider found for " + content + " with types " + types); + } @Override public void setState(CmsUi cmsUi, String state) { @@ -452,8 +407,6 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber if (state == null) return; if (!state.startsWith("/")) { -// if (cmsUi instanceof SwtAppUi) { -// SwtAppUi ui = (SwtAppUi) cmsUi; if (LOGIN.equals(state)) { String appTitle = ""; if (ui.getTitle() != null) @@ -466,10 +419,8 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber properties.put(SuiteUxEvent.LAYER, layerId); properties.put(SuiteUxEvent.CONTENT_PATH, HOME_STATE); ui.getCmsView().sendEvent(SuiteUxEvent.switchLayer.topic(), properties); -// } return; } -// SwtAppUi suiteUi = (SwtAppUi) cmsUi; if (ui.isLoginScreen()) { return; } @@ -520,26 +471,28 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber appTitle = ui.getTitle().lead(); if (isTopic(topic, SuiteUxEvent.refreshPart)) { - Content node = getContentFromEvent(ui, event); - if (node == null) + Content content = getContentFromEvent(ui, event); + if (content == null) return; - SwtUiProvider uiProvider = findByType(uiProvidersByType, node); - SwtAppLayer layer = findByType(layersByType, node); - ui.switchToLayer(layer, node); - layer.view(uiProvider, ui.getCurrentWorkArea(), node); - ui.getCmsView().stateChanged(nodeToState(node), stateTitle(appTitle, CmsUxUtils.getTitle(node))); + SwtUiProvider uiProvider = findUiProviderByType(content).get(); + SwtAppLayer layer = findLayerByType(content).get(); + ui.switchToLayer(layer, content); + layer.view(uiProvider, ui.getCurrentWorkArea(), content); + ui.getCmsView().stateChanged(nodeToState(content), + stateTitle(appTitle, CmsUxUtils.getTitle(content))); } else if (isTopic(topic, SuiteUxEvent.openNewPart)) { - Content node = getContentFromEvent(ui, event); - if (node == null) + Content content = getContentFromEvent(ui, event); + if (content == null) return; - SwtUiProvider uiProvider = findByType(uiProvidersByType, node); - SwtAppLayer layer = findByType(layersByType, node); - ui.switchToLayer(layer, node); - layer.open(uiProvider, ui.getCurrentWorkArea(), node); - ui.getCmsView().stateChanged(nodeToState(node), stateTitle(appTitle, CmsUxUtils.getTitle(node))); + SwtUiProvider uiProvider = findUiProviderByType(content).get(); + SwtAppLayer layer = findLayerByType(content).get(); + ui.switchToLayer(layer, content); + layer.open(uiProvider, ui.getCurrentWorkArea(), content); + ui.getCmsView().stateChanged(nodeToState(content), + stateTitle(appTitle, CmsUxUtils.getTitle(content))); } else if (isTopic(topic, SuiteUxEvent.switchLayer)) { String layerId = get(event, SuiteUxEvent.LAYER); - if (layerId != null) { + if (layerId != null && !"".equals(layerId.trim())) { SwtAppLayer suiteLayer = findLayer(layerId); if (suiteLayer == null) throw new IllegalArgumentException("No layer '" + layerId + "' available."); @@ -567,10 +520,10 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber } } } else { - Content node = getContentFromEvent(ui, event); - if (node != null) { - SwtAppLayer layer = findByType(layersByType, node); - ui.switchToLayer(layer, node); + Content content = getContentFromEvent(ui, event); + if (content != null) { + SwtAppLayer layer = findLayerByType(content).get(); + ui.switchToLayer(layer, content); } } } @@ -601,14 +554,6 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber Content node; if (path == null) { return null; -// // look for a user -// String username = get(event, SuiteUxEvent.USERNAME); -// if (username == null) -// return null; -// User user = cmsUserManager.getUser(username); -// if (user == null) -// return null; -// node = ContentUtils.roleToContent(cmsUserManager, contentSession, user); } else { node = contentSession.get(path); } @@ -674,6 +619,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber RankedObject.putIfHigherRank(layersByPid, pid, layer, properties); } if (properties.containsKey(EntityConstants.TYPE)) { + // TODO check consistency of entity types with overridden ? List types = LangUtils.toStringList(properties.get(EntityConstants.TYPE)); for (String type : types) RankedObject.putIfHigherRank(layersByType, type, layer, properties);