X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.swt%2Fsrc%2Forg%2Fargeo%2Fapp%2Fswt%2Fux%2FSwtArgeoApp.java;h=9d3a19218017f87b48048478ec9333eaf5da49b4;hb=c8592ef5b35b0b16129d61aa4f67310b0eab939e;hp=a81c33ef83f17fce709099e4fe52dc4293a563bf;hpb=9001a7a636ae6b0f1606ce6d171fba70b695facd;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 a81c33e..9d3a192 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 @@ -2,14 +2,18 @@ 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.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.Timer; +import java.util.TimerTask; import java.util.TreeMap; import java.util.TreeSet; @@ -91,7 +95,8 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber // private CmsUserManager cmsUserManager; // TODO make more optimal or via CmsSession/CmsView - private Map managedUis = Collections.synchronizedMap(new HashMap<>()); + private static Timer janitorTimer = new Timer(true); + private Map> managedUis = new HashMap<>(); // ACR private ContentRepository contentRepository; @@ -104,9 +109,6 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber getCmsContext().getCmsEventBus().addEventSubscriber(event.topic(), this); } - if (log.isDebugEnabled()) - log.info("Argeo Suite App started"); - if (properties.containsKey(DEFAULT_UI_NAME_PROPERTY)) defaultUiName = LangUtils.get(properties, DEFAULT_UI_NAME_PROPERTY); if (properties.containsKey(DEFAULT_THEME_ID_PROPERTY)) @@ -126,25 +128,63 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber // TODO does it make sense to accept that? appPid = ""; } - Objects.requireNonNull(contentRepository, "Content repository must be provided"); Objects.requireNonNull(appUserState, "App user state must be provided"); -// if (pidPrefix == null) -// throw new IllegalArgumentException("PID prefix must be set."); -// headerPid = pidPrefix + "header"; -// footerPid = pidPrefix + "footer"; -// leadPanePid = pidPrefix + "leadPane"; -// adminLeadPanePid = pidPrefix + "adminLeadPane"; -// loginScreenPid = pidPrefix + "loginScreen"; + long janitorPeriod = 60 * 60 * 1000;// 1h + // long janitorPeriod = 60 * 1000;// min + janitorTimer.schedule(new TimerTask() { + + @Override + public void run() { + 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); + } + } + }, janitorPeriod, janitorPeriod); + if (log.isDebugEnabled()) + log.info("Argeo Suite App " + appPid + " started"); } public void stop(Map properties) { - for (SwtAppUi ui : managedUis.values()) + refs: for (WeakReference uiRef : managedUis.values()) { + SwtAppUi ui = uiRef.get(); + if (ui == null) + continue refs; if (!ui.isDisposed() && !ui.getDisplay().isDisposed()) { ui.getDisplay().syncExec(() -> ui.dispose()); } + } managedUis.clear(); if (log.isDebugEnabled()) log.info("Argeo Suite App stopped"); @@ -171,9 +211,12 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber if (theme != null) CmsSwtUtils.registerCmsTheme(uiParent.getShell(), theme); 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(); - managedUis.put(uid, argeoSuiteUi); argeoSuiteUi.addDisposeListener(new CleanUpUi(uid)); + managedUis.put(uid, new WeakReference<>(argeoSuiteUi)); return argeoSuiteUi; } @@ -395,39 +438,12 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber // } } -// 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); -// } -// } - @Override public void setState(CmsUi cmsUi, String state) { AppUi ui = (AppUi) cmsUi; 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) @@ -440,10 +456,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; } @@ -513,7 +527,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber ui.getCmsView().stateChanged(nodeToState(node), stateTitle(appTitle, CmsUxUtils.getTitle(node))); } 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."); @@ -590,7 +604,10 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber } private SwtAppUi getRelatedUi(Map eventProperties) { - return managedUis.get(get(eventProperties, CMS_VIEW_UID_PROPERTY)); + WeakReference uiRef = managedUis.get(get(eventProperties, CMS_VIEW_UID_PROPERTY)); + if (uiRef == null) + return null; + return uiRef.get(); } public static String get(Map eventProperties, String key) { @@ -672,14 +689,6 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber } } -// public void setCmsUserManager(CmsUserManager cmsUserManager) { -// this.cmsUserManager = cmsUserManager; -// } - -// protected ContentRepository getContentRepository() { -// return contentRepository; -// } - public void setContentRepository(ContentRepository contentRepository) { this.contentRepository = contentRepository; } @@ -697,7 +706,6 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber final String uid; public CleanUpUi(String uid) { - super(); this.uid = uid; }