You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/09/29 10:40:38 UTC
[2/2] git commit: WICKET-5710 StringValidator should set 'minlength'
attribute to input and textarea
WICKET-5710 StringValidator should set 'minlength' attribute to input and textarea
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b0fc628f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b0fc628f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b0fc628f
Branch: refs/heads/master
Commit: b0fc628f132158aa46751506d9f281199abf8143
Parents: 55c1bc7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 29 10:40:21 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 29 10:40:21 2014 +0200
----------------------------------------------------------------------
.../validation/validator/StringValidator.java | 22 +++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b0fc628f/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java b/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
index 5f7dd6d..7aadb35 100644
--- a/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/validation/validator/StringValidator.java
@@ -105,12 +105,28 @@ public class StringValidator extends AbstractRangeValidator<Integer, String>
public void onComponentTag(Component component, ComponentTag tag)
{
super.onComponentTag(component, tag);
- if (getMaximum() != null && "input".equalsIgnoreCase(tag.getName().toLowerCase(Locale.ENGLISH)))
+
+ String tagName = tag.getName().toLowerCase(Locale.ENGLISH);
+ boolean hasLengthAttribute = hasLengthAttribute(tagName);
+
+ Integer maximum = getMaximum();
+ if (maximum != null && hasLengthAttribute)
+ {
+ tag.put("maxlength", maximum);
+ }
+
+ Integer minimum = getMinimum();
+ if (minimum != null && hasLengthAttribute)
{
- tag.put("maxlength", getMaximum());
+ tag.put("minlength", minimum);
}
}
+ private boolean hasLengthAttribute(String tagName)
+ {
+ return "input".equalsIgnoreCase(tagName) || "textarea".equalsIgnoreCase(tagName);
+ }
+
/**
* @param length
* @return a {@link StringValidator} that generates an error if a string is not of an exact
@@ -152,4 +168,4 @@ public class StringValidator extends AbstractRangeValidator<Integer, String>
return new StringValidator(minimum, maximum);
}
-}
\ No newline at end of file
+}