svn commit: r1723665 - /sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java

[kwin]

Author: kwin
Date: Fri Jan  8 09:03:40 2016
New Revision: 1723665

URL: http://svn.apache.org/viewvc?rev=1723665&view=rev
Log:
SLING-4213 - adjust to localized validation failures

Modified:
    
sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java

Modified: 
sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java?rev=1723665&r1=1723664&r2=1723665&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
 (original)
+++ 
sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/InvalidResourceException.java
 Fri Jan  8 09:03:40 2016
@@ -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 ex
         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();
     }