X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FSimpleErgonomics.java;h=d89d54d7c43d7bda782b3f884297776727c82f51;hb=fd15f02e9bcff9268ef4b87d7dec29b76be57862;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..d89d54d7c 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/SimpleErgonomics.java
@@ -24,6 +24,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;
@@ -41,7 +42,7 @@ 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());
 
@@ -56,11 +57,16 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 		bodyArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		bodyArea.setLayout(CmsUtils.noSpaceGridLayout());
 
+		uiInitialized = true;
 		refresh();
 	}
 
 	@Override
 	protected void refresh() {
+		if (!uiInitialized)
+			return;
+		if (getState() == null)
+			setState("");
 		refreshHeader();
 		refreshBody();
 		if (log.isTraceEnabled())
@@ -68,8 +74,6 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 	}
 
 	protected void refreshHeader() {
-		if (headerArea == null)
-			return;
 		for (Control child : headerArea.getChildren())
 			child.dispose();
 		try {
@@ -81,8 +85,6 @@ public class SimpleErgonomics extends AbstractCmsEntryPoint {
 	}
 
 	protected void refreshBody() {
-		if (bodyArea == null)
-			return;
 		// Exception
 		Throwable exception = getException();
 		if (exception != null) {
@@ -99,11 +101,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);