From 92e952dc93d7be465e8b7c03b78a857d33ab5ae0 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 21 Sep 2022 12:06:48 +0200 Subject: [PATCH] Enrich the CMS UI interface. --- org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java | 5 ++++- .../src/org/argeo/cms/swt/CmsSwtUi.java | 9 +++++++++ .../src/org/argeo/cms/web/CmsWebEntryPoint.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java index 011cc1deb..2103e4989 100644 --- a/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java +++ b/org.argeo.api.cms/src/org/argeo/api/cms/ux/CmsUi.java @@ -1,7 +1,10 @@ package org.argeo.api.cms.ux; +/** The actual implementation of a user interface, using a given technology. */ public interface CmsUi { Object getData(String key); - void setData(String key, Object value); + void setData(String key, Object value); + + CmsView getCmsView(); } diff --git a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java index 2fb79f443..e0f63e45e 100644 --- a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java +++ b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUi.java @@ -1,6 +1,7 @@ package org.argeo.cms.swt; import org.argeo.api.cms.ux.CmsUi; +import org.argeo.api.cms.ux.CmsView; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -9,9 +10,17 @@ public class CmsSwtUi extends Composite implements CmsUi { private static final long serialVersionUID = -107939076610406448L; + private CmsView cmsView; + public CmsSwtUi(Composite parent, int style) { super(parent, style); + cmsView = CmsSwtUtils.getCmsView(parent); + setLayout(new GridLayout()); } + public CmsView getCmsView() { + return cmsView; + } + } \ No newline at end of file diff --git a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java index bb6a2e103..d63aeeea5 100644 --- a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java +++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java @@ -191,7 +191,7 @@ public class CmsWebEntryPoint extends AbstractSwtCmsView implements EntryPoint, }); } - /** Sets the state of the entry point and retrieve the related JCR node. */ + /** Sets the state of the entry point and retrieve the related content. */ protected String setState(String newState) { cmsWebApp.getCmsApp().setState(ui, newState); state = newState; -- 2.30.2