Author: ivaynberg
Date: Sun Mar 25 22:08:03 2007
New Revision: 522419
URL: http://svn.apache.org/viewvc?view=rev&rev=522419
Log:
api clarifications
Added:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IErrorMessageSource.java
- copied, changed from r522400,
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IMessageSource.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressValidator.java
- copied, changed from r522400,
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java
Removed:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IMessageSource.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/validation/AbstractFormValidator.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IValidationError.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/ValidationError.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/AbstractValidator.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/util/tester/apps_4/EmailPage.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java?view=diff&rev=522419&r1=522418&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
Sun Mar 25 22:08:03 2007
@@ -39,7 +39,7 @@
import wicket.util.string.StringList;
import wicket.util.string.Strings;
import wicket.util.string.interpolator.MapVariableInterpolator;
-import wicket.validation.IMessageSource;
+import wicket.validation.IErrorMessageSource;
import wicket.validation.IValidatable;
import wicket.validation.IValidationError;
import wicket.validation.IValidator;
@@ -771,13 +771,13 @@
final Locale locale = e.getLocale();
if (locale != null)
{
- error.setVar("locale", locale);
+ error.setVariable("locale", locale);
}
- error.setVar("exception", e);
+ error.setVariable("exception", e);
Format format = e.getFormat();
if (format instanceof SimpleDateFormat)
{
- error.setVar("format",
((SimpleDateFormat)format).toLocalizedPattern());
+ error.setVariable("format",
((SimpleDateFormat)format).toLocalizedPattern());
}
error((IValidationError)error);
@@ -801,17 +801,17 @@
error.addMessageKey("TypeValidator");
- error.setVar("type", Classes.simpleName(type));
+ error.setVariable("type",
Classes.simpleName(type));
final Locale locale = e.getLocale();
if (locale != null)
{
- error.setVar("locale", locale);
+ error.setVariable("locale", locale);
}
- error.setVar("exception", e);
+ error.setVariable("exception", e);
Format format = e.getFormat();
if (format instanceof SimpleDateFormat)
{
- error.setVar("format",
((SimpleDateFormat)format).toLocalizedPattern());
+ error.setVariable("format",
((SimpleDateFormat)format).toLocalizedPattern());
}
error((IValidationError)error);
@@ -1145,16 +1145,16 @@
}
/**
- * [EMAIL PROTECTED] IMessageSource} used for error messags against
this form
+ * [EMAIL PROTECTED] IErrorMessageSource} used for error messags
against this form
* components.
*
* @author ivaynberg
*/
- private class MessageSource implements IMessageSource
+ private class MessageSource implements IErrorMessageSource
{
/**
- * @see
wicket.validation.IMessageSource#getMessage(java.lang.String)
+ * @see
wicket.validation.IErrorMessageSource#getMessage(java.lang.String)
*/
public String getMessage(String key)
{
@@ -1262,7 +1262,7 @@
/**
- * @see
wicket.validation.IMessageSource#substitute(java.lang.String,
+ * @see
wicket.validation.IErrorMessageSource#substitute(java.lang.String,
* java.util.Map)
*/
public String substitute(String string, Map vars) throws
IllegalStateException
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/validation/AbstractFormValidator.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/validation/AbstractFormValidator.java?view=diff&rev=522419&r1=522418&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/validation/AbstractFormValidator.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/validation/AbstractFormValidator.java
Sun Mar 25 22:08:03 2007
@@ -138,7 +138,7 @@
error.addMessageKey(defaultKey);
}
- error.setVars(vars);
+ error.setVariables(vars);
fc.error((IValidationError)error);
}
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IErrorMessageSource.java
(from r522400,
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IMessageSource.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IErrorMessageSource.java?view=diff&rev=522419&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IMessageSource.java&r1=522400&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IErrorMessageSource.java&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IMessageSource.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IErrorMessageSource.java
Sun Mar 25 22:08:03 2007
@@ -25,7 +25,7 @@
*
* @author ivaynberg
*/
-public interface IMessageSource
+public interface IErrorMessageSource
{
/**
* Retrieves a message with the given <code>key</code>.
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IValidationError.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IValidationError.java?view=diff&rev=522419&r1=522418&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IValidationError.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/IValidationError.java
Sun Mar 25 22:08:03 2007
@@ -29,5 +29,5 @@
* @param messageSource
* @return error message
*/
- String getErrorMessage(IMessageSource messageSource);
+ String getErrorMessage(IErrorMessageSource messageSource);
}
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/ValidationError.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/ValidationError.java?view=diff&rev=522419&r1=522418&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/ValidationError.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/ValidationError.java
Sun Mar 25 22:08:03 2007
@@ -26,13 +26,13 @@
/**
* A versatile implementation of [EMAIL PROTECTED] IValidationError} that
supports message
- * resolution from [EMAIL PROTECTED] IMessageSource}, default message (if none
of the keys
+ * resolution from [EMAIL PROTECTED] IErrorMessageSource}, default message (if
none of the keys
* matched), and variable substitution.
*
* The final error message is constructed via the following process:
* <ol>
* <li>Try all keys added by calls to [EMAIL PROTECTED]
#addMessageKey(String)} via
- * provided [EMAIL PROTECTED] IMessageSource}</li>
+ * provided [EMAIL PROTECTED] IErrorMessageSource}</li>
* <li>If none of the keys yielded a message, use the message set by
* [EMAIL PROTECTED] #setMessage(String)} if any</li>
* <li>Perform variable subsitution on the message if any</li>
@@ -45,7 +45,7 @@
private static final long serialVersionUID = 1L;
// XXX 2.0: optimization - keys can be null by default until a key is
added
- /** List of message keys to try against the [EMAIL PROTECTED]
IMessageSource} */
+ /** List of message keys to try against the [EMAIL PROTECTED]
IErrorMessageSource} */
private List keys = new ArrayList(1);
/** Variable map to use in variable substitution */
@@ -64,7 +64,7 @@
/**
* Adds a key to the list of keys that will be tried against
- * [EMAIL PROTECTED] IMessageSource} to locate the error message string
+ * [EMAIL PROTECTED] IErrorMessageSource} to locate the error message
string
*
* @param key
* @return this for chaining
@@ -88,7 +88,7 @@
* variable value
* @return this for chaining
*/
- public ValidationError setVar(String name, Object value)
+ public ValidationError setVariable(String name, Object value)
{
if (name == null || name.trim().length() == 0)
{
@@ -101,7 +101,7 @@
"Argument [[value]] cannot be null or
an empty string");
}
- getVars().put(name, value);
+ getVariables().put(name, value);
return this;
}
@@ -112,7 +112,7 @@
*
* @return map of variables for this error
*/
- public final Map getVars()
+ public final Map getVariables()
{
if (vars == null)
{
@@ -128,7 +128,7 @@
* variable map
* @return this for chaining
*/
- public final ValidationError setVars(Map vars)
+ public final ValidationError setVariables(Map vars)
{
if (vars == null)
{
@@ -139,9 +139,9 @@
}
/**
- * @see
wicket.validation.IValidationError#getErrorMessage(wicket.validation.IMessageSource)
+ * @see
wicket.validation.IValidationError#getErrorMessage(wicket.validation.IErrorMessageSource)
*/
- public final String getErrorMessage(IMessageSource messageSource)
+ public final String getErrorMessage(IErrorMessageSource messageSource)
{
String errorMessage = null;
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/AbstractValidator.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/AbstractValidator.java?view=diff&rev=522419&r1=522418&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/AbstractValidator.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/AbstractValidator.java
Sun Mar 25 22:08:03 2007
@@ -170,7 +170,7 @@
error.addMessageKey(defaultKey);
}
- error.setVars(vars);
+ error.setVariables(vars);
validatable.error(error);
}
Copied:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressValidator.java
(from r522400,
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressValidator.java?view=diff&rev=522419&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java&r1=522400&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressValidator.java&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/validation/validator/EmailAddressValidator.java
Sun Mar 25 22:08:03 2007
@@ -25,17 +25,17 @@
* @author Jonathan Locke
* @author Martijn Dashorst
*/
-public class EmailAddressPatternValidator extends PatternValidator
+public class EmailAddressValidator extends PatternValidator
{
private static final long serialVersionUID = 1L;
/** Singleton instance */
- private static final EmailAddressPatternValidator INSTANCE = new
EmailAddressPatternValidator();
+ private static final EmailAddressValidator INSTANCE = new
EmailAddressValidator();
/**
* @return Instance of emailadress validator
*/
- public static EmailAddressPatternValidator getInstance()
+ public static EmailAddressValidator getInstance()
{
return INSTANCE;
}
@@ -44,7 +44,7 @@
* Protected constructor to force use of static singleton accessor
method.
* Or override it to implement resourceKey(Component)
*/
- protected EmailAddressPatternValidator()
+ protected EmailAddressValidator()
{
super("^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)[EMAIL
PROTECTED](\\.[A-Za-z0-9-]+)*((\\.[A-Za-z]{2,}){1}$)",
Pattern.CASE_INSENSITIVE);
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/util/tester/apps_4/EmailPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/util/tester/apps_4/EmailPage.java?view=diff&rev=522419&r1=522418&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/util/tester/apps_4/EmailPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/util/tester/apps_4/EmailPage.java
Sun Mar 25 22:08:03 2007
@@ -20,7 +20,7 @@
import wicket.markup.html.form.Form;
import wicket.markup.html.form.TextField;
import wicket.model.CompoundPropertyModel;
-import wicket.validation.validator.EmailAddressPatternValidator;
+import wicket.validation.validator.EmailAddressValidator;
/**
* @author Juergen Donnerstag
@@ -42,7 +42,7 @@
add(form);
TextField email = new TextField("email");
- email.add(EmailAddressPatternValidator.getInstance());
+ email.add(EmailAddressValidator.getInstance());
form.add(email);
}
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java?view=diff&rev=522419&r1=522418&r2=522419
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java
Sun Mar 25 22:08:03 2007
@@ -46,7 +46,7 @@
*/
public void testValidEmails()
{
- EmailAddressPatternValidator test = new
EmailAddressPatternValidator();
+ EmailAddressValidator test = new EmailAddressValidator();
String[] emails = new String[] { "[EMAIL PROTECTED]", "[EMAIL
PROTECTED]",
"[EMAIL PROTECTED]", "[EMAIL PROTECTED]",
"[EMAIL PROTECTED]" };
for (int i = 0; i < emails.length; i++)
@@ -61,7 +61,7 @@
*/
public void testInvalidEmails()
{
- EmailAddressPatternValidator test = new
EmailAddressPatternValidator();
+ EmailAddressValidator test = new EmailAddressValidator();
String[] emails = new String[] { "[EMAIL PROTECTED]", "[EMAIL
PROTECTED]", "[EMAIL PROTECTED]",
"[EMAIL PROTECTED]" };
for (int i = 0; i < emails.length; i++)
