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 2014/11/19 20:29:50 UTC
svn commit: r1640620 - in /pdfbox/trunk:
pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java
tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java
Author: lehmi
Date: Wed Nov 19 19:29:50 2014
New Revision: 1640620
URL: http://svn.apache.org/r1640620
Log:
PDFBOX-2430: removed command line parser switch from merger tool, switch to use the non-sequential parser
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java?rev=1640620&r1=1640619&r2=1640620&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java Wed Nov 19 19:29:50 2014
@@ -35,7 +35,6 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -59,7 +58,6 @@ import org.apache.pdfbox.pdmodel.interac
* result in a new document.
*
* @author Ben Litchfield
- *
*/
public class PDFMergerUtility
{
@@ -171,24 +169,6 @@ public class PDFMergerUtility
*/
public void mergeDocuments() throws IOException
{
- mergeDocuments(false, null);
- }
-
- /**
- * Merge the list of source documents with the non sequential parser, saving
- * the result in the destination file.
- *
- * @param scratchFile location to store temp PDFBox data for this output
- * document, can be null if temp data is to be stored in memory
- * @throws IOException If there is an error saving the document.
- */
- public void mergeDocumentsNonSeq(RandomAccess scratchFile) throws IOException
- {
- mergeDocuments(true, scratchFile);
- }
-
- private void mergeDocuments(boolean isNonSeq, RandomAccess scratchFile) throws IOException
- {
PDDocument destination = null;
InputStream sourceFile;
PDDocument source;
@@ -204,15 +184,7 @@ public class PDFMergerUtility
while (sit.hasNext())
{
sourceFile = sit.next();
- if (isNonSeq)
- {
- source = PDDocument.load(sourceFile, null);
- }
- else
- {
- source = PDDocument.loadLegacy(sourceFile);
- }
-
+ source = PDDocument.load(sourceFile);
tobeclosed.add(source);
appendDocument(destination, source);
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java?rev=1640620&r1=1640619&r2=1640620&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java Wed Nov 19 19:29:50 2014
@@ -92,7 +92,7 @@ public class PDFMergerUtilityTest extend
pdfMergerUtility.addSource(new File(SRCDIR, filename1));
pdfMergerUtility.addSource(new File(SRCDIR, filename2));
pdfMergerUtility.setDestinationFileName(TARGETTESTDIR + mergeFilename);
- pdfMergerUtility.mergeDocumentsNonSeq(null);
+ pdfMergerUtility.mergeDocuments();
PDDocument mergedDoc
= PDDocument.load(new File(TARGETTESTDIR, mergeFilename), null);
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java?rev=1640620&r1=1640619&r2=1640620&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java Wed Nov 19 19:29:50 2014
@@ -22,8 +22,7 @@ import org.apache.pdfbox.util.PDFMergerU
* This is the main program that will take a list of pdf documents and merge them,
* saving the result in a new document.
*
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.2 $
+ * @author Ben Litchfield
*/
public class PDFMerger
{
@@ -52,13 +51,7 @@ public class PDFMerger
String destinationFileName = "";
String sourceFileName;
- boolean nonSeq = false;
int firstFileArgPos = 0;
- if (args.length > 0 && args[0].equals("-nonSeq"))
- {
- nonSeq = true;
- firstFileArgPos = 1;
- }
if ( args.length - firstFileArgPos < 3 )
{
@@ -73,17 +66,8 @@ public class PDFMerger
}
destinationFileName = args[args.length-1];
-
merger.setDestinationFileName(destinationFileName);
-
- if (nonSeq)
- {
- merger.mergeDocumentsNonSeq(null);
- }
- else
- {
- merger.mergeDocuments();
- }
+ merger.mergeDocuments();
}
/**
@@ -92,7 +76,6 @@ public class PDFMerger
private static void usage()
{
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"
);