From e9f454c4e3831e381e73317edc2af14739bd87a5 Mon Sep 17 00:00:00 2001
From: Felix Rabe <felix.rabe@magnolia-cms.com>
Date: Thu, 19 May 2011 13:25:10 +0200
Subject: [PATCH] MGNLFORM-79 Change r45141 according to my issue comment to keep API compatible

---
 .../paragraphs/models/DefaultFormDataBinder.java   |    2 +-
 .../module/form/validators/NoHTMLValidator.java    |    4 ++--
 .../module/form/validators/PasswordValidator.java  |    4 ++--
 .../module/form/validators/ValidateExpression.java |    9 ++++-----
 .../magnolia/module/form/validators/Validator.java |    8 ++++++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/java/info/magnolia/module/form/paragraphs/models/DefaultFormDataBinder.java b/src/main/java/info/magnolia/module/form/paragraphs/models/DefaultFormDataBinder.java
index f03052b..c217b83 100644
--- a/src/main/java/info/magnolia/module/form/paragraphs/models/DefaultFormDataBinder.java
+++ b/src/main/java/info/magnolia/module/form/paragraphs/models/DefaultFormDataBinder.java
@@ -115,7 +115,7 @@ public class DefaultFormDataBinder implements FormDataBinder {
                     String validatorName = node.getNodeData("validation").getString();
                     Validator validator = FormModule.getInstance().getValidatorByName(validatorName);
                     if (validator != null) {
-                        ValidationResult validationResult = validator.validate(value);
+                        ValidationResult validationResult = validator.validateWithResult(value);
                         if (!validationResult.isSuccess()) {
                             field.setErrorMessage(getValidatorErrorMessage(validator, validationResult, node));
                         }
diff --git a/src/main/java/info/magnolia/module/form/validators/NoHTMLValidator.java b/src/main/java/info/magnolia/module/form/validators/NoHTMLValidator.java
index e269dfe..bc17831 100644
--- a/src/main/java/info/magnolia/module/form/validators/NoHTMLValidator.java
+++ b/src/main/java/info/magnolia/module/form/validators/NoHTMLValidator.java
@@ -42,7 +42,7 @@ import org.apache.commons.lang.StringUtils;
  */
 public class NoHTMLValidator extends Validator {
 
-    public ValidationResult validate(String value) {
-        return ValidationResult.valueOf(!StringUtils.containsAny(value, "<>&"));
+    public boolean validate(String value) {
+        return !StringUtils.containsAny(value, "<>&");
     }
 }
diff --git a/src/main/java/info/magnolia/module/form/validators/PasswordValidator.java b/src/main/java/info/magnolia/module/form/validators/PasswordValidator.java
index a76589e..6801816 100644
--- a/src/main/java/info/magnolia/module/form/validators/PasswordValidator.java
+++ b/src/main/java/info/magnolia/module/form/validators/PasswordValidator.java
@@ -44,8 +44,8 @@ import info.magnolia.context.MgnlContext;
  */
 public class PasswordValidator extends Validator {
 
-    public ValidationResult validate(String password) {
+    public boolean validate(String password) {
         String confirmation = MgnlContext.getParameter("passwordConfirmation");
-        return ValidationResult.valueOf(StringUtils.equals(password, confirmation));
+        return StringUtils.equals(password, confirmation);
     }
 }
diff --git a/src/main/java/info/magnolia/module/form/validators/ValidateExpression.java b/src/main/java/info/magnolia/module/form/validators/ValidateExpression.java
index aaaa49a..86d556f 100644
--- a/src/main/java/info/magnolia/module/form/validators/ValidateExpression.java
+++ b/src/main/java/info/magnolia/module/form/validators/ValidateExpression.java
@@ -45,13 +45,12 @@ public class ValidateExpression extends NoHTMLValidator {
 
     public String expression;
 
-    public ValidationResult validate(String value) {
-        ValidationResult superResult = super.validate(value);
-        if (!superResult.isSuccess())
-            return superResult;
+    public boolean validate(String value) {
+        if (!super.validate(value))
+            return false;
         Pattern pattern = Pattern.compile(getExpression());
         Matcher matcher = pattern.matcher(value);
-        return ValidationResult.valueOf(matcher.matches());
+        return matcher.matches();
     }
 
     public String getExpression() {
diff --git a/src/main/java/info/magnolia/module/form/validators/Validator.java b/src/main/java/info/magnolia/module/form/validators/Validator.java
index 0b2ffc9..ae30381 100644
--- a/src/main/java/info/magnolia/module/form/validators/Validator.java
+++ b/src/main/java/info/magnolia/module/form/validators/Validator.java
@@ -45,8 +45,12 @@ public class Validator {
     private String name;
     private String i18nBasename;
 
-    public ValidationResult validate(String value) {
-        return new ValidationResult(true);
+    public boolean validate(String value) {
+        return true;
+    }
+
+    public ValidationResult validateWithResult(String value) {
+        return new ValidationResult(validate(value));
     }
 
     public String getName() {
-- 
1.7.4