Make E4 more robust

[lgpl/argeo-commons.git] / org.argeo.cms.ui / src / org / argeo / cms / ui / dialogs / CmsWizardDialog.java

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java
index cafde7e2739f5505eeb43e173492384a3258ccaa..24835afc00963c901762c3b2e122170faaa2402e 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/dialogs/CmsWizardDialog.java
@@ -75,6 +75,7 @@ public class CmsWizardDialog extends LightweightDialog implements IWizardContain
                buttons.setLayoutData(new GridData(SWT.END, SWT.FILL, true, false));
                {
                        boolean singlePage = wizard.getPageCount() == 1;
+                       // singlePage = false;// dev
                        GridLayout layout = new GridLayout(singlePage ? 1 : 3, true);
                        layout.marginWidth = 0;
                        layout.marginHeight = 0;
@@ -132,12 +133,14 @@ public class CmsWizardDialog extends LightweightDialog implements IWizardContain
 
        @Override
        public void updateMessage() {
-               message.setText(currentPage.getMessage());
+               if (currentPage.getMessage() != null)
+                       message.setText(currentPage.getMessage());
        }
 
        @Override
        public void updateTitleBar() {
-               titleBar.setText(currentPage.getTitle());
+               if (currentPage.getTitle() != null)
+                       titleBar.setText(currentPage.getTitle());
        }
 
        @Override