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=80bd3552b4346e7bb52748fec83b7d7714decb75;hb=ad42f2e927cb1eea17db610e76e13f0ac11b6080;hp=0b6c34d33e38f53d17d496eb7fef07c5023b29ac;hpb=618968cf9d259ccded45a9455a26c516dbfe828f;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 0b6c34d..80bd355 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 @@ -44,6 +44,8 @@ import org.argeo.cms.util.LangUtils; import org.argeo.cms.ux.CmsUxUtils; import org.argeo.eclipse.ui.specific.UiContext; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Composite; import org.osgi.framework.Constants; @@ -55,17 +57,22 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber public final static String DEFAULT_UI_NAME_PROPERTY = "defaultUiName"; public final static String DEFAULT_THEME_ID_PROPERTY = "defaultThemeId"; public final static String DEFAULT_LAYER_PROPERTY = "defaultLayer"; + public final static String SHARED_PID_PREFIX_PROPERTY = "sharedPidPrefix"; + private final static String LOGIN = "login"; private final static String HOME_STATE = "~"; private String publicBasePath = null; + private String appPid; private String pidPrefix; - private String headerPid; - private String footerPid; - private String leadPanePid; - private String adminLeadPanePid; - private String loginScreenPid; + private String sharedPidPrefix; + +// private String headerPid; +// private String footerPid; +// private String leadPanePid; +// private String adminLeadPanePid; +// private String loginScreenPid; private String defaultUiName = "app"; private String adminUiName = "admin"; @@ -85,7 +92,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber // private CmsUserManager cmsUserManager; // TODO make more optimal or via CmsSession/CmsView - private Map managedUis = new HashMap<>(); + private Map managedUis = Collections.synchronizedMap(new HashMap<>()); // ACR private ContentRepository contentRepository; @@ -93,7 +100,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber // JCR // private Repository repository; - public void init(Map properties) { + public void start(Map properties) { for (SuiteUxEvent event : SuiteUxEvent.values()) { getCmsContext().getCmsEventBus().addEventSubscriber(event.topic(), this); } @@ -107,30 +114,36 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber defaultThemeId = LangUtils.get(properties, DEFAULT_THEME_ID_PROPERTY); if (properties.containsKey(DEFAULT_LAYER_PROPERTY)) defaultLayerPid = LangUtils.get(properties, DEFAULT_LAYER_PROPERTY); + sharedPidPrefix = LangUtils.get(properties, SHARED_PID_PREFIX_PROPERTY); publicBasePath = LangUtils.get(properties, PUBLIC_BASE_PATH_PROPERTY); if (properties.containsKey(Constants.SERVICE_PID)) { - String servicePid = properties.get(Constants.SERVICE_PID).toString(); - if (servicePid.endsWith(".app")) { - pidPrefix = servicePid.substring(0, servicePid.length() - "app".length()); + appPid = properties.get(Constants.SERVICE_PID).toString(); + int lastDotIndex = appPid.lastIndexOf('.'); + if (lastDotIndex >= 0) { + pidPrefix = appPid.substring(0, lastDotIndex); } + } else { + // TODO doe it make sense to accept that? + appPid = ""; } - if (pidPrefix == null) - throw new IllegalArgumentException("PID prefix must be set."); +// 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"; +// headerPid = pidPrefix + "header"; +// footerPid = pidPrefix + "footer"; +// leadPanePid = pidPrefix + "leadPane"; +// adminLeadPanePid = pidPrefix + "adminLeadPane"; +// loginScreenPid = pidPrefix + "loginScreen"; } - public void destroy(Map properties) { + public void stop(Map properties) { for (SwtAppUi ui : managedUis.values()) - if (!ui.isDisposed()) { + if (!ui.isDisposed() && !ui.getDisplay().isDisposed()) { ui.getDisplay().syncExec(() -> ui.dispose()); } + managedUis.clear(); if (log.isDebugEnabled()) log.info("Argeo Suite App stopped"); @@ -158,11 +171,19 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber SwtAppUi argeoSuiteUi = new SwtAppUi(uiParent, SWT.INHERIT_DEFAULT); String uid = cmsView.getUid(); managedUis.put(uid, argeoSuiteUi); - argeoSuiteUi.addDisposeListener((e) -> { - managedUis.remove(uid); - if (log.isDebugEnabled()) - log.debug("Suite UI " + uid + " has been disposed."); - }); + argeoSuiteUi.addDisposeListener(new CleanUpUi(uid)); +// argeoSuiteUi.addDisposeListener((e) -> { +// managedUis.remove(uid); +// if (log.isDebugEnabled()) +// log.debug("Suite UI " + uid + " has been disposed."); +// }); +// Display.getCurrent().disposeExec(() -> { +// if (managedUis.containsKey(uid)) { +// managedUis.remove(uid); +// if (log.isDebugEnabled()) +// log.debug("Suite UI " + uid + " has been disposed from Display#disposeExec()."); +// } +// }); return argeoSuiteUi; } @@ -187,13 +208,13 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber ProvidedSession contentSession = (ProvidedSession) CmsUxUtils.getContentSession(contentRepository, cmsView); - SwtUiProvider headerUiProvider = findUiProvider(headerPid); - SwtUiProvider footerUiProvider = findUiProvider(footerPid); + SwtUiProvider headerUiProvider = findStructuralUiProvider(SwtAppUi.Structural.header.name()); + SwtUiProvider footerUiProvider = findStructuralUiProvider(SwtAppUi.Structural.footer.name()); SwtUiProvider leadPaneUiProvider; if (adminUiName.equals(uiName)) { - leadPaneUiProvider = findUiProvider(adminLeadPanePid); + leadPaneUiProvider = findStructuralUiProvider(SwtAppUi.Structural.adminLeadPane.name()); } else { - leadPaneUiProvider = findUiProvider(leadPanePid); + leadPaneUiProvider = findStructuralUiProvider(SwtAppUi.Structural.leadPane.name()); } Localized appTitle = null; @@ -208,7 +229,8 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber if (headerUiProvider != null) refreshPart(headerUiProvider, ui.getHeader(), context); ui.refreshBelowHeader(false); - refreshPart(findUiProvider(loginScreenPid), ui.getBelowHeader(), context); + SwtUiProvider loginScreenUiProvider = findStructuralUiProvider(SwtAppUi.Structural.loginScreen.name()); + refreshPart(loginScreenUiProvider, ui.getBelowHeader(), context); if (footerUiProvider != null) refreshPart(footerUiProvider, ui.getFooter(), context); ui.layout(true, true); @@ -278,6 +300,17 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber uiProvider.createUiPart(part, context); } + private SwtUiProvider findStructuralUiProvider(String suffix) { + SwtUiProvider res = null; + if (pidPrefix != null) + res = findUiProvider(pidPrefix + "." + suffix); + if (res != null) + return res; + if (sharedPidPrefix != null) + res = findUiProvider(sharedPidPrefix + "." + suffix); + return res; + } + private SwtUiProvider findUiProvider(String pid) { if (!uiProvidersByPid.containsKey(pid)) return null; @@ -466,7 +499,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber try { String appTitle = ""; if (ui.getTitle() != null) - appTitle = ui.getTitle().lead() + " - "; + appTitle = ui.getTitle().lead(); if (isTopic(topic, SuiteUxEvent.refreshPart)) { Content node = getContentFromEvent(ui, event); @@ -476,7 +509,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber SwtAppLayer layer = findByType(layersByType, node); ui.switchToLayer(layer, node); layer.view(uiProvider, ui.getCurrentWorkArea(), node); - ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node)); + ui.getCmsView().stateChanged(nodeToState(node), stateTitle(appTitle, CmsUxUtils.getTitle(node))); } else if (isTopic(topic, SuiteUxEvent.openNewPart)) { Content node = getContentFromEvent(ui, event); if (node == null) @@ -485,7 +518,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber SwtAppLayer layer = findByType(layersByType, node); ui.switchToLayer(layer, node); layer.open(uiProvider, ui.getCurrentWorkArea(), node); - ui.getCmsView().stateChanged(nodeToState(node), appTitle + CmsUxUtils.getTitle(node)); + 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) { @@ -502,17 +535,17 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber if (nodeFromState != null && nodeFromState.getPath().equals(ui.getUserDir().getPath())) { // default layer view is forced String state = defaultLayerPid.equals(layerId) ? "~" : layerId; - ui.getCmsView().stateChanged(state, appTitle + title); + ui.getCmsView().stateChanged(state, stateTitle(appTitle, title)); suiteLayer.view(null, workArea, nodeFromState); } else { Content layerCurrentContext = suiteLayer.getCurrentContext(workArea); if (layerCurrentContext != null && !layerCurrentContext.equals(ui.getUserDir())) { // layer was already showing a context so we set the state to it ui.getCmsView().stateChanged(nodeToState(layerCurrentContext), - appTitle + CmsUxUtils.getTitle(layerCurrentContext)); + stateTitle(appTitle, CmsUxUtils.getTitle(layerCurrentContext))); } else { // no context was shown - ui.getCmsView().stateChanged(layerId, appTitle + title); + ui.getCmsView().stateChanged(layerId, stateTitle(appTitle, title)); } } } else { @@ -530,6 +563,10 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber }); } + private String stateTitle(String appTitle, String additionalTitle) { + return additionalTitle == null ? appTitle : appTitle + " - " + additionalTitle; + } + private boolean isTopic(String topic, CmsEvent cmsEvent) { Objects.requireNonNull(topic); return topic.equals(cmsEvent.topic()); @@ -659,4 +696,27 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber this.appUserState = appUserState; } + /** + * Dedicated class to clean up the UI in order to avoid illegal access issues + * with lambdas. + */ + private class CleanUpUi implements DisposeListener { + private static final long serialVersionUID = 1905900302262082463L; + final String uid; + + public CleanUpUi(String uid) { + super(); + this.uid = uid; + } + + @Override + public void widgetDisposed(DisposeEvent e) { + managedUis.remove(uid); + if (log.isDebugEnabled()) + log.debug("App " + appPid + " - Suite UI " + uid + " has been disposed (" + managedUis.size() + + " UIs still being managed)."); + } + + } + }