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/17 03:46:43 UTC
svn commit: r735210 - in
/labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation:
CompoundValidator.java validators/RangeValidator.java
Author: simoneg
Date: Fri Jan 16 18:46:43 2009
New Revision: 735210
URL: http://svn.apache.org/viewvc?rev=735210&view=rev
Log:
Merging from trunk-r735208 : fixes for validator lengths
Modified:
labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java
labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java
Modified: labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java?rev=735210&r1=735209&r2=735210&view=diff
==============================================================================
--- labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java (original)
+++ labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/CompoundValidator.java Fri Jan 16 18:46:43 2009
@@ -83,7 +83,9 @@
for (Validator<?> val : this.validators) {
int length = val.maxCharacterLength();
if (length != -1) {
- if (length > size) {
+ if (size == -1) {
+ size = length;
+ } else if (length < size) {
size = length;
}
}
Modified: labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java?rev=735210&r1=735209&r2=735210&view=diff
==============================================================================
--- labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java (original)
+++ labs/magma/branches/0.0.1/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java Fri Jan 16 18:46:43 2009
@@ -47,21 +47,25 @@
}
public void setMin(long min) {
+ if (min == Long.MIN_VALUE) return;
this.min = min;
setupError();
}
public void setMax(long max) {
+ if (max == Long.MAX_VALUE) return;
this.max = max;
setupError();
}
public void setMin(double min) {
+ if (min == Double.MIN_VALUE) return;
this.min = min;
setupError();
}
public void setMax(double max) {
+ if (max == Double.MAX_VALUE) return;
this.max = max;
setupError();
}
@@ -82,6 +86,7 @@
public List<LocalizableString> validate(Object bean, PropertyInfo property, Number value) {
if (value == null) return null;
+ if (myError == null) setupError();
if (min != null) {
if (typeSafeCompare(value, min) < 0) return myError;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org