From b4d2b8bfcb043c9339131954a4ccc88fa18f9ac7 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 12 Sep 2022 05:30:41 +0200 Subject: [PATCH] Use SwtUiProvider instead of CmsUiProvider --- org.argeo.app.ui/OSGI-INF/cmsApp.xml | 3 +- .../src/org/argeo/app/ui/SuiteApp.java | 28 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/org.argeo.app.ui/OSGI-INF/cmsApp.xml b/org.argeo.app.ui/OSGI-INF/cmsApp.xml index 465f47f..cbd78eb 100644 --- a/org.argeo.app.ui/OSGI-INF/cmsApp.xml +++ b/org.argeo.app.ui/OSGI-INF/cmsApp.xml @@ -5,7 +5,8 @@ - + + diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java index d59edd5..1e71179 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java @@ -40,8 +40,8 @@ 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; +import org.argeo.cms.swt.acr.SwtUiProvider; import org.argeo.cms.swt.dialogs.CmsFeedback; -import org.argeo.cms.ui.CmsUiProvider; import org.argeo.cms.ux.CmsUxUtils; import org.argeo.eclipse.ui.specific.UiContext; import org.argeo.jcr.JcrException; @@ -80,8 +80,8 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { @Deprecated private String defaultThemeId = "org.argeo.app.theme.default"; - private Map> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>()); - private Map> uiProvidersByType = Collections.synchronizedMap(new HashMap<>()); + private Map> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>()); + private Map> uiProvidersByType = Collections.synchronizedMap(new HashMap<>()); private Map> layersByPid = Collections.synchronizedSortedMap(new TreeMap<>()); private Map> layersByType = Collections.synchronizedSortedMap(new TreeMap<>()); @@ -191,9 +191,9 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { ProvidedSession contentSession = (ProvidedSession) CmsUxUtils.getContentSession(contentRepository, cmsView); - CmsUiProvider headerUiProvider = findUiProvider(headerPid); - CmsUiProvider footerUiProvider = findUiProvider(footerPid); - CmsUiProvider leadPaneUiProvider; + SwtUiProvider headerUiProvider = findUiProvider(headerPid); + SwtUiProvider footerUiProvider = findUiProvider(footerPid); + SwtUiProvider leadPaneUiProvider; if (adminUiName.equals(uiName)) { leadPaneUiProvider = findUiProvider(adminLeadPanePid); } else { @@ -277,12 +277,12 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { } - private void refreshPart(CmsUiProvider uiProvider, Composite part, Content context) { + private void refreshPart(SwtUiProvider uiProvider, Composite part, Content context) { CmsSwtUtils.clear(part); uiProvider.createUiPart(part, context); } - private CmsUiProvider findUiProvider(String pid) { + private SwtUiProvider findUiProvider(String pid) { if (!uiProvidersByPid.containsKey(pid)) return null; return uiProvidersByPid.get(pid).get(); @@ -496,7 +496,7 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { Content node = getNode(ui, event); if (node == null) return; - CmsUiProvider uiProvider = findByType(uiProvidersByType, node); + SwtUiProvider uiProvider = findByType(uiProvidersByType, node); SuiteLayer layer = findByType(layersByType, node); ui.switchToLayer(layer, node); layer.view(uiProvider, ui.getCurrentWorkArea(), node); @@ -505,7 +505,7 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { Content node = getNode(ui, event); if (node == null) return; - CmsUiProvider uiProvider = findByType(uiProvidersByType, node); + SwtUiProvider uiProvider = findByType(uiProvidersByType, node); SuiteLayer layer = findByType(layersByType, node); ui.switchToLayer(layer, node); layer.open(uiProvider, ui.getCurrentWorkArea(), node); @@ -622,7 +622,7 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { * Dependency injection. */ - public void addUiProvider(CmsUiProvider uiProvider, Map properties) { + public void addUiProvider(SwtUiProvider uiProvider, Map properties) { if (properties.containsKey(Constants.SERVICE_PID)) { String pid = (String) properties.get(Constants.SERVICE_PID); RankedObject.putIfHigherRank(uiProvidersByPid, pid, uiProvider, properties); @@ -634,11 +634,11 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { } } - public void removeUiProvider(CmsUiProvider uiProvider, Map properties) { + public void removeUiProvider(SwtUiProvider uiProvider, Map properties) { if (properties.containsKey(Constants.SERVICE_PID)) { String pid = (String) properties.get(Constants.SERVICE_PID); if (uiProvidersByPid.containsKey(pid)) { - if (uiProvidersByPid.get(pid).equals(new RankedObject(uiProvider, properties))) { + if (uiProvidersByPid.get(pid).equals(new RankedObject(uiProvider, properties))) { uiProvidersByPid.remove(pid); } } @@ -647,7 +647,7 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber { List types = LangUtils.toStringList(properties.get(EntityConstants.TYPE)); for (String type : types) { if (uiProvidersByType.containsKey(type)) { - if (uiProvidersByType.get(type).equals(new RankedObject(uiProvider, properties))) { + if (uiProvidersByType.get(type).equals(new RankedObject(uiProvider, properties))) { uiProvidersByType.remove(type); } } -- 2.30.2