You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2015/06/05 18:21:05 UTC

svn commit: r1683792 - /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java

Author: lehmi
Date: Fri Jun  5 16:21:04 2015
New Revision: 1683792

URL: http://svn.apache.org/r1683792
Log:
PDFBOX-2576: use File instead of DataSource for PreflightParser

Modified:
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java?rev=1683792&r1=1683791&r2=1683792&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java Fri Jun  5 16:21:04 2015
@@ -29,7 +29,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.activation.DataSource;
 import javax.activation.FileDataSource;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
@@ -87,7 +86,7 @@ public class Validator_A1b
                 // simple list of files
                 for (File file2 : ftp)
                 {
-                    status |= runSimple(new FileDataSource(file2));
+                    status |= runSimple(file2);
                 }
                 System.exit(status);
             }
@@ -130,18 +129,16 @@ public class Validator_A1b
         } 
         else
         {
-            // only one file
-            FileDataSource fd = new FileDataSource(args[posFile]);
             if (!outputXml)
             {
                 // simple validation 
-                System.exit(runSimple(fd));
+                System.exit(runSimple(new File(args[posFile])));
             }
             else
             {
                 // generate xml output
                 XmlResultParser xrp = new XmlResultParser();
-                Element result = xrp.validate(fd);
+                Element result = xrp.validate(new FileDataSource(args[posFile]));
                 Document document = result.getOwnerDocument();
                 document.appendChild(result);
                 Transformer transformer = TransformerFactory.newInstance().newTransformer();
@@ -166,10 +163,10 @@ public class Validator_A1b
         System.out.println("Version : " + version);
     }
 
-    private static int runSimple(DataSource fd) throws Exception
+    private static int runSimple(File file) throws Exception
     {
         ValidationResult result;
-        PreflightParser parser = new PreflightParser(fd);
+        PreflightParser parser = new PreflightParser(file);
         try
         {
             parser.parse();
@@ -185,13 +182,13 @@ public class Validator_A1b
 
         if (result.isValid())
         {
-            System.out.println("The file " + fd.getName() + " is a valid PDF/A-1b file");
+            System.out.println("The file " + file.getName() + " is a valid PDF/A-1b file");
             System.out.println();
             return 0;
         }
         else
         {
-            System.out.println("The file " + fd.getName() + " is not valid, error(s) :");
+            System.out.println("The file " + file.getName() + " is not valid, error(s) :");
             for (ValidationError error : result.getErrorsList())
             {
                 System.out.print(error.getErrorCode() + " : " + error.getDetails());