Author: tilman
Date: Thu Mar 10 17:08:46 2016
New Revision: 1734435
URL: http://svn.apache.org/viewvc?rev=1734435&view=rev
Log:
PDFBOX-2883: keep 1.8 method as deprecated
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1734435&r1=1734434&r2=1734435&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Thu Mar 10 17:08:46 2016
@@ -168,6 +168,18 @@ public class PDFMergerUtility
}
/**
+ * Merge the list of source documents, saving the result in the
destination file.
+ *
+ * @throws IOException If there is an error saving the document.
+ * @deprecated use {@link
#mergeDocuments(org.apache.pdfbox.io.MemoryUsageSetting) }
+ */
+ @Deprecated
+ public void mergeDocuments() throws IOException
+ {
+ mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly());
+ }
+
+ /**
* Merge the list of source documents, saving the result in the destination
* file.
*
