This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-validation-impl.git

commit 7222f85a398d76b430aa7c0cd50861c168bf69f2
Author: Konrad Windszus <[email protected]>
AuthorDate: Fri Jan 8 09:03:40 2016 +0000

    SLING-4213 - adjust to localized validation failures
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1723665 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../models/validation/InvalidResourceException.java      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
 
b/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
index f589df9..352d0f4 100644
--- 
a/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
+++ 
b/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
@@ -16,12 +16,16 @@
  */
 package org.apache.sling.models.validation;
 
+import java.util.ResourceBundle;
+
+import javax.annotation.Nonnull;
+
 import org.apache.sling.models.factory.InvalidModelException;
 import org.apache.sling.validation.ValidationFailure;
 import org.apache.sling.validation.ValidationResult;
 
 /**
- * Exception embedding a ValidationResult from Sling Validation.
+ * Exception embedding a {@link ValidationResult} from Sling Validation.
  *
  */
 public class InvalidResourceException extends InvalidModelException {
@@ -54,12 +58,16 @@ public class InvalidResourceException extends 
InvalidModelException {
         return path;
     }
 
-    @Override
-    public String getMessage() {
+    /**
+     * This is not the regular {@link Exception#getMessage()} as it requires 
an additional resourceBundle parameter to look up the localized message.
+     * @param resourceBundle
+     * @return the localized validation messages bound to the {@link 
ValidationResult} wrapped by this exception
+     */
+    public String getMessage(@Nonnull ResourceBundle resourceBundle) {
         StringBuilder builder = new StringBuilder("Validation errors for ");
         builder.append("'" + path +"':");
         for (ValidationFailure failure : result.getFailures()) {
-            builder.append("\n" + failure.getLocation() + ":" + 
failure.getMessage() + "\n\t");
+            builder.append("\n" + failure.getLocation() + ":" + 
failure.getMessage(resourceBundle) + "\n\t");
         }
         return builder.toString();
     }

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to