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=9d3a19218017f87b48048478ec9333eaf5da49b4;hb=c8592ef5b35b0b16129d61aa4f67310b0eab939e;hp=ef3bb8c330e1018de0b63c29cafa10124e9662d0;hpb=57af3e86327a40232216d20256eee155de1145aa;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 ef3bb8c..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
@@ -6,6 +6,7 @@ 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;
@@ -127,28 +128,52 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber
 			// TODO does it make sense to accept that?
 			appPid = "<unknown>";
 		}
-		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 = 12 * 60 * 60 * 1000;// 12h
+
+		long janitorPeriod = 60 * 60 * 1000;// 1h
+		// long janitorPeriod = 60 * 1000;// min
 		janitorTimer.schedule(new TimerTask() {
 
 			@Override
 			public void run() {
-				refs: for (WeakReference<SwtAppUi> uiRef : managedUis.values()) {
-					SwtAppUi ui = uiRef.get();
-					if (ui == null)
-						continue refs;
-					ui.disposeIfTimedout();
+				try {
+					// copy Map in order to avoid concurrent modification exception
+					Iterator<Map.Entry<String, WeakReference<SwtAppUi>>> uiRefs = new HashMap<>(managedUis).entrySet()
+							.iterator();
+					refs: while (uiRefs.hasNext()) {
+						Map.Entry<String, WeakReference<SwtAppUi>> entry = uiRefs.next();
+						String uiUuid = entry.getKey();
+						WeakReference<SwtAppUi> 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.isDebugEnabled())
-					log.debug(managedUis.size() + " UIs being managed by app " + appPid);
 			}
 		}, janitorPeriod, janitorPeriod);
 
+		if (log.isDebugEnabled())
+			log.info("Argeo Suite App " + appPid + " started");
 	}
 
 	public void stop(Map<String, Object> properties) {
@@ -187,7 +212,8 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber
 			CmsSwtUtils.registerCmsTheme(uiParent.getShell(), theme);
 		SwtAppUi argeoSuiteUi = new SwtAppUi(uiParent, SWT.INHERIT_DEFAULT);
 		// TODO make timeout configurable
-		argeoSuiteUi.setUiTimeout(12 * 60 * 60 * 1000);// 12 hours
+		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));
@@ -412,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)
@@ -457,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;
 		}
@@ -530,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.");