Author: ivaynberg
Date: Thu Apr 19 10:00:33 2007
New Revision: 530487
URL: http://svn.apache.org/viewvc?view=rev&rev=530487
Log:
WICKET-485 allow subclassing of common validators
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java?view=diff&rev=530487&r1=530486&r2=530487
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/NumberValidator.java
Thu Apr 19 10:00:33 2007
@@ -202,13 +202,22 @@
return new DoubleMaximumValidator(maximum);
}
- private static class RangeValidator extends NumberValidator
+ /**
+ * Validator to check the number is within the specified range
+ */
+ public static class RangeValidator extends NumberValidator
{
private static final long serialVersionUID = 1L;
private final long minimum;
private final long maximum;
- private RangeValidator(long minimum, long maximum)
+ /**
+ * Construct.
+ *
+ * @param minimum
+ * @param maximum
+ */
+ public RangeValidator(long minimum, long maximum)
{
this.minimum = minimum;
this.maximum = maximum;
@@ -242,12 +251,20 @@
}
- private static class MinimumValidator extends NumberValidator
+ /**
+ * Validator to check the number meets the minimum requirement
+ */
+ public static class MinimumValidator extends NumberValidator
{
private static final long serialVersionUID = 1L;
private final long minimum;
- private MinimumValidator(long minimum)
+ /**
+ * Construct.
+ *
+ * @param minimum
+ */
+ public MinimumValidator(long minimum)
{
this.minimum = minimum;
}
@@ -278,12 +295,15 @@
}
- private static class MaximumValidator extends NumberValidator
+ /**
+ * Validator to check the number meets the maximum requirement
+ */
+ public static class MaximumValidator extends NumberValidator
{
private static final long serialVersionUID = 1L;
private final long maximum;
- private MaximumValidator(long maximum)
+ public MaximumValidator(long maximum)
{
this.maximum = maximum;
}
@@ -312,13 +332,22 @@
}
}
- private static class DoubleRangeValidator extends NumberValidator
+ /**
+ * Validator to check the double is within the specified range
+ */
+ public static class DoubleRangeValidator extends NumberValidator
{
private static final long serialVersionUID = 1L;
private final double minimum;
private final double maximum;
- private DoubleRangeValidator(double minimum, double maximum)
+ /**
+ * Construct.
+ *
+ * @param minimum
+ * @param maximum
+ */
+ public DoubleRangeValidator(double minimum, double maximum)
{
this.minimum = minimum;
this.maximum = maximum;
@@ -349,12 +378,19 @@
}
- private static class DoubleMinimumValidator extends NumberValidator
+ /**
+ * Validator to check the double meets the minimum requirement
+ */
+ public static class DoubleMinimumValidator extends NumberValidator
{
private static final long serialVersionUID = 1L;
private final double minimum;
- private DoubleMinimumValidator(double minimum)
+ /**
+ * Construct.
+ * @param minimum
+ */
+ public DoubleMinimumValidator(double minimum)
{
this.minimum = minimum;
}
@@ -384,12 +420,19 @@
}
- private static class DoubleMaximumValidator extends NumberValidator
+ /**
+ * Validator to check the double meets a maximum requirement
+ */
+ public static class DoubleMaximumValidator extends NumberValidator
{
private static final long serialVersionUID = 1L;
private final double maximum;
- private DoubleMaximumValidator(double maximum)
+ /**
+ * Construct.
+ * @param maximum
+ */
+ public DoubleMaximumValidator(double maximum)
{
this.maximum = maximum;
}
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java?view=diff&rev=530487&r1=530486&r2=530487
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
Thu Apr 19 10:00:33 2007
@@ -22,11 +22,9 @@
/**
- * FIXME 2.0: ivaynberg: look over javadoc
- *
- * A validator for strings that can be used for subclassing or use one of the
- * static factory methods to get the default string validators as range,
maximum
- * or minimum.
+ * Validator for dealing with string lengths. Usually this validator is used
+ * through the static factory methods, but it and its inner classes can also be
+ * subclassed directly.
*
* @author Jonathan Locke
* @author Johan Compagner
@@ -142,19 +140,31 @@
return new ExactLengthValidator(length);
}
- private static class LengthBetweenValidator extends StringValidator
+ /**
+ * Validator to check if the length of the string is within some range
+ */
+ public static class LengthBetweenValidator extends StringValidator
{
private static final long serialVersionUID = 1L;
private final int minimum;
private final int maximum;
- private LengthBetweenValidator(int minimum, int maximum)
+ /**
+ * Construct.
+ *
+ * @param minimum
+ * @param maximum
+ */
+ public LengthBetweenValidator(int minimum, int maximum)
{
this.minimum = minimum;
this.maximum = maximum;
}
+ /**
+ * @see
org.apache.wicket.validation.validator.AbstractValidator#variablesMap(org.apache.wicket.validation.IValidatable)
+ */
protected Map variablesMap(IValidatable validatable)
{
final Map map = super.variablesMap(validatable);
@@ -184,16 +194,28 @@
}
- private static class MinimumLengthValidator extends StringValidator
+ /**
+ * Validator to check if the length of the string meets a minumum
+ * requirement
+ */
+ public static class MinimumLengthValidator extends StringValidator
{
private static final long serialVersionUID = 1L;
private final int minimum;
- private MinimumLengthValidator(int minimum)
+ /**
+ * Construct.
+ *
+ * @param minimum
+ */
+ public MinimumLengthValidator(int minimum)
{
this.minimum = minimum;
}
+ /**
+ * @see
org.apache.wicket.validation.validator.AbstractValidator#variablesMap(org.apache.wicket.validation.IValidatable)
+ */
protected Map variablesMap(IValidatable validatable)
{
final Map map = super.variablesMap(validatable);
@@ -220,12 +242,21 @@
}
- private static class ExactLengthValidator extends StringValidator
+ /**
+ * Validator to check if the length of the string is exactly the
specified
+ * length
+ */
+ public static class ExactLengthValidator extends StringValidator
{
private static final long serialVersionUID = 1L;
private final int length;
- private ExactLengthValidator(int length)
+ /**
+ * Construct.
+ *
+ * @param length
+ */
+ public ExactLengthValidator(int length)
{
this.length = length;
}
@@ -256,7 +287,11 @@
}
- private static class MaximumLengthValidator extends StringValidator
+ /**
+ * Validator to check if the length of the string meets a maximum
+ * requirement
+ */
+ public static class MaximumLengthValidator extends StringValidator
{
private static final long serialVersionUID = 1L;
private final int maximum;
@@ -266,6 +301,9 @@
this.maximum = maximum;
}
+ /**
+ * @see
org.apache.wicket.validation.validator.AbstractValidator#variablesMap(org.apache.wicket.validation.IValidatable)
+ */
protected Map variablesMap(IValidatable validatable)
{
final Map map = super.variablesMap(validatable);
