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%2Fwizards%2FMainUserInfoWizardPage.java;h=ad3662b6fc151f16f82c9fb9fdc29cc9caa66753;hb=9ba6c016cc5f9ae5a126d64a5e89d9edb2cfa2ad;hp=496979b84e55eec59685b0355290b889a9d085c9;hpb=4d665b0700136573b05879aa19897d8f448d8ca4;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 496979b84..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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.ui.admin.wizards;
 
 import javax.jcr.Node;
@@ -42,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());