X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Feditors%2FDefaultUserMainPage.java;fp=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Feditors%2FDefaultUserMainPage.java;h=5a20377cabce94977ba7e811a62ef94cfa291bfb;hb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;hp=22927bd1126c6713f9a30ba705ad5a28ee69cba7;hpb=a3aed6b17b3a5de5f37170bf88a939fb8aae6e68;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java
index 22927bd11..5a20377ca 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/DefaultUserMainPage.java
@@ -46,9 +46,8 @@ public class DefaultUserMainPage extends FormPage implements ArgeoNames {
 	protected void createFormContent(final IManagedForm mf) {
 		try {
 			ScrolledForm form = mf.getForm();
-			form.setText(userProfile.getProperty(ARGEO_FIRST_NAME).getString()
-					+ " "
-					+ userProfile.getProperty(ARGEO_LAST_NAME).getString());
+			form.setText(getProperty(ARGEO_FIRST_NAME) + " "
+					+ getProperty(ARGEO_LAST_NAME));
 			GridLayout mainLayout = new GridLayout(1, true);
 			// ColumnLayout mainLayout = new ColumnLayout();
 			// mainLayout.minNumColumns = 1;
@@ -89,13 +88,13 @@ public class DefaultUserMainPage extends FormPage implements ArgeoNames {
 		// username = createLT(body, "Username", "");
 		// }
 		final Text firstName = createLT(body, "First name",
-				userProfile.getProperty(ARGEO_FIRST_NAME));
+				getProperty(ARGEO_FIRST_NAME));
 		final Text lastName = createLT(body, "Last name",
-				userProfile.getProperty(ARGEO_LAST_NAME));
+				getProperty(ARGEO_LAST_NAME));
 		final Text email = createLT(body, "Email",
-				userProfile.getProperty(ARGEO_PRIMARY_EMAIL));
+				getProperty(ARGEO_PRIMARY_EMAIL));
 		final Text description = createLT(body, "Description",
-				userProfile.getProperty(Property.JCR_DESCRIPTION));
+				getProperty(Property.JCR_DESCRIPTION));
 
 		// create form part (controller)
 		AbstractFormPart part = new SectionPart(section) {
@@ -136,6 +135,12 @@ public class DefaultUserMainPage extends FormPage implements ArgeoNames {
 		getManagedForm().addPart(part);
 	}
 
+	/** @return the property, or teh empty string if not set */
+	protected String getProperty(String name) throws RepositoryException {
+		return userProfile.hasProperty(name) ? userProfile.getProperty(name)
+				.getString() : "";
+	}
+
 	/** Creates the password section */
 	protected void createPassworPart(Composite parent) {
 		FormToolkit tk = getManagedForm().getToolkit();
@@ -187,11 +192,6 @@ public class DefaultUserMainPage extends FormPage implements ArgeoNames {
 		return text;
 	}
 
-	protected Text createLT(Composite body, String label, Property value)
-			throws RepositoryException {
-		return createLT(body, label, value.getString());
-	}
-
 	/** Creates label and password. */
 	protected Text createLP(Composite body, String label, String value) {
 		FormToolkit toolkit = getManagedForm().getToolkit();