X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fworkbench%2Finternal%2Fuseradmin%2Fcommands%2FNewUser.java;h=c342342dc48904c37e565d5aad19ec1ac215f5f7;hb=c149774fa220fe69f430f7b230ac4c442ea6d0fe;hp=a5a41f5016a5bbc9322b19938a3a227069a965a8;hpb=328d27b8653a55d9561134f120bca09776f43c1c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
index a5a41f501..c342342dc 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
@@ -25,8 +25,9 @@ import javax.naming.ldap.Rdn;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UiAdminUtils;
 import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
-import org.argeo.cms.util.useradmin.UserAdminUtils;
+import org.argeo.cms.util.UserAdminUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.naming.LdapAttrs;
@@ -54,13 +55,6 @@ import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Open a wizard that enables creation of a new user. */
 public class NewUser extends AbstractHandler {
-	/**
-	 * Email addresses must match this regexp pattern ({@value #EMAIL_PATTERN}.
-	 * Thanks to <a href=
-	 * "http://www.mkyong.com/regular-expressions/how-to-validate-email-address-with-regular-expression/"
-	 * >this tip</a>.
-	 */
-	public final static String EMAIL_PATTERN = "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
 	// private final static Log log = LogFactory.getLog(NewUser.class);
 	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".newUser";
 
@@ -236,7 +230,7 @@ public class NewUser extends AbstractHandler {
 						.getRole(getDn(name));
 				if (role != null)
 					return "User " + name + " already exists";
-				if (!primaryMailTxt.getText().matches(EMAIL_PATTERN))
+				if (!primaryMailTxt.getText().matches(UiAdminUtils.EMAIL_PATTERN))
 					return "Not a valid email address";
 				if (lastNameTxt.getText().trim().equals(""))
 					return "Specify a last name";