svn commit: r1642643 - /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java

[ti...@apache.org]

Author: tilman
Date: Mon Dec  1 08:17:43 2014
New Revision: 1642643

URL: http://svn.apache.org/r1642643
Log:
PDFBOX-2513: replace exception with error, as suggested by Maruan Sahyoun and Ralf Hauser

Modified:
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java?rev=1642643&r1=1642642&r2=1642643&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java Mon Dec  1 08:17:43 2014
@@ -26,8 +26,6 @@ import static org.apache.pdfbox.prefligh
 import static org.apache.pdfbox.preflight.PreflightConfiguration.GRAPHIC_PROCESS;
 import static org.apache.pdfbox.preflight.PreflightConfiguration.SHADDING_PATTERN_PROCESS;
 import static org.apache.pdfbox.preflight.PreflightConfiguration.TILING_PATTERN_PROCESS;
-import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_INVALID_PATTERN_DEFINITION;
-import static org.apache.pdfbox.preflight.PreflightConstants.TRANPARENCY_DICTIONARY_KEY_EXTGSTATE;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -47,6 +45,9 @@ import org.apache.pdfbox.pdmodel.graphic
 import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.preflight.PreflightConstants;
+import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_INVALID_PATTERN_DEFINITION;
+import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_GRAPHIC_MAIN;
+import static org.apache.pdfbox.preflight.PreflightConstants.TRANPARENCY_DICTIONARY_KEY_EXTGSTATE;
 import org.apache.pdfbox.preflight.PreflightContext;
 import org.apache.pdfbox.preflight.PreflightPath;
 import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
@@ -279,9 +280,11 @@ public class ResourcesValidationProcess 
                 COSBase xobj = entry.getValue();
                 if (xobj != null && COSUtils.isStream(xobj, cosDocument))
                 {
+                    String subtype = "unknown";                    
                     try
                     {
                         COSStream stream = COSUtils.getAsStream(xobj, cosDocument);
+                        subtype = stream.getNameAsString(COSName.SUBTYPE);
                         PDXObject pdXObject = PDXObject.createXObject(stream, entry.getKey().getName(), resources);
                         if (pdXObject != null)
                         {
@@ -294,7 +297,9 @@ public class ResourcesValidationProcess 
                     }
                     catch (IOException e)
                     {
-                        throw new ValidationException(e.getMessage(), e, context.getCurrentPageNumber());
+                        context.addValidationError(new ValidationError(ERROR_GRAPHIC_MAIN,
+                                e.getMessage() + " for " + subtype + " entry '"
+                                + entry.getKey().getName() + "'", e));
                     }
                 }
             }