X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FSimpleErgonomics.java;h=e7192af0f37a70e41357c82c277f915144a18e63;hb=c9ad45317bcbe8940c9cc4d55ee47ae4b19f08c1;hp=7835b7efa65985a833514627cc94b0f4e4d02b62;hpb=24c63057592c8ef8a161f3f37bbdafd0cd475dd5;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java b/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
index 7835b7efa..e7192af0f 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
@@ -13,6 +13,7 @@ import org.argeo.cms.CmsImageManager;
 import org.argeo.cms.CmsStyles;
 import org.argeo.cms.CmsUiProvider;
 import org.argeo.cms.internal.ImageManagerImpl;
+import org.argeo.cms.ui.UxContext;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
@@ -24,6 +25,7 @@ import org.eclipse.swt.widgets.Control;
 public class SimpleErgonomics extends AbstractCmsEntryPoint {
 	private final static Log log = LogFactory.getLog(SimpleErgonomics.class);
 
+	private boolean uiInitialized = false;
 	private Composite headerArea;
 	private Composite bodyArea;
 	private final CmsUiProvider uiProvider;
@@ -32,6 +34,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 	private Integer headerHeight = 40;
 
 	private CmsImageManager imageManager = new ImageManagerImpl();
+	private UxContext uxContext = null;
 
 	public SimpleErgonomics(Repository repository, String workspace,
 			String defaultPath, CmsUiProvider uiProvider,
@@ -41,10 +44,11 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 	}
 
 	@Override
-	protected void createUi(Composite parent) {
+	protected void initUi(Composite parent) {
 		parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		parent.setLayout(CmsUtils.noSpaceGridLayout());
 
+		// createAdminArea(parent);
 		headerArea = new Composite(parent, SWT.NONE);
 		headerArea.setLayout(new FillLayout());
 		GridData headerData = new GridData(SWT.FILL, SWT.FILL, false, false);
@@ -55,21 +59,27 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 		bodyArea.setData(RWT.CUSTOM_VARIANT, CmsStyles.CMS_BODY);
 		bodyArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		bodyArea.setLayout(CmsUtils.noSpaceGridLayout());
-
+		uxContext = new SimpleUxContext();
+		uiInitialized = true;
 		refresh();
 	}
 
 	@Override
 	protected void refresh() {
+		if (!uiInitialized)
+			return;
+		if (getState() == null)
+			setState("");
 		refreshHeader();
 		refreshBody();
 		if (log.isTraceEnabled())
 			log.trace("UI refreshed " + getNode());
 	}
 
+	protected void createAdminArea(Composite parent) {
+	}
+
 	protected void refreshHeader() {
-		if (headerArea == null)
-			return;
 		for (Control child : headerArea.getChildren())
 			child.dispose();
 		try {
@@ -81,8 +91,6 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 	}
 
 	protected void refreshBody() {
-		if (bodyArea == null)
-			return;
 		// Exception
 		Throwable exception = getException();
 		if (exception != null) {
@@ -99,11 +107,7 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 			child.dispose();
 		bodyArea.setLayout(CmsUtils.noSpaceGridLayout());
 
-		String state = getState();
 		try {
-			if (state == null)
-				setState("");
-			// throw new CmsException("State cannot be null");
 			uiProvider.createUi(bodyArea, getNode());
 		} catch (RepositoryException e) {
 			throw new CmsException("Cannot refresh body", e);
@@ -112,6 +116,11 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 		bodyArea.layout(true, true);
 	}
 
+	@Override
+	public UxContext getUxContext() {
+		return uxContext;
+	}
+
 	@Override
 	public CmsImageManager getImageManager() {
 		return imageManager;