Author: ivaynberg
Date: Wed Nov 16 23:07:31 2011
New Revision: 1202924
URL: http://svn.apache.org/viewvc?rev=1202924&view=rev
Log:
rename validationerror.addMessageKey to just validationerror.addKey. deprecate
the original.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Wed Nov 16 23:07:31 2011
@@ -1134,13 +1134,13 @@ public abstract class FormComponent<T> e
ValidationError error = new ValidationError();
if (e.getResourceKey() != null)
{
- error.addMessageKey(e.getResourceKey());
+ error.addKey(e.getResourceKey());
}
if (e.getTargetType() != null)
{
- error.addMessageKey("ConversionError."
+ e.getTargetType().getSimpleName());
+ error.addKey("ConversionError." +
e.getTargetType().getSimpleName());
}
- error.addMessageKey("ConversionError");
+ error.addKey("ConversionError");
reportValidationError(e, error);
}
}
@@ -1157,11 +1157,11 @@ public abstract class FormComponent<T> e
ValidationError error = new ValidationError();
if (e.getResourceKey() != null)
{
- error.addMessageKey(e.getResourceKey());
+ error.addKey(e.getResourceKey());
}
String simpleName = getType().getSimpleName();
- error.addMessageKey("IConverter." + simpleName);
- error.addMessageKey("IConverter");
+ error.addKey("IConverter." + simpleName);
+ error.addKey("IConverter");
error.setVariable("type", simpleName);
reportValidationError(e, error);
}
@@ -1405,7 +1405,7 @@ public abstract class FormComponent<T> e
*/
private void reportRequiredError()
{
- error(new ValidationError().addMessageKey("Required"));
+ error(new ValidationError().addKey("Required"));
}
/**
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/validation/AbstractFormValidator.java
Wed Nov 16 23:07:31 2011
@@ -108,11 +108,11 @@ public abstract class AbstractFormValida
}
- ValidationError error = new
ValidationError().addMessageKey(resourceKey);
+ ValidationError error = new
ValidationError().addKey(resourceKey);
final String defaultKey = getClass().getSimpleName();
if (!resourceKey.equals(defaultKey))
{
- error.addMessageKey(defaultKey);
+ error.addKey(defaultKey);
}
error.setVariables(vars);
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/ValidationError.java
Wed Nov 16 23:07:31 2011
@@ -136,7 +136,7 @@ public class ValidationError implements
String key = validator.getClass().getSimpleName();
if (!Strings.isEmpty(variation))
{
- key = key + "." + variation;
+ key = key + "." + variation.trim();
}
addKey(key);
return this;
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
Wed Nov 16 23:07:31 2011
@@ -77,7 +77,6 @@ public abstract class AbstractValidator<
/**
* @see IValidator#validate(IValidatable)
*/
- @Override
public final void validate(IValidatable<T> validatable)
{
if (validatable.getValue() != null || validateOnNullValue())
@@ -167,11 +166,11 @@ public abstract class AbstractValidator<
}
- ValidationError error = new
ValidationError().addMessageKey(resourceKey);
+ ValidationError error = new
ValidationError().addKey(resourceKey);
final String defaultKey = getClass().getSimpleName();
if (!resourceKey.equals(defaultKey))
{
- error.addMessageKey(defaultKey);
+ error.addKey(defaultKey);
}
error.setVariables(vars);
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MaximumValidator.java
Wed Nov 16 23:07:31 2011
@@ -58,7 +58,7 @@ public class MaximumValidator<Z extends
if (value.compareTo(maximum) > 0)
{
ValidationError error = new ValidationError();
- error.addMessageKey(resourceKey());
+ error.addKey(resourceKey());
error.setVariable("maximum", maximum);
validatable.error(error);
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/MinimumValidator.java
Wed Nov 16 23:07:31 2011
@@ -54,7 +54,7 @@ public class MinimumValidator<Z extends
if (value.compareTo(minimum) < 0)
{
ValidationError error = new ValidationError();
- error.addMessageKey(resourceKey());
+ error.addKey(resourceKey());
error.setVariable("minimum", minimum);
validatable.error(error);
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/validation/validator/RangeValidator.java
Wed Nov 16 23:07:31 2011
@@ -80,7 +80,7 @@ public class RangeValidator<Z extends Co
if ((min != null && value.compareTo(min) < 0) || (max != null
&& value.compareTo(max) > 0))
{
ValidationError error = new ValidationError();
- error.addMessageKey(resourceKey());
+ error.addKey(resourceKey());
error.setVariable("minimum", min);
error.setVariable("maximum", max);
validatable.error(error);
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
Wed Nov 16 23:07:31 2011
@@ -149,12 +149,12 @@ public class FileUploadFieldTest extends
{
if (validatable.getValue() instanceof List == false)
{
- validatable.error(new
ValidationError().addMessageKey("validatable value type not expected"));
+ validatable.error(new
ValidationError().addKey("validatable value type not expected"));
}
FileUpload upload = validatable.getValue().get(0);
if
(!upload.getClientFileName().contains(TEST_FILE_NAME))
{
- validatable.error(new
ValidationError().addMessageKey("uploaded file name not expected"));
+ validatable.error(new
ValidationError().addKey("uploaded file name not expected"));
}
File tmpFile = null;
try
@@ -162,7 +162,7 @@ public class FileUploadFieldTest extends
tmpFile = writeTestFile(1);
if (!new String(read(tmpFile)).equals(new
String(upload.getBytes())))
{
- validatable.error(new
ValidationError().addMessageKey("uploaded content not expected"));
+ validatable.error(new
ValidationError().addKey("uploaded content not expected"));
}
}
catch (IOException e)
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java?rev=1202924&r1=1202923&r2=1202924&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
Wed Nov 16 23:07:31 2011
@@ -148,7 +148,7 @@ public class NewUserWizard extends Wizar
{
if
("".equals(rolesSetNameField.getInput()))
{
-
rolesSetNameField.error(new
ValidationError().addMessageKey("error.noSetNameForRoles"));
+
rolesSetNameField.error(new
ValidationError().addKey("error.noSetNameForRoles"));
}
}
}
