Author: jkuhnert
Date: Sun Mar 4 11:12:44 2007
New Revision: 514459
URL: http://svn.apache.org/viewvc?view=rev&rev=514459
Log:
Resolves TAPESTRY-697. Add getters for basic configuration properties for
standard validators so that more intelligent
validation error messages can optionally be displayed to users.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Pattern.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/EnhancementOperationImpl.java
Sun Mar 4 11:12:44 2007
@@ -379,8 +379,7 @@
return EnhanceUtils.createAccessorMethodName(propertyName);
}
- public void addMethod(int modifier, MethodSignature sig, String methodBody,
- Location location)
+ public void addMethod(int modifier, MethodSignature sig, String
methodBody, Location location)
{
Defense.notNull(sig, "sig");
Defense.notNull(methodBody, "methodBody");
@@ -531,8 +530,7 @@
return "$" + baseName.substring(dotx + 1) + "_" + _uid++;
}
- public void extendMethodImplementation(Class interfaceClass,
- MethodSignature methodSignature, String code)
+ public void extendMethodImplementation(Class interfaceClass,
MethodSignature methodSignature, String code)
{
addInterfaceIfNeeded(interfaceClass);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java
Sun Mar 4 11:12:44 2007
@@ -53,8 +53,7 @@
* thier mutator.
*/
- public void performEnhancement(EnhancementOperation op,
- IComponentSpecification spec)
+ public void performEnhancement(EnhancementOperation op,
IComponentSpecification spec)
{
Iterator i = spec.getPropertySpecificationNames().iterator();
@@ -62,7 +61,7 @@
{
String name = (String) i.next();
IPropertySpecification ps = spec.getPropertySpecification(name);
-
+
try
{
performEnhancement(op, ps);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/AbstractTranslator.java
Sun Mar 4 11:12:44 2007
@@ -78,8 +78,8 @@
protected abstract String formatObject(IFormComponent field, Locale
locale, Object object);
- protected abstract Object parseText(IFormComponent field,
ValidationMessages messages,
- String text) throws ValidatorException;
+ protected abstract Object parseText(IFormComponent field,
ValidationMessages messages, String text)
+ throws ValidatorException;
/**
* The value to be used when the value supplied in the request is blank
(null or empty). The
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
Sun Mar 4 11:12:44 2007
@@ -159,4 +159,8 @@
_omitZero = omitZero;
}
+ public boolean isOmitZero()
+ {
+ return _omitZero;
+ }
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/StringTranslator.java
Sun Mar 4 11:12:44 2007
@@ -71,4 +71,8 @@
_empty = empty;
}
+ public String getEmpty()
+ {
+ return _empty;
+ }
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Email.java
Sun Mar 4 11:12:44 2007
@@ -36,7 +36,7 @@
*/
public class Email extends BaseValidator
{
- static final String PATTERN = "^[A-Za-z0-9]+([-_\\.]*[A-Za-z0-9]+)[EMAIL
PROTECTED]([-_\\.]*[A-Za-z0-9]+)*(\\.[_A-Za-z]{2,6})$";
+ public static final String PATTERN =
"^[A-Za-z0-9]+([-_\\.]*[A-Za-z0-9]+)[EMAIL
PROTECTED]([-_\\.]*[A-Za-z0-9]+)*(\\.[_A-Za-z]{2,6})$";
// TODO: Possible thread safety issue if the validator
// is shared across threads, because the matcher
@@ -52,7 +52,7 @@
{
super(initializer);
}
-
+
public void validate(IFormComponent field, ValidationMessages messages,
Object object)
throws ValidatorException
{
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Max.java
Sun Mar 4 11:12:44 2007
@@ -47,7 +47,7 @@
{
super(initializer);
}
-
+
/**
* Does comparison based on the [EMAIL PROTECTED] Number#doubleValue()}.
*/
@@ -108,4 +108,8 @@
_max = max;
}
+ public double getMax()
+ {
+ return _max;
+ }
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxDate.java
Sun Mar 4 11:12:44 2007
@@ -110,4 +110,8 @@
_maxDate = minDate;
}
+ public Date getMaxDate()
+ {
+ return _maxDate;
+ }
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MaxLength.java
Sun Mar 4 11:12:44 2007
@@ -51,6 +51,11 @@
_maxLength = maxLength;
}
+ public int getMaxLength()
+ {
+ return _maxLength;
+ }
+
public void validate(IFormComponent field, ValidationMessages messages,
Object object)
throws ValidatorException
{
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Min.java
Sun Mar 4 11:12:44 2007
@@ -108,4 +108,8 @@
_min = min;
}
+ public double getMin()
+ {
+ return _min;
+ }
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/MinDate.java
Sun Mar 4 11:12:44 2007
@@ -54,6 +54,11 @@
_minDate = minDate;
}
+ public Date getMinDate()
+ {
+ return _minDate;
+ }
+
public void validate(IFormComponent field, ValidationMessages messages,
Object object)
throws ValidatorException
{
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Pattern.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Pattern.java?view=diff&rev=514459&r1=514458&r2=514459
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Pattern.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/validator/Pattern.java
Sun Mar 4 11:12:44 2007
@@ -96,4 +96,8 @@
_pattern = pattern;
}
+ public String getPattern()
+ {
+ return _pattern;
+ }
}
