You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/01/13 18:46:29 UTC
svn commit: r734195 - in
/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation:
./ validators/
Author: simoneg
Date: Tue Jan 13 09:46:15 2009
New Revision: 734195
URL: http://svn.apache.org/viewvc?rev=734195&view=rev
Log:
LABS-211 : char length as a validator property, taken and used from all validators
Modified:
labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java
labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/Validator.java
labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java
labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java
labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java
labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java
labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java
Modified: labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java?rev=734195&r1=734194&r2=734195&view=diff
==============================================================================
--- labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java (original)
+++ labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java Tue Jan 13 09:46:15 2009
@@ -80,20 +80,11 @@
public int maxCharacterLength() {
int size = -1;
- LengthValidator len = rawGetValidator(LengthValidator.class);
- if (len != null) {
- if (len.getMax() != len.getDefaultMax() && len.getMax() > size) {
- size = len.getMax();
- }
- }
-
- RangeValidator range = rawGetValidator(RangeValidator.class);
- if (range != null) {
- Number max = range.getMax();
- if (max != null) {
- String maxstr = max.toString();
- if (maxstr.length() > size) {
- size = maxstr.length();
+ for (Validator<?> val : this.validators) {
+ int length = val.maxCharacterLength();
+ if (length != -1) {
+ if (length > size) {
+ size = length;
}
}
}
Modified: labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/Validator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/Validator.java?rev=734195&r1=734194&r2=734195&view=diff
==============================================================================
--- labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/Validator.java (original)
+++ labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/Validator.java Tue Jan 13 09:46:15 2009
@@ -25,4 +25,6 @@
public List<LocalizableString> validate(Object bean, PropertyInfo property, T value);
+ public int maxCharacterLength();
+
}
Modified: labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java?rev=734195&r1=734194&r2=734195&view=diff
==============================================================================
--- labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java (original)
+++ labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java Tue Jan 13 09:46:15 2009
@@ -88,4 +88,8 @@
return Integer.MAX_VALUE;
}
+ public int maxCharacterLength() {
+ return max == Integer.MAX_VALUE ? -1 : max;
+ }
+
}
Modified: labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java?rev=734195&r1=734194&r2=734195&view=diff
==============================================================================
--- labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java (original)
+++ labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java Tue Jan 13 09:46:15 2009
@@ -113,4 +113,27 @@
return max;
}
+ public int maxCharacterLength() {
+ int size = -1;
+ {
+ Number max = getMax();
+ if (max != null) {
+ String maxstr = max.toString();
+ if (maxstr.length() > size) {
+ size = maxstr.length();
+ }
+ }
+ }
+ {
+ Number max = getMin();
+ if (max != null) {
+ String maxstr = max.toString();
+ if (maxstr.length() > size) {
+ size = maxstr.length();
+ }
+ }
+ }
+ return size;
+ }
+
}
Modified: labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java?rev=734195&r1=734194&r2=734195&view=diff
==============================================================================
--- labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java (original)
+++ labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java Tue Jan 13 09:46:15 2009
@@ -33,4 +33,8 @@
this.value = value;
}
+ public int maxCharacterLength() {
+ return -1;
+ }
+
}
Modified: labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java?rev=734195&r1=734194&r2=734195&view=diff
==============================================================================
--- labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java (original)
+++ labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java Tue Jan 13 09:46:15 2009
@@ -41,4 +41,8 @@
return null;
}
+ public int maxCharacterLength() {
+ return -1;
+ }
+
}
Modified: labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java?rev=734195&r1=734194&r2=734195&view=diff
==============================================================================
--- labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java (original)
+++ labs/magma/trunk/foundation-validation/src/main/java/org/apache/magma/validation/validators/RichTextValidator.java Tue Jan 13 09:46:15 2009
@@ -174,4 +174,9 @@
this.permitJustify = permitJustify;
}
+
+ public int maxCharacterLength() {
+ return -1;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org