X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fwizards%2FMainUserInfoWizardPage.java;h=ad3662b6fc151f16f82c9fb9fdc29cc9caa66753;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=0a285bfd8d1715388bfb102548d05943628a6f2f;hpb=cd50e3711d3b86921f11d9e021fc6a43bef0d400;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java
index 0a285bfd8..ad3662b6f 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java
@@ -57,23 +57,34 @@ public class MainUserInfoWizardPage extends WizardPage implements
 		password2 = EclipseUiUtils.createGridLP(composite, "Repeat password",
 				this);
 		setControl(composite);
+		
+		// Initialize buttons
+		setPageComplete(false);
+		getContainer().updateButtons();
 	}
 
 	@Override
 	public void modifyText(ModifyEvent event) {
 		String message = checkComplete();
-		if (message != null)
+		if (message != null) {
 			setMessage(message, WizardPage.ERROR);
-		else {
+			setPageComplete(false);
+		} else {
 			setMessage("Complete", WizardPage.INFORMATION);
 			setPageComplete(true);
 		}
+		getContainer().updateButtons();
 	}
 
 	/** @return error message or null if complete */
 	protected String checkComplete() {
-//		if (!username.getText().matches(UserAdminService.USERNAME_PATTERN))
-//			return "Wrong user name format, should be lower case, between 3 and 64 characters with only '_' an '@' as acceptable special character.";
+		// if (!username.getText().matches(UserAdminService.USERNAME_PATTERN))
+		// return
+		// "Wrong user name format, should be lower case, between 3 and 64 characters with only '_' an '@' as acceptable special character.";
+		
+		if (username.getText().trim().equals(""))
+			return "User name must not be empty";
+		
 		try {
 			UserDetails userDetails = userAdminService
 					.loadUserByUsername(username.getText());