You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/03/12 08:16:55 UTC
svn commit: r1576603 - in /pdfbox/trunk:
examples/src/main/java/org/apache/pdfbox/examples/fdf/
examples/src/main/java/org/apache/pdfbox/examples/pdmodel/
examples/src/main/java/org/apache/pdfbox/examples/persistence/
examples/src/main/java/org/apache/...
Author: jahewson
Date: Wed Mar 12 07:16:54 2014
New Revision: 1576603
URL: http://svn.apache.org/r1576603
Log:
PDFBOX-1973: Replace SignatureException with IllegalStateException and IllegalArgumentException
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/exceptions/SignatureException.java
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureInterface.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateStructure.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigProperties.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSBase.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java Wed Mar 12 07:16:54 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.fdf;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
@@ -66,15 +65,13 @@ public class SetField
*
* @throws IOException If there is an error importing the FDF document.
*/
- public static void main(String[] args)
- throws IOException, SignatureException
+ public static void main(String[] args) throws IOException
{
SetField setter = new SetField();
setter.setField(args);
}
- private void setField(String[] args)
- throws IOException, SignatureException
+ private void setField(String[] args) throws IOException
{
PDDocument pdf = null;
try
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java Wed Mar 12 07:16:54 2014
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccessFile;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -52,7 +51,7 @@ public class AddImageToPDF
* @throws IOException If there is an error writing the data.
*/
public void createPDFFromImage( String inputFile, String image, String outputFile )
- throws IOException, SignatureException
+ throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java Wed Mar 12 07:16:54 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
import java.util.List;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -55,8 +54,7 @@ public class AddMessageToEachPage
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String file, String message, String outfile )
- throws IOException, SignatureException
+ public void doIt( String file, String message, String outfile ) throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBlankPDF.java Wed Mar 12 07:16:54 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -40,8 +39,7 @@ public class CreateBlankPDF
*
* @throws IOException If there is an error writing the data.
*/
- public void create( String file )
- throws IOException, SignatureException
+ public void create( String file ) throws IOException
{
PDDocument document = null;
try
@@ -69,8 +67,7 @@ public class CreateBlankPDF
*
* @throws IOException If there is an error writing the document data.
*/
- public static void main( String[] args )
- throws IOException, SignatureException
+ public static void main( String[] args ) throws IOException
{
if( args.length != 1 )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateLandscapePDF.java Wed Mar 12 07:16:54 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -48,8 +47,7 @@ public class CreateLandscapePDF
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String message, String outfile )
- throws IOException, SignatureException
+ public void doIt( String message, String outfile ) throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/EmbeddedFiles.java Wed Mar 12 07:16:54 2014
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.GregorianCalendar;
import java.util.List;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
@@ -59,7 +58,7 @@ public class EmbeddedFiles
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String file) throws IOException, SignatureException
+ public void doIt( String file) throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorld.java Wed Mar 12 07:16:54 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -53,7 +52,7 @@ public class HelloWorld
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String file, String message) throws IOException, SignatureException
+ public void doIt( String file, String message) throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldTTF.java Wed Mar 12 07:16:54 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
@@ -45,7 +44,7 @@ public class HelloWorldTTF
* @throws IOException If there is an error writing the data.
*/
public void doIt(final String file, final String message, final String fontfile)
- throws IOException, SignatureException
+ throws IOException
{
// the document
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/HelloWorldType1AfmPfb.java Wed Mar 12 07:16:54 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
@@ -46,7 +45,7 @@ public class HelloWorldType1AfmPfb
* @throws IOException If there is an error writing the data.
*/
public void doIt(String file, String message, String fontfile)
- throws IOException, SignatureException
+ throws IOException
{
// the document
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ImageToPDF.java Wed Mar 12 07:16:54 2014
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccessFile;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -50,8 +49,7 @@ public class ImageToPDF
*
* @throws IOException If there is an error writing the data.
*/
- public void createPDFFromImage( String file, String image)
- throws IOException, SignatureException
+ public void createPDFFromImage( String file, String image) throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java Wed Mar 12 07:16:54 2014
@@ -17,7 +17,6 @@
package org.apache.pdfbox.examples.pdmodel;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
@@ -56,8 +55,7 @@ public class RubberStampWithImage
* @param args the command line arguments
* @throws IOException an exception is thrown if something went wrong
*/
- public void doIt( String[] args )
- throws IOException, SignatureException
+ public void doIt( String[] args ) throws IOException
{
if( args.length != 3 )
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ShowColorBoxes.java Wed Mar 12 07:16:54 2014
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.pdmod
import java.awt.Color;
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -50,8 +49,7 @@ public class ShowColorBoxes
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String file)
- throws IOException, SignatureException
+ public void doIt( String file) throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/UsingTextMatrix.java Wed Mar 12 07:16:54 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.examples.pdmod
import java.io.IOException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -48,8 +47,7 @@ public class UsingTextMatrix
*
* @throws IOException If there is an error writing the data.
*/
- public void doIt( String message, String outfile )
- throws IOException, SignatureException
+ public void doIt( String message, String outfile ) throws IOException
{
// the document
PDDocument doc = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/persistence/CopyDoc.java Wed Mar 12 07:16:54 2014
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import org.apache.pdfbox.cos.COSDocument;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.pdfbox.pdfwriter.COSWriter;
@@ -52,8 +51,7 @@ public class CopyDoc
*
* @throws IOException If there is an error parsing the document.
*/
- public void doIt(String in, String out)
- throws IOException, SignatureException
+ public void doIt(String in, String out) throws IOException
{
InputStream is = null;
OutputStream os = null;
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java Wed Mar 12 07:16:54 2014
@@ -36,7 +36,6 @@ import java.util.Calendar;
import java.util.Enumeration;
import java.util.List;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface;
@@ -112,10 +111,8 @@ public class CreateSignature implements
* @param document is the pdf document
* @return the signed pdf document
* @throws IOException
- * @throws SignatureException
*/
- public File signPDF(File document)
- throws IOException, SignatureException
+ public File signPDF(File document) throws IOException
{
byte[] buffer = new byte[8 * 1024];
if (document == null || !document.exists())
@@ -180,8 +177,7 @@ public class CreateSignature implements
*
* Use your favorite cryptographic library to implement pkcs7 signature creation.
*/
- public byte[] sign(InputStream content) throws SignatureException,
- IOException
+ public byte[] sign(InputStream content) throws IOException
{
CMSProcessableInputStream input = new CMSProcessableInputStream(content);
CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
@@ -209,7 +205,7 @@ public class CreateSignature implements
}
public static void main(String[] args) throws KeyStoreException, CertificateException,
- IOException, SignatureException, NoSuchAlgorithmException
+ IOException, NoSuchAlgorithmException
{
if (args.length != 3)
{
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java Wed Mar 12 07:16:54 2014
@@ -36,7 +36,6 @@ import java.util.Calendar;
import java.util.Enumeration;
import java.util.List;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface;
@@ -112,10 +111,8 @@ public class CreateVisibleSignature impl
* @param signatureProperties
* @return the signed pdf document
* @throws IOException
- * @throws SignatureException
*/
- public File signPDF(File document, PDVisibleSigProperties signatureProperties)
- throws IOException, SignatureException
+ public File signPDF(File document, PDVisibleSigProperties signatureProperties) throws IOException
{
byte[] buffer = new byte[8 * 1024];
if (document == null || !document.exists())
@@ -186,7 +183,7 @@ public class CreateVisibleSignature impl
* Use your favorite cryptographic library to implement pkcs7 signature creation.
*/
@Override
- public byte[] sign(InputStream content) throws SignatureException, IOException
+ public byte[] sign(InputStream content) throws IOException
{
CMSProcessableInputStream input = new CMSProcessableInputStream(content);
CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
@@ -219,7 +216,7 @@ public class CreateVisibleSignature impl
* [3] image of visible signature
*/
public static void main(String[] args) throws KeyStoreException, CertificateException,
- IOException, SignatureException, NoSuchAlgorithmException
+ IOException, NoSuchAlgorithmException
{
if (args.length != 4)
Modified: pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java (original)
+++ pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestRubberStampWithImage.java Wed Mar 12 07:16:54 2014
@@ -17,7 +17,6 @@
package org.apache.pdfbox.examples.pdmodel;
import junit.framework.TestCase;
-import org.apache.pdfbox.exceptions.SignatureException;
import java.io.File;
import java.io.IOException;
@@ -27,8 +26,7 @@ import java.io.IOException;
*/
public class TestRubberStampWithImage extends TestCase
{
- public void test()
- throws IOException, SignatureException
+ public void test() throws IOException
{
String documentFile = "src/test/resources/org.apache.pdfbox.examples.pdmodel/document.pdf";
String stampFile = "src/test/resources/org.apache.pdfbox.examples.pdmodel/stamp.jpg";
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSArray.java Wed Mar 12 07:16:54 2014
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
/**
@@ -513,7 +512,7 @@ public class COSArray extends COSBase im
* @throws IOException If an error occurs while visiting this object.
*/
@Override
- public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException
{
return visitor.visitFromArray(this);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java Wed Mar 12 07:16:54 2014
@@ -16,7 +16,6 @@
*/
package org.apache.pdfbox.cos;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import java.io.IOException;
@@ -56,7 +55,7 @@ public abstract class COSBase implements
* @return any object, depending on the visitor implementation, or null
* @throws IOException If an error occurs while visiting this object.
*/
- public abstract Object accept(ICOSVisitor visitor) throws IOException, SignatureException;
+ public abstract Object accept(ICOSVisitor visitor) throws IOException;
public void setNeedToBeUpdate(boolean flag)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Wed Mar 12 07:16:54 2014
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.util.DateConverter;
@@ -1373,7 +1372,7 @@ public class COSDictionary extends COSBa
*
* @throws IOException If there is an error visiting this object.
*/
- public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException
{
return visitor.visitFromDictionary(this);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java Wed Mar 12 07:16:54 2014
@@ -28,7 +28,6 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.io.RandomAccessBuffer;
import org.apache.pdfbox.io.RandomAccessFile;
@@ -551,7 +550,7 @@ public class COSDocument extends COSBase
* @throws IOException If an error occurs while visiting this object.
*/
@Override
- public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException
{
return visitor.visitFromDocument( this );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java Wed Mar 12 07:16:54 2014
@@ -16,8 +16,6 @@
*/
package org.apache.pdfbox.cos;
-import org.apache.pdfbox.exceptions.SignatureException;
-
import java.io.IOException;
/**
@@ -201,7 +199,7 @@ public class COSObject extends COSBase
* @return any object, depending on the visitor implementation, or null
* @throws IOException If an error occurs while visiting this object.
*/
- public Object accept( ICOSVisitor visitor ) throws IOException, SignatureException
+ public Object accept( ICOSVisitor visitor ) throws IOException
{
return getObject() != null ? getObject().accept( visitor ) : COSNull.NULL.accept( visitor );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java Wed Mar 12 07:16:54 2014
@@ -26,18 +26,17 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.filter.DecodeResult;
import org.apache.pdfbox.filter.Filter;
import org.apache.pdfbox.filter.FilterFactory;
import org.apache.pdfbox.io.*;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
import org.apache.pdfbox.io.IOUtils;
+
/**
* This class represents a stream object in a PDF document.
*
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- *
*/
public class COSStream extends COSDictionary
{
@@ -247,7 +246,7 @@ public class COSStream extends COSDictio
* @param visitor The object to notify when visiting this object.
* @return any object, depending on the visitor implementation, or null
*/
- public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException
{
return visitor.visitFromStream(this);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/ICOSVisitor.java Wed Mar 12 07:16:54 2014
@@ -16,8 +16,6 @@
*/
package org.apache.pdfbox.cos;
-import org.apache.pdfbox.exceptions.SignatureException;
-
import java.io.IOException;
/**
@@ -35,7 +33,7 @@ public interface ICOSVisitor
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
*/
- public Object visitFromArray( COSArray obj ) throws IOException, SignatureException;
+ public Object visitFromArray( COSArray obj ) throws IOException;
/**
* Notification of visit to boolean object.
@@ -53,7 +51,7 @@ public interface ICOSVisitor
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
*/
- public Object visitFromDictionary( COSDictionary obj ) throws IOException, SignatureException;
+ public Object visitFromDictionary( COSDictionary obj ) throws IOException;
/**
* Notification of visit to document object.
@@ -61,9 +59,8 @@ public interface ICOSVisitor
* @param obj The Object that is being visited.
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
- * @throws SignatureException If there is an error while visiting this object.
*/
- public Object visitFromDocument( COSDocument obj ) throws IOException, SignatureException;
+ public Object visitFromDocument( COSDocument obj ) throws IOException;
/**
* Notification of visit to float object.
@@ -108,7 +105,7 @@ public interface ICOSVisitor
* @return any Object depending on the visitor implementation, or null
* @throws IOException If there is an error while visiting this object.
*/
- public Object visitFromStream( COSStream obj ) throws IOException, SignatureException;
+ public Object visitFromStream( COSStream obj ) throws IOException;
/**
* Notification of visit to string object.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Wed Mar 12 07:16:54 2014
@@ -51,7 +51,6 @@ import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.cos.ICOSVisitor;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdfparser.PDFXRefStream;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.encryption.SecurityHandler;
@@ -409,7 +408,7 @@ public class COSWriter implements ICOSVi
*
* @throws IOException If there is an error writing the data.
*/
- protected void doWriteBody(COSDocument doc) throws IOException, SignatureException
+ protected void doWriteBody(COSDocument doc) throws IOException
{
COSDictionary trailer = doc.getTrailer();
COSDictionary root = (COSDictionary)trailer.getDictionaryObject( COSName.ROOT );
@@ -492,7 +491,7 @@ public class COSWriter implements ICOSVi
*
* @throws IOException if the output cannot be written
*/
- public void doWriteObject( COSBase obj ) throws IOException, SignatureException
+ public void doWriteObject( COSBase obj ) throws IOException
{
writtenObjects.add( obj );
if(obj instanceof COSDictionary)
@@ -546,7 +545,7 @@ public class COSWriter implements ICOSVi
*
* @throws IOException If there is an IOError while writing the document.
*/
- protected void doWriteTrailer(COSDocument doc) throws IOException, SignatureException
+ protected void doWriteTrailer(COSDocument doc) throws IOException
{
getStandardOutput().write(TRAILER);
getStandardOutput().writeEOL();
@@ -644,8 +643,7 @@ public class COSWriter implements ICOSVi
}
}
- private void doWriteXRefInc(COSDocument doc, long hybridPrev) throws IOException,
- SignatureException
+ private void doWriteXRefInc(COSDocument doc, long hybridPrev) throws IOException
{
if (doc.isXRefStream() || hybridPrev != -1)
{
@@ -720,7 +718,7 @@ public class COSWriter implements ICOSVi
}
}
- private void doWriteSignature(COSDocument doc) throws IOException, SignatureException
+ private void doWriteSignature(COSDocument doc) throws IOException
{
// need to calculate the ByteRange
if (signaturePosition[0]>0 && byterangePosition[1] > 0)
@@ -888,7 +886,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromArray( COSArray obj ) throws IOException, SignatureException
+ public Object visitFromArray( COSArray obj ) throws IOException
{
int count = 0;
getStandardOutput().write(ARRAY_OPEN);
@@ -960,7 +958,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromDictionary(COSDictionary obj) throws IOException, SignatureException
+ public Object visitFromDictionary(COSDictionary obj) throws IOException
{
getStandardOutput().write(DICT_OPEN);
getStandardOutput().writeEOL();
@@ -1053,7 +1051,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromDocument(COSDocument doc) throws IOException, SignatureException
+ public Object visitFromDocument(COSDocument doc) throws IOException
{
if(!incrementalUpdate)
{
@@ -1147,7 +1145,7 @@ public class COSWriter implements ICOSVi
}
@Override
- public Object visitFromStream(COSStream obj) throws IOException, SignatureException
+ public Object visitFromStream(COSStream obj) throws IOException
{
if (willEncrypt)
{
@@ -1233,7 +1231,7 @@ public class COSWriter implements ICOSVi
* @throws IOException If an error occurs while generating the data.
* @param doc The document to write.
*/
- public void write(COSDocument doc) throws IOException, SignatureException
+ public void write(COSDocument doc) throws IOException
{
PDDocument pdDoc = new PDDocument( doc );
write( pdDoc );
@@ -1246,7 +1244,7 @@ public class COSWriter implements ICOSVi
*
* @throws IOException If an error occurs while generating the data.
*/
- public void write(PDDocument doc) throws IOException, SignatureException
+ public void write(PDDocument doc) throws IOException
{
Long idTime = doc.getDocumentId() == null ? System.currentTimeMillis() :
doc.getDocumentId();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java Wed Mar 12 07:16:54 2014
@@ -40,7 +40,6 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.pdfparser.BaseParser;
import org.apache.pdfbox.pdfparser.NonSequentialPDFParser;
@@ -264,10 +263,8 @@ public class PDDocument implements Close
* @param sigObject is the PDSignature model
* @param signatureInterface is a interface which provides signing capabilities
* @throws IOException if there is an error creating required fields
- * @throws SignatureException if something went wrong
*/
- public void addSignature(PDSignature sigObject, SignatureInterface signatureInterface) throws IOException,
- SignatureException
+ public void addSignature(PDSignature sigObject, SignatureInterface signatureInterface) throws IOException
{
SignatureOptions defaultOptions = new SignatureOptions();
defaultOptions.setPage(1);
@@ -281,10 +278,9 @@ public class PDDocument implements Close
* @param signatureInterface is a interface which provides signing capabilities
* @param options signature options
* @throws IOException if there is an error creating required fields
- * @throws SignatureException if something went wrong
*/
public void addSignature(PDSignature sigObject, SignatureInterface signatureInterface, SignatureOptions options)
- throws IOException, SignatureException
+ throws IOException
{
// Reserve content
// We need to reserve some space for the signature. Some signatures including
@@ -319,7 +315,7 @@ public class PDDocument implements Close
PDPage page = null;
if (size == 0)
{
- throw new SignatureException(SignatureException.INVALID_PAGE_FOR_SIGNATURE, "The PDF file has no pages");
+ throw new IllegalStateException("Cannot sign an empty document");
}
if (options.getPage() > size)
{
@@ -488,8 +484,7 @@ public class PDDocument implements Close
if (annotNotFound || sigFieldNotFound)
{
- throw new SignatureException(SignatureException.VISUAL_SIGNATURE_INVALID,
- "Could not read all needed objects from template");
+ throw new IllegalArgumentException("Template is missing required objects");
}
}
@@ -515,10 +510,9 @@ public class PDDocument implements Close
* @param signatureInterface is a interface which provides signing capabilities
* @param options signature options
* @throws IOException if there is an error creating required fields
- * @throws SignatureException
*/
public void addSignatureField(List<PDSignatureField> sigFields, SignatureInterface signatureInterface,
- SignatureOptions options) throws IOException, SignatureException
+ SignatureOptions options) throws IOException
{
PDDocumentCatalog catalog = getDocumentCatalog();
catalog.getCOSObject().setNeedToBeUpdate(true);
@@ -1179,9 +1173,8 @@ public class PDDocument implements Close
* @param fileName The file to save as.
*
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
- public void save(String fileName) throws IOException, SignatureException
+ public void save(String fileName) throws IOException
{
save(new File(fileName));
}
@@ -1192,9 +1185,8 @@ public class PDDocument implements Close
* @param file The file to save as.
*
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
- public void save(File file) throws IOException, SignatureException
+ public void save(File file) throws IOException
{
save(new FileOutputStream(file));
}
@@ -1205,9 +1197,8 @@ public class PDDocument implements Close
* @param output The stream to write to.
*
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
- public void save(OutputStream output) throws IOException, SignatureException
+ public void save(OutputStream output) throws IOException
{
// update the count in case any pages have been added behind the scenes.
getDocumentCatalog().getPages().updateCount();
@@ -1232,9 +1223,8 @@ public class PDDocument implements Close
*
* @param fileName the filename to be used
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
- public void saveIncremental(String fileName) throws IOException, SignatureException
+ public void saveIncremental(String fileName) throws IOException
{
saveIncremental(new FileInputStream(fileName), new FileOutputStream(fileName, true));
}
@@ -1245,10 +1235,9 @@ public class PDDocument implements Close
* @param input stream to read
* @param output stream to write
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
public void saveIncremental(FileInputStream input, OutputStream output)
- throws IOException, SignatureException
+ throws IOException
{
// update the count in case any pages have been added behind the scenes.
getDocumentCatalog().getPages().updateCount();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/COSStreamArray.java Wed Mar 12 07:16:54 2014
@@ -33,7 +33,6 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.ICOSVisitor;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
@@ -211,9 +210,8 @@ public class COSStreamArray extends COSS
* @param visitor The object to notify when visiting this object.
* @return any object, depending on the visitor implementation, or null
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
- public Object accept(ICOSVisitor visitor) throws IOException, SignatureException
+ public Object accept(ICOSVisitor visitor) throws IOException
{
return streams.accept( visitor );
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDocument.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDocument.java Wed Mar 12 07:16:54 2014
@@ -31,7 +31,6 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSDocument;
import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.pdfbox.pdfwriter.COSWriter;
@@ -254,7 +253,7 @@ public class FDFDocument
*
* @throws IOException If there is an error saving the document.
*/
- public void save( File fileName ) throws IOException, SignatureException
+ public void save( File fileName ) throws IOException
{
save( new FileOutputStream( fileName ) );
}
@@ -266,7 +265,7 @@ public class FDFDocument
*
* @throws IOException If there is an error saving the document.
*/
- public void save( String fileName ) throws IOException, SignatureException
+ public void save( String fileName ) throws IOException
{
save( new FileOutputStream( fileName ) );
}
@@ -277,9 +276,8 @@ public class FDFDocument
* @param output The stream to write to.
*
* @throws IOException If there is an error writing the document.
- * @throws SignatureException If there is an error writing the document.
*/
- public void save( OutputStream output ) throws IOException, SignatureException
+ public void save( OutputStream output ) throws IOException
{
COSWriter writer = null;
try
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureInterface.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureInterface.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureInterface.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureInterface.java Wed Mar 12 07:16:54 2014
@@ -19,23 +19,19 @@ package org.apache.pdfbox.pdmodel.intera
import java.io.IOException;
import java.io.InputStream;
-import org.apache.pdfbox.exceptions.SignatureException;
-
/**
* Providing an interface for accessing necessary functions for signing a pdf document.
*
* @author <a href="mailto:mail@thomas-chojecki.de">Thomas Chojecki</a>
- * @version $
*/
public interface SignatureInterface
{
-
/**
* Creates a cms signature for the given content
- *
+ *
* @param content is the content as a (Filter)InputStream
* @return signature as a byte array
*/
- public byte[] sign (InputStream content) throws SignatureException, IOException;
-
+ public byte[] sign (InputStream content) throws IOException;
+
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java Wed Mar 12 07:16:54 2014
@@ -23,7 +23,6 @@ import java.io.InputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDResources;
@@ -69,8 +68,7 @@ public class PDFTemplateCreator
* @return InputStream
* @throws IOException
*/
- public InputStream buildPDF(PDVisibleSignDesigner properties)
- throws IOException, SignatureException
+ public InputStream buildPDF(PDVisibleSignDesigner properties) throws IOException
{
logger.info("pdf building has been started");
PDFTemplateStructure pdfStructure = pdfBuilder.getStructure();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateStructure.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateStructure.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateStructure.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateStructure.java Wed Mar 12 07:16:54 2014
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSDocument;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdfwriter.COSWriter;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -575,7 +574,7 @@ public class PDFTemplateStructure
* @return
* @throws IOException
*/
- public ByteArrayInputStream getTemplateAppearanceStream() throws IOException, SignatureException
+ public ByteArrayInputStream getTemplateAppearanceStream() throws IOException
{
COSDocument visualSignature = getVisualSignature();
ByteArrayOutputStream memoryOut = new ByteArrayOutputStream();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigProperties.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigProperties.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigProperties.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigProperties.java Wed Mar 12 07:16:54 2014
@@ -16,8 +16,6 @@
*/
package org.apache.pdfbox.pdmodel.interactive.digitalsignature.visible;
-import org.apache.pdfbox.exceptions.SignatureException;
-
import java.io.IOException;
import java.io.InputStream;
@@ -43,10 +41,8 @@ public class PDVisibleSigProperties
* start building of visible signature
*
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
- public void buildSignature()
- throws IOException, SignatureException
+ public void buildSignature() throws IOException
{
PDFTemplateBuilder builder = new PDVisibleSigBuilder();
PDFTemplateCreator creator = new PDFTemplateCreator(builder);
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=1576603&r1=1576602&r2=1576603&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 Mar 12 07:16:54 2014
@@ -34,7 +34,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.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -174,7 +173,7 @@ public class PDFMergerUtility
*
* @throws IOException If there is an error saving the document.
*/
- public void mergeDocuments() throws IOException, SignatureException
+ public void mergeDocuments() throws IOException
{
PDDocument destination = null;
InputStream sourceFile;
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSBase.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSBase.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSBase.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSBase.java Wed Mar 12 07:16:54 2014
@@ -19,8 +19,6 @@ package org.apache.pdfbox.cos;
import junit.framework.TestCase;
-import org.apache.pdfbox.exceptions.SignatureException;
-
import java.io.IOException;
/**
@@ -42,7 +40,7 @@ public abstract class TestCOSBase extend
/**
* Test accept() - tests the interface for visiting a document at the COS level.
*/
- public abstract void testAccept() throws IOException, SignatureException;
+ public abstract void testAccept() throws IOException;
/**
* Tests isNeedToBeUpdate() and setNeedToBeUpdate() - tests the getter/setter methods.
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/TestCOSString.java Wed Mar 12 07:16:54 2014
@@ -20,7 +20,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdfwriter.COSWriter;
import junit.framework.Test;
@@ -319,7 +318,7 @@ public class TestCOSString extends TestC
}
@Override
- public void testAccept() throws IOException, SignatureException
+ public void testAccept() throws IOException
{
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
ICOSVisitor visitor = new COSWriter(outStream);
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java Wed Mar 12 07:16:54 2014
@@ -28,7 +28,6 @@ import java.security.cert.X509Certificat
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
import org.apache.pdfbox.pdmodel.encryption.PublicKeyDecryptionMaterial;
@@ -237,8 +236,7 @@ public class TestPublicKeyEncryption ext
* @return reloaded document
* @throws Exception if
*/
- private PDDocument reload(PDDocument doc)
- throws IOException, SignatureException, NoSuchAlgorithmException
+ private PDDocument reload(PDDocument doc) throws IOException, NoSuchAlgorithmException
{
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
doc.save(buffer);
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java Wed Mar 12 07:16:54 2014
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.io.RandomAccessBuffer;
@@ -48,7 +47,7 @@ public class TestPDDocument extends Test
/**
* Test document save/load using a stream.
*/
- public void testSaveLoadStream() throws IOException, SignatureException
+ public void testSaveLoadStream() throws IOException
{
// Create PDF with one blank page
PDDocument document = new PDDocument();
@@ -74,7 +73,7 @@ public class TestPDDocument extends Test
/**
* Test document save/load using a file.
*/
- public void testSaveLoadFile() throws IOException, SignatureException
+ public void testSaveLoadFile() throws IOException
{
// Create PDF with one blank page
PDDocument document = new PDDocument();
@@ -103,7 +102,7 @@ public class TestPDDocument extends Test
/**
* Test document save/loadNonSeq using a stream.
*/
- public void testSaveLoadNonSeqStream() throws IOException, SignatureException
+ public void testSaveLoadNonSeqStream() throws IOException
{
// Create PDF with one blank page
PDDocument document = new PDDocument();
@@ -129,7 +128,7 @@ public class TestPDDocument extends Test
/**
* Test document save/loadNonSeq using a file.
*/
- public void testSaveLoadNonSeqFile() throws IOException, SignatureException
+ public void testSaveLoadNonSeqFile() throws IOException
{
// Create PDF with one blank page
PDDocument document = new PDDocument();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java Wed Mar 12 07:16:54 2014
@@ -24,7 +24,6 @@ import java.io.IOException;
import junit.framework.TestCase;
import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -117,7 +116,7 @@ public class TestLayerUtility extends Te
}
}
- private File createMainPDF() throws IOException, SignatureException
+ private File createMainPDF() throws IOException
{
File targetFile = new File(testResultsDir, "text-doc.pdf");
PDDocument doc = new PDDocument();
@@ -172,7 +171,7 @@ public class TestLayerUtility extends Te
return targetFile;
}
- private File createOverlay1() throws IOException, SignatureException
+ private File createOverlay1() throws IOException
{
File targetFile = new File(testResultsDir, "overlay1.pdf");
PDDocument doc = new PDDocument();
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java Wed Mar 12 07:16:54 2014
@@ -34,7 +34,6 @@ import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.io.RandomAccessBuffer;
import org.apache.pdfbox.pdfparser.BaseParser;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -211,8 +210,7 @@ public class OverlayPDF
*
* @param specificPageOverlayFile map of overlay files for specific pages
*/
- public void overlay(Map<Integer, String> specificPageOverlayFile)
- throws IOException, SignatureException
+ public void overlay(Map<Integer, String> specificPageOverlayFile) throws IOException
{
PDDocument sourcePDFDocument = null;
PDDocument defaultOverlay = null;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java Wed Mar 12 07:16:54 2014
@@ -23,12 +23,8 @@ import java.io.FileOutputStream;
import java.util.List;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
-
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
-
import org.apache.pdfbox.pdfwriter.COSWriter;
-
import org.apache.pdfbox.util.Splitter;
/**
@@ -219,8 +215,7 @@ public class PDFSplit
}
}
- private static final void writeDocument( PDDocument doc, String fileName )
- throws IOException, SignatureException
+ private static final void writeDocument( PDDocument doc, String fileName ) throws IOException
{
FileOutputStream output = null;
COSWriter writer = null;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java?rev=1576603&r1=1576602&r2=1576603&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java Wed Mar 12 07:16:54 2014
@@ -25,7 +25,6 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
-import org.apache.pdfbox.exceptions.SignatureException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
@@ -57,12 +56,10 @@ public class WriteDecodedDoc
* @param out The filename used for output.
*
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*
* @deprecated use {@link WriteDecodedDoc#doIt(String, String, String, boolean)} instead.
*/
- public void doIt(String in, String out)
- throws IOException, SignatureException
+ public void doIt(String in, String out) throws IOException
{
doIt(in, out, "", false);
}
@@ -76,10 +73,9 @@ public class WriteDecodedDoc
* @param useNonSeqParser use the non sequential parser
*
* @throws IOException if the output could not be written
- * @throws SignatureException if signing failed
*/
public void doIt(String in, String out, String password, boolean useNonSeqParser)
- throws IOException, SignatureException
+ throws IOException
{
PDDocument doc = null;
try