svn commit: r551561 - in /incubator/wicket/trunk/jdk-1.4/wicket-extensions/src: main/java/org/apache/wicket/extensions/validation/validator/ test/java/org/apache/wicket/extensions/validation/validator/

[almaw]

Author: almaw
Date: Thu Jun 28 07:00:07 2007
New Revision: 551561

URL: http://svn.apache.org/viewvc?view=rev&rev=551561
Log:
Remove "Pattern" from name.

Added:
    
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressValidator.java
      - copied, changed from r551553, 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressPatternValidator.java
Removed:
    
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressPatternValidator.java
Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java

Copied: 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressValidator.java
 (from r551553, 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressPatternValidator.java)
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressValidator.java?view=diff&rev=551561&p1=incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressPatternValidator.java&r1=551553&p2=incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressValidator.java&r2=551561
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressPatternValidator.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailAddressValidator.java
 Thu Jun 28 07:00:07 2007
@@ -37,7 +37,7 @@
  * @see <a href="http://www.ietf.org/rfc/rfc0822.txt?number=822";>RFC 822</a>
  * @author Frank Bille
  */
-public class RfcCompliantEmailAddressPatternValidator extends PatternValidator
+public class RfcCompliantEmailAddressValidator extends PatternValidator
 {
        private static final long serialVersionUID = 1L;
 
@@ -125,26 +125,18 @@
                        + "?:\\r\\n)?[ \\t])*))*)?;\\s*)";
 
        /** Singleton instance */
-       private static final RfcCompliantEmailAddressPatternValidator INSTANCE 
= new RfcCompliantEmailAddressPatternValidator();
+       private static final RfcCompliantEmailAddressValidator INSTANCE = new 
RfcCompliantEmailAddressValidator();
 
        /**
         * @return Instance of RFC compliant emailaddress validator
         */
-       public static RfcCompliantEmailAddressPatternValidator getInstance()
+       public static RfcCompliantEmailAddressValidator getInstance()
        {
                return INSTANCE;
        }
 
-       protected RfcCompliantEmailAddressPatternValidator()
+       protected RfcCompliantEmailAddressValidator()
        {
                super(emailPattern);
-       }
-
-       /**
-        * @see 
org.apache.wicket.validation.validator.PatternValidator#resourceKey()
-        */
-       protected String resourceKey()
-       {
-               return "RfcCompliantEmailAddressPatternValidator";
        }
 }

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java?view=diff&rev=551561&r1=551560&r2=551561
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/validation/validator/RfcCompliantEmailValidatorTest.java
 Thu Jun 28 07:00:07 2007
@@ -18,7 +18,7 @@
 
 import java.util.regex.Matcher;
 
-import 
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressPatternValidator;
+import 
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
 
 import junit.framework.TestCase;
 
@@ -34,7 +34,7 @@
         */
        public void testValidEmailAddresses()
        {
-               RfcCompliantEmailAddressPatternValidator validator = 
RfcCompliantEmailAddressPatternValidator
+               RfcCompliantEmailAddressValidator validator = 
RfcCompliantEmailAddressValidator
                                .getInstance();
 
                String[] validEmails = new String[] { "[EMAIL PROTECTED]",
@@ -57,7 +57,7 @@
         */
        public void testInValidEmailAddresses()
        {
-               RfcCompliantEmailAddressPatternValidator validator = 
RfcCompliantEmailAddressPatternValidator
+               RfcCompliantEmailAddressValidator validator = 
RfcCompliantEmailAddressValidator
                                .getInstance();
 
                String[] inValidEmails = new String[] { "whatever", "[EMAIL 
PROTECTED]",