Author: bspeakmon
Date: Fri Nov 16 10:42:24 2007
New Revision: 595771
URL: http://svn.apache.org/viewvc?rev=595771&view=rev
Log:
- delegate isValid() to new routines validator
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
Modified:
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
URL:
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java?rev=595771&r1=595770&r2=595771&view=diff
==============================================================================
---
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
(original)
+++
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
Fri Nov 16 10:42:24 2007
@@ -88,36 +88,7 @@
* @return true if the email address is valid.
*/
public boolean isValid(String email) {
- if (email == null) {
- return false;
- }
-
- Perl5Util matchAsciiPat = new Perl5Util();
- if (!matchAsciiPat.match(LEGAL_ASCII_PATTERN, email)) {
- return false;
- }
-
- email = stripComments(email);
-
- // Check the whole email address structure
- Perl5Util emailMatcher = new Perl5Util();
- if (!emailMatcher.match(EMAIL_PATTERN, email)) {
- return false;
- }
-
- if (email.endsWith(".")) {
- return false;
- }
-
- if (!isValidUser(emailMatcher.group(1))) {
- return false;
- }
-
- if (!isValidDomain(emailMatcher.group(2))) {
- return false;
- }
-
- return true;
+ return
org.apache.commons.validator.routines.EmailValidator.getInstance().isValid(email);
}
/**
