Author: tchemit Date: 2012-06-19 14:10:43 +0200 (Tue, 19 Jun 2012) New Revision: 3523 Url: http://chorem.org/repositories/revision/pollen/3523 Log: improve validation Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-19 10:18:41 UTC (rev 3522) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-19 12:10:43 UTC (rev 3523) @@ -102,9 +102,7 @@ if (StringUtils.isBlank(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.required")); - } - - if (!StringUtil.isEmail(user.getEmail())) { + } else if (!StringUtil.isEmail(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.invalid")); } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-19 10:18:41 UTC (rev 3522) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-19 12:10:43 UTC (rev 3523) @@ -86,9 +86,7 @@ if (StringUtils.isBlank(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.required")); - } - - if (!StringUtil.isEmail(user.getEmail())) { + } else if (!StringUtil.isEmail(user.getEmail())) { addFieldError("user.email", _("pollen.error.email.invalid")); } }