From do-not-reply at jboss.org Wed Sep 28 06:29:19 2011
Content-Type: multipart/mixed; boundary="===============3990342142639049306=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r7548 - in portal/trunk:
 webui/eXo/src/main/java/org/exoplatform/webui/organization and 1 other
 directory.
Date: Wed, 28 Sep 2011 06:29:19 -0400
Message-ID: <201109281029.p8SATJVA021949@svn01.web.mwc.hst.phx2.redhat.com>

--===============3990342142639049306==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ndkhoiits
Date: 2011-09-28 06:29:18 -0400 (Wed, 28 Sep 2011)
New Revision: 7548

Modified:
   portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webu=
i/component/UIRegisterForm.java
   portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/=
UIAccountForm.java
Log:
GTNPORTAL-2117 The username value should be validated even click on 'Check =
Avaiablitiy'

Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/accou=
nt/webui/component/UIRegisterForm.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/web=
ui/component/UIRegisterForm.java	2011-09-28 10:17:50 UTC (rev 7547)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/web=
ui/component/UIRegisterForm.java	2011-09-28 10:29:18 UTC (rev 7548)
@@ -19,9 +19,8 @@
 =

 package org.exoplatform.account.webui.component;
 =

-import org.exoplatform.portal.webui.CaptchaValidator;
-import org.exoplatform.portal.webui.UICaptcha;
-import org.exoplatform.portal.webui.util.Util;
+import nl.captcha.Captcha;
+
 import org.exoplatform.services.organization.OrganizationService;
 import org.exoplatform.services.organization.UserHandler;
 import org.exoplatform.web.application.ApplicationMessage;
@@ -33,23 +32,18 @@
 import org.exoplatform.webui.core.UIPopupMessages;
 import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
 import org.exoplatform.webui.event.Event;
-import org.exoplatform.webui.event.EventListener;
 import org.exoplatform.webui.event.Event.Phase;
+import org.exoplatform.webui.event.EventListener;
 import org.exoplatform.webui.exception.MessageException;
 import org.exoplatform.webui.form.UIForm;
 import org.exoplatform.webui.form.UIFormInputWithActions;
-import org.exoplatform.webui.form.UIFormStringInput;
 import org.exoplatform.webui.form.UIFormInputWithActions.ActionData;
-import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.exoplatform.webui.form.UIFormStringInput;
+import org.exoplatform.webui.form.validator.Validator;
 =

 import java.util.ArrayList;
 import java.util.List;
 =

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import nl.captcha.Captcha;
-
 /**
  * =

  * @author <a href=3D"mailto:hoang281283(a)gmail.com">Minh Hoang TO</a>
@@ -91,7 +85,6 @@
    @Override
    public void processAction(WebuiRequestContext context) throws Exception
    {
-      // TODO Auto-generated method stub
       super.processAction(context);
       =

       UIApplication uiApp =3D context.getUIApplication();
@@ -147,16 +140,19 @@
          OrganizationService orgService =3D registerForm.getApplicationCom=
ponent(OrganizationService.class);
          UIRegisterInputSet registerInput =3D registerForm.getChild(UIRegi=
sterInputSet.class);
          UIFormStringInput userNameInput =3D registerInput.getUIStringInpu=
t(UIRegisterInputSet.USER_NAME);
-         MandatoryValidator validator =3D new MandatoryValidator();
-         try
+         List<Validator> validators =3D userNameInput.getValidators();
+         for (Validator validator  : validators)
          {
-            validator.validate(userNameInput);
+            try
+            {
+               validator.validate(userNameInput);
+            }
+            catch (MessageException e)
+            {
+               event.getRequestContext().getUIApplication().addMessage(e.g=
etDetailMessage());
+               return;
+            }
          }
-         catch (MessageException e)
-         {
-            event.getRequestContext().getUIApplication().addMessage(e.getD=
etailMessage());
-            return;
-         }
 =

          String typedUsername =3D userNameInput.getValue();
          WebuiRequestContext context =3D WebuiRequestContext.getCurrentIns=
tance();
@@ -168,7 +164,7 @@
          }
          else
          {
-            uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg=
.user-not-exist", new String[]{typedUsername}));
+            uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg=
.user-not-exist", new String[]{typedUsername}, ApplicationMessage.INFO));
          }
       }
 =

@@ -195,7 +191,6 @@
       @Override
       public void execute(Event<UIRegisterForm> event) throws Exception
       {
-         // TODO Auto-generated method stub
          UIRegisterForm registerForm =3D event.getSource();
          registerForm.resetInput();
       }

Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organi=
zation/UIAccountForm.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization=
/UIAccountForm.java	2011-09-28 10:17:50 UTC (rev 7547)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization=
/UIAccountForm.java	2011-09-28 10:29:18 UTC (rev 7548)
@@ -32,10 +32,13 @@
 import org.exoplatform.webui.event.Event;
 import org.exoplatform.webui.event.EventListener;
 import org.exoplatform.webui.event.Event.Phase;
+import org.exoplatform.webui.exception.MessageException;
 import org.exoplatform.webui.form.UIFormInputSet;
 import org.exoplatform.webui.form.UIFormInputWithActions;
+import org.exoplatform.webui.form.UIFormStringInput;
 import org.exoplatform.webui.form.UIFormTabPane;
 import org.exoplatform.webui.form.UIFormInputWithActions.ActionData;
+import org.exoplatform.webui.form.validator.Validator;
 =

 import java.util.ArrayList;
 import java.util.List;
@@ -127,21 +130,27 @@
          WebuiRequestContext context =3D WebuiRequestContext.getCurrentIns=
tance();
          UIApplication uiApp =3D context.getUIApplication();
          OrganizationService service =3D uiForm.getApplicationComponent(Or=
ganizationService.class);
-         String userName =3D uiForm.getChild(UIAccountInputSet.class).getU=
serName();
-         if (userName =3D=3D null)
+         UIFormStringInput usernameInput =3D uiForm.getChild(UIAccountInpu=
tSet.class).getUIStringInput(UIAccountInputSet.USERNAME);
+         for (Validator validator : usernameInput.getValidators())
          {
-            uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg=
.empty-input", null,
-               ApplicationMessage.WARNING));
-            return;
+            try
+            {
+               validator.validate(usernameInput);
+            }
+            catch (MessageException e)
+            {
+               uiApp.addMessage(e.getDetailMessage());
+               return;
+            }
          }
+
+         String userName =3D usernameInput.getValue();
          if (service.getUserHandler().findUserByName(userName) !=3D null)
          {
-            uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg=
.user-exist", null,
-               ApplicationMessage.WARNING));
+            uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg=
.user-exist", null, ApplicationMessage.WARNING));
             return;
          }
-         uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.us=
er-not-exist", null,
-            ApplicationMessage.WARNING));
+         uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.us=
er-not-exist", null, ApplicationMessage.INFO));
       }
    }
 }
\ No newline at end of file


--===============3990342142639049306==--