svn commit: r1630207 - /pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/PDFMerger.java

[tilman]

Author: tilman
Date: Wed Oct  8 19:18:21 2014
New Revision: 1630207

URL: http://svn.apache.org/r1630207
Log:
PDFBOX-2414: add -nonSeq option

Modified:
    pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/PDFMerger.java

Modified: 
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/PDFMerger.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/PDFMerger.java?rev=1630207&r1=1630206&r2=1630207&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/PDFMerger.java 
(original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/PDFMerger.java 
Wed Oct  8 19:18:21 2014
@@ -47,15 +47,23 @@ public class PDFMerger
     private void merge( String[] args ) throws Exception
     {
         String destinationFileName = "";
-        String sourceFileName = null;
+        String sourceFileName;
 
-        if ( args.length < 3 )
+        boolean nonSeq = false;
+        int firstFileArgPos = 0;
+        if (args.length > 0 && args[0].equals("-nonSeq"))
+        {
+            nonSeq = true;
+            firstFileArgPos = 1;
+        }
+
+        if ( args.length - firstFileArgPos < 3 )
         {
             usage();
         }
 
         PDFMergerUtility merger = new PDFMergerUtility();
-        for( int i=0; i<args.length-1; i++ )
+        for( int i=firstFileArgPos; i<args.length-1; i++ )
         {
             sourceFileName = args[i];
             merger.addSource(sourceFileName);
@@ -65,7 +73,14 @@ public class PDFMerger
 
         merger.setDestinationFileName(destinationFileName);
 
-        merger.mergeDocuments();
+        if (nonSeq)
+        {
+            merger.mergeDocumentsNonSeq(null);
+        }
+        else
+        {
+            merger.mergeDocuments();
+        }
     }
 
     /**
@@ -73,7 +88,8 @@ public class PDFMerger
      */
     private static void usage()
     {
-        System.err.println( "Usage: java -jar pdfbox-app-x.y.z.jar PDFMerger 
<Source PDF File 2..n> <Destination PDF File>\n" +
+        System.err.println( "Usage: java -jar pdfbox-app-x.y.z.jar PDFMerger 
[-nonSeq] <Source PDF File 2..n> <Destination PDF File>\n" +
+            "  -nonSeq                      use the non-sequential parser\n" +
             "  <Source PDF File 2..n>       2 or more source PDF documents to 
merge\n" +
             "  <Destination PDF File>       The PDF document to save the 
merged documents to\n"
             );