From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 17 Apr 2018 14:13:38 +0000 (+0200)
Subject: Make E4 more robust
X-Git-Tag: argeo-commons-2.1.74~61
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6960fb17d7601de34cc6c4f320c9d1f63caca692;p=lgpl%2Fargeo-commons.git

Make E4 more robust
---

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java
index e1a2581dc..8582f60b3 100644
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java
@@ -2,6 +2,7 @@ package org.argeo.cms.e4.handlers;
 
 import java.security.AccessController;
 import java.util.Locale;
+import java.util.Set;
 
 import javax.annotation.PostConstruct;
 import javax.security.auth.Subject;
@@ -13,8 +14,11 @@ public class LocaleAddon {
 	@PostConstruct
 	public void init(ILocaleChangeService localeChangeService) {
 		Subject subject = Subject.getSubject(AccessController.getContext());
-		Locale locale = subject.getPublicCredentials(Locale.class).iterator().next();
-		localeChangeService.changeApplicationLocale(locale);
-		UiContext.setLocale(locale);
+		Set<Locale> locales = subject.getPublicCredentials(Locale.class);
+		if (!locales.isEmpty()) {
+			Locale locale = locales.iterator().next();
+			localeChangeService.changeApplicationLocale(locale);
+			UiContext.setLocale(locale);
+		}
 	}
 }
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 93888bf46..24835afc0 100644
--- 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
@@ -133,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
diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java
index e816ec718..6d45e8cf2 100644
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/dialogs/LightweightDialog.java
@@ -224,7 +224,7 @@ public class LightweightDialog {
 
 	public void setTitle(String title) {
 		this.title = title;
-		if (getForegoundShell() != null)
+		if (title != null && getForegoundShell() != null)
 			getForegoundShell().setText(title);
 	}