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/07/03 03:09:15 UTC
svn commit: r1607508 - in /pdfbox/trunk:
examples/src/main/java/org/apache/pdfbox/examples/pdfa/
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: Thu Jul 3 01:09:15 2014
New Revision: 1607508
URL: http://svn.apache.org/r1607508
Log:
PDFBOX-1503: remove printStackTrace() calls
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.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/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/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/CreateVisibleSignature.java
pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDOutputIntent.java
pdfbox/trunk/preflight/src/main/javacc/pdf_full_grammar.jj
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java Thu Jul 3 01:09:15 2014
@@ -17,6 +17,7 @@
package org.apache.pdfbox.examples.pdfa;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import org.apache.jempbox.xmp.XMPMetadata;
@@ -30,6 +31,8 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
import org.apache.pdfbox.pdmodel.graphics.color.PDOutputIntent;
+import javax.xml.transform.TransformerException;
+
/**
* This is an example that creates a simple PDF/A document.
*
@@ -59,7 +62,8 @@ public class CreatePDFA
*
* @throws Exception If something bad occurs
*/
- public void doIt( final String file, final String message, final String fontfile) throws Exception
+ public void doIt( final String file, final String message, final String fontfile)
+ throws IOException, TransformerException
{
// the document
PDDocument doc = null;
@@ -125,23 +129,16 @@ public class CreatePDFA
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException, TransformerException
{
CreatePDFA app = new CreatePDFA();
- try
+ if( args.length != 3 )
{
- if( args.length != 3 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0], args[1], args[2] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0], args[1], args[2] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -111,23 +111,16 @@ public class AddImageToPDF
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
AddImageToPDF app = new AddImageToPDF();
- try
+ if( args.length != 3 )
{
- if( args.length != 3 )
- {
- app.usage();
- }
- else
- {
- app.createPDFFromImage( args[0], args[1], args[2] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.createPDFFromImage( args[0], args[1], args[2] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -117,23 +117,16 @@ public class AddMessageToEachPage
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
AddMessageToEachPage app = new AddMessageToEachPage();
- try
+ if( args.length != 3 )
{
- if( args.length != 3 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0], args[1], args[2] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0], args[1], args[2] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -102,23 +102,16 @@ public class CreateLandscapePDF
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
CreateLandscapePDF app = new CreateLandscapePDF();
- try
+ if( args.length != 2 )
{
- if( args.length != 2 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0], args[1] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0], args[1] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -126,23 +126,16 @@ public class EmbeddedFiles
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
EmbeddedFiles app = new EmbeddedFiles();
- try
+ if( args.length != 1 )
{
- if( args.length != 1 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -89,23 +89,16 @@ public class HelloWorld
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
HelloWorld app = new HelloWorld();
- try
+ if( args.length != 2 )
{
- if( args.length != 2 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0], args[1] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0], args[1] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -86,24 +86,17 @@ public class HelloWorldTTF
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
HelloWorldTTF app = new HelloWorldTTF();
- try
+ if (args.length != 3)
{
- if (args.length != 3)
- {
- app.usage();
- }
- else
- {
- app.doIt(args[0], args[1], args[2]);
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt(args[0], args[1], args[2]);
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -86,24 +86,17 @@ public class HelloWorldType1AfmPfb
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
HelloWorldType1AfmPfb app = new HelloWorldType1AfmPfb();
- try
+ if (args.length != 3)
{
- if (args.length != 3)
- {
- app.usage();
- }
- else
- {
- app.doIt(args[0], args[1], args[2]);
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt(args[0], args[1], args[2]);
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -110,23 +110,16 @@ public class ImageToPDF
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
ImageToPDF app = new ImageToPDF();
- try
+ if( args.length != 2 )
{
- if( args.length != 2 )
- {
- app.usage();
- }
- else
- {
- app.createPDFFromImage( args[0], args[1] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.createPDFFromImage( args[0], args[1] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -88,23 +88,16 @@ public class ShowColorBoxes
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
ShowColorBoxes app = new ShowColorBoxes();
- try
+ if( args.length != 1 )
{
- if( args.length != 1 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -149,23 +149,16 @@ public class UsingTextMatrix
*
* @param args Command line arguments.
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
UsingTextMatrix app = new UsingTextMatrix();
- try
+ if( args.length != 2 )
{
- if( args.length != 2 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0], args[1] );
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0], args[1] );
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -94,23 +94,16 @@ public class CopyDoc
*
* @param args command line arguments
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
CopyDoc app = new CopyDoc();
- try
+ if( args.length != 2 )
{
- if( args.length != 2 )
- {
- app.usage();
- }
- else
- {
- app.doIt( args[0], args[1]);
- }
+ app.usage();
}
- catch (Exception e)
+ else
{
- e.printStackTrace();
+ app.doIt( args[0], args[1]);
}
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -27,6 +27,7 @@ import java.security.NoSuchAlgorithmExce
import java.security.PrivateKey;
import java.security.UnrecoverableKeyException;
import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.interfaces.RSAPrivateKey;
import java.util.Calendar;
@@ -41,6 +42,7 @@ import org.apache.pdfbox.pdmodel.interac
import org.bouncycastle.asn1.ASN1Primitive;
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cms.CMSException;
import org.bouncycastle.cms.CMSSignedData;
import org.bouncycastle.cms.CMSSignedDataGenerator;
import org.bouncycastle.cms.SignerInfoGeneratorBuilder;
@@ -49,6 +51,7 @@ import org.bouncycastle.jce.provider.Bou
import org.bouncycastle.operator.ContentSigner;
import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
+import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
@@ -74,39 +77,23 @@ public class CreateVisibleSignature impl
* @param pin is the pin for the keystore / private key
*/
public CreateVisibleSignature(KeyStore keystore, char[] pin)
+ throws KeyStoreException, UnrecoverableKeyException, NoSuchAlgorithmException
{
- try
- {
- // grabs the first alias from the keystore and get the private key. An
- // alternative method or constructor could be used for setting a specific
- // alias that should be used.
- Enumeration<String> aliases = keystore.aliases();
- String alias = null;
- if (aliases.hasMoreElements())
- {
- alias = aliases.nextElement();
- }
- else
- {
- throw new RuntimeException("Could not find alias");
- }
- privKey = (PrivateKey) keystore.getKey(alias, pin);
- cert = keystore.getCertificateChain(alias);
- }
- catch (KeyStoreException e)
- {
- e.printStackTrace();
- }
- catch (UnrecoverableKeyException e)
+ // grabs the first alias from the keystore and get the private key. An
+ // alternative method or constructor could be used for setting a specific
+ // alias that should be used.
+ Enumeration<String> aliases = keystore.aliases();
+ String alias = null;
+ if (aliases.hasMoreElements())
{
- System.err.println("Could not extract private key.");
- e.printStackTrace();
+ alias = aliases.nextElement();
}
- catch (NoSuchAlgorithmException e)
+ else
{
- System.err.println("Unknown algorithm.");
- e.printStackTrace();
+ throw new RuntimeException("Could not find alias");
}
+ privKey = (PrivateKey) keystore.getKey(alias, pin);
+ cert = keystore.getCertificateChain(alias);
}
/**
@@ -192,13 +179,13 @@ public class CreateVisibleSignature impl
{
try
{
- org.bouncycastle.asn1.x509.Certificate certificate =
- org.bouncycastle.asn1.x509.Certificate.getInstance(ASN1Primitive.fromByteArray(cert[0].getEncoded()));
+ org.bouncycastle.asn1.x509.Certificate certificate =
+ org.bouncycastle.asn1.x509.Certificate.getInstance(ASN1Primitive.fromByteArray(cert[0].getEncoded()));
AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find("SHA256WITHRSAENCRYPTION");
AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId);
- RSAPrivateKey privateRSAKey = (RSAPrivateKey)privKey;
- RSAKeyParameters keyParams = new RSAKeyParameters(true, privateRSAKey.getModulus(), privateRSAKey.getPrivateExponent());
+ RSAPrivateKey privateRSAKey = (RSAPrivateKey)privKey;
+ RSAKeyParameters keyParams = new RSAKeyParameters(true, privateRSAKey.getModulus(), privateRSAKey.getPrivateExponent());
ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlgId, digAlgId).build(keyParams);
CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
gen.addSignerInfoGenerator(
@@ -208,13 +195,18 @@ public class CreateVisibleSignature impl
CMSSignedData signedData = gen.generate(processable, false);
return signedData.getEncoded();
}
- catch (Exception e)
+ catch (CertificateEncodingException e)
+ {
+ throw new IOException(e);
+ }
+ catch (CMSException e)
+ {
+ throw new IOException(e);
+ }
+ catch (OperatorCreationException e)
{
- // should be handled
- System.err.println("Error while creating pkcs7 signature.");
- e.printStackTrace();
+ throw new IOException(e);
}
- throw new RuntimeException("Problem while preparing signature");
}
/**
@@ -225,7 +217,7 @@ public class CreateVisibleSignature impl
* [3] image of visible signature
*/
public static void main(String[] args) throws KeyStoreException, CertificateException,
- IOException, NoSuchAlgorithmException
+ IOException, NoSuchAlgorithmException, UnrecoverableKeyException
{
if (args.length != 4)
Modified: pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java (original)
+++ pdfbox/trunk/jempbox/src/main/java/org/apache/jempbox/xmp/XMPMetadata.java Thu Jul 3 01:09:15 2014
@@ -374,7 +374,7 @@ public class XMPMetadata
* @throws Exception
* If there is an error creating the stream.
*/
- public byte[] asByteArray() throws Exception
+ public byte[] asByteArray() throws TransformerException
{
return XMLUtil.asByteArray(xmpDocument, encoding);
}
@@ -638,8 +638,7 @@ public class XMPMetadata
}
catch(Exception e)
{
- e.printStackTrace();
- throw new IOException(e.getMessage());
+ throw new IOException(e);
}
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDOutputIntent.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDOutputIntent.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDOutputIntent.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDOutputIntent.java Thu Jul 3 01:09:15 2014
@@ -39,7 +39,7 @@ public final class PDOutputIntent implem
{
private COSDictionary dictionary;
- public PDOutputIntent(PDDocument doc, InputStream colorProfile) throws Exception
+ public PDOutputIntent(PDDocument doc, InputStream colorProfile) throws IOException
{
dictionary = new COSDictionary();
dictionary.setItem(COSName.TYPE, COSName.OUTPUT_INTENT);
Modified: pdfbox/trunk/preflight/src/main/javacc/pdf_full_grammar.jj
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/javacc/pdf_full_grammar.jj?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/javacc/pdf_full_grammar.jj (original)
+++ pdfbox/trunk/preflight/src/main/javacc/pdf_full_grammar.jj Thu Jul 3 01:09:15 2014
@@ -51,7 +51,7 @@ public class PDFParser
return true;
}
- public static void main (String [] args) {
+ public static void main (String [] args) throws ParseException {
PDFParser parser;
String filename = null;
long initTime = 0;
@@ -85,22 +85,15 @@ public class PDFParser
System.out.println(" java PDFParser inputfile");
return;
}
- try
- {
- startTime = System.currentTimeMillis();
+ startTime = System.currentTimeMillis();
- parser.PDF();
+ parser.PDF();
- stopTime = System.currentTimeMillis();
- parseTime = stopTime - startTime;
- System.out.println("PDF Parser ");
- System.out.print(" PDF Parser parsed " + filename + " successfully in " + (initTime + parseTime) + " ms.");
- System.out.println(" Init. : " + initTime + " ms / parse time : " + parseTime + " ms");
- } catch (ParseException e)
- {
- e.printStackTrace(System.out);
- System.out.println("PDF Parser : Encountered errors during parse.");
- }
+ stopTime = System.currentTimeMillis();
+ parseTime = stopTime - startTime;
+ System.out.println("PDF Parser ");
+ System.out.print(" PDF Parser parsed " + filename + " successfully in " + (initTime + parseTime) + " ms.");
+ System.out.println(" Init. : " + initTime + " ms / parse time : " + parseTime + " ms");
}
}
PARSER_END(PDFParser)
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java Thu Jul 3 01:09:15 2014
@@ -31,7 +31,7 @@ public class PDFBox
*
* @param args command line arguments
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws Exception
{
// suppress the Dock icon on OS X
System.setProperty("apple.awt.UIElement", "true");
@@ -42,77 +42,67 @@ public class PDFBox
String[] arguments = new String[args.length - 1];
System.arraycopy(args, 1, arguments, 0, arguments.length);
boolean exitAfterCallingMain = true;
- try
+ if (command.equals("Decrypt"))
{
- if (command.equals("Decrypt"))
- {
- Decrypt.main(arguments);
- }
- else if (command.equals("Encrypt"))
- {
- Encrypt.main(arguments);
- }
- else if (command.equals("ExtractText"))
- {
- ExtractText.main(arguments);
- }
- else if (command.equals("ExtractImages"))
- {
- ExtractImages.main(arguments);
- }
- else if (command.equals("OverlayPDF"))
- {
- OverlayPDF.main(arguments);
- }
- else if (command.equals("PrintPDF"))
- {
- PrintPDF.main(arguments);
- }
- else if (command.equals("PDFDebugger"))
- {
- PDFDebugger.main(arguments);
- exitAfterCallingMain = false;
- }
- else if (command.equals("PDFMerger"))
- {
- PDFMerger.main(arguments);
- }
- else if (command.equals("PDFReader"))
- {
- PDFReader.main(arguments);
- exitAfterCallingMain = false;
- }
- else if (command.equals("PDFSplit"))
- {
- PDFSplit.main(arguments);
- }
- else if (command.equals("PDFToImage"))
- {
- PDFToImage.main(arguments);
- }
- else if (command.equals("TextToPDF"))
- {
- TextToPDF.main(arguments);
- }
- else if (command.equals("WriteDecodedDoc"))
- {
- WriteDecodedDoc.main(arguments);
- }
- else
- {
- showMessageAndExit();
- }
- if (exitAfterCallingMain)
- {
- System.exit(0);
- }
- }
- catch (Exception e)
- {
- System.err.println(
- command + " failed with the following exception:");
- e.printStackTrace();
- System.exit(1);
+ Decrypt.main(arguments);
+ }
+ else if (command.equals("Encrypt"))
+ {
+ Encrypt.main(arguments);
+ }
+ else if (command.equals("ExtractText"))
+ {
+ ExtractText.main(arguments);
+ }
+ else if (command.equals("ExtractImages"))
+ {
+ ExtractImages.main(arguments);
+ }
+ else if (command.equals("OverlayPDF"))
+ {
+ OverlayPDF.main(arguments);
+ }
+ else if (command.equals("PrintPDF"))
+ {
+ PrintPDF.main(arguments);
+ }
+ else if (command.equals("PDFDebugger"))
+ {
+ PDFDebugger.main(arguments);
+ exitAfterCallingMain = false;
+ }
+ else if (command.equals("PDFMerger"))
+ {
+ PDFMerger.main(arguments);
+ }
+ else if (command.equals("PDFReader"))
+ {
+ PDFReader.main(arguments);
+ exitAfterCallingMain = false;
+ }
+ else if (command.equals("PDFSplit"))
+ {
+ PDFSplit.main(arguments);
+ }
+ else if (command.equals("PDFToImage"))
+ {
+ PDFToImage.main(arguments);
+ }
+ else if (command.equals("TextToPDF"))
+ {
+ TextToPDF.main(arguments);
+ }
+ else if (command.equals("WriteDecodedDoc"))
+ {
+ WriteDecodedDoc.main(arguments);
+ }
+ else
+ {
+ showMessageAndExit();
+ }
+ if (exitAfterCallingMain)
+ {
+ System.exit(0);
}
}
else
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java Thu Jul 3 01:09:15 2014
@@ -210,7 +210,7 @@ public class PDFDebugger extends javax.s
}
catch (Exception e)
{
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
}//GEN-LAST:event_openMenuItemActionPerformed
@@ -238,7 +238,7 @@ public class PDFDebugger extends javax.s
}
catch (Exception e)
{
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
}//GEN-LAST:event_jTree1ValueChanged
@@ -287,7 +287,7 @@ public class PDFDebugger extends javax.s
}
catch( IOException e )
{
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
else if( selectedNode instanceof MapEntry )
@@ -309,9 +309,9 @@ public class PDFDebugger extends javax.s
{
document.close();
}
- catch( IOException io )
+ catch( IOException e )
{
- io.printStackTrace();
+ throw new RuntimeException(e);
}
}
System.exit(0);
@@ -328,9 +328,9 @@ public class PDFDebugger extends javax.s
{
document.close();
}
- catch( IOException io )
+ catch( IOException e )
{
- io.printStackTrace();
+ throw new RuntimeException(e);
}
}
System.exit(0);
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java Thu Jul 3 01:09:15 2014
@@ -147,7 +147,7 @@ public class PDFReader extends JFrame
}
catch (PrinterException e)
{
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
});
@@ -160,7 +160,14 @@ public class PDFReader extends JFrame
{
if (document != null)
{
- saveImage();
+ try
+ {
+ saveImage();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
}
});
@@ -188,7 +195,14 @@ public class PDFReader extends JFrame
@Override
public void actionPerformed(java.awt.event.ActionEvent evt)
{
- nextPage();
+ try
+ {
+ nextPage();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
});
viewMenu.add(nextPageItem);
@@ -200,7 +214,14 @@ public class PDFReader extends JFrame
@Override
public void actionPerformed(java.awt.event.ActionEvent evt)
{
- previousPage();
+ try
+ {
+ previousPage();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
});
viewMenu.add(previousPageItem);
@@ -218,7 +239,7 @@ public class PDFReader extends JFrame
setTitle(BASETITLE + ": " + currentFilename + " (" + (currentPage + 1) + "/" + numberOfPages + ")");
}
- private void nextPage()
+ private void nextPage() throws IOException
{
if (currentPage < numberOfPages - 1)
{
@@ -228,7 +249,7 @@ public class PDFReader extends JFrame
}
}
- private void previousPage()
+ private void previousPage() throws IOException
{
if (currentPage > 0)
{
@@ -254,9 +275,9 @@ public class PDFReader extends JFrame
{
openPDFFile(name, "");
}
- catch (Exception e)
+ catch (IOException e)
{
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
}
@@ -316,7 +337,7 @@ public class PDFReader extends JFrame
viewer.setVisible(true);
}
- private void openPDFFile(String filename, String password) throws Exception
+ private void openPDFFile(String filename, String password) throws IOException
{
if (document != null)
{
@@ -334,42 +355,28 @@ public class PDFReader extends JFrame
showPage(0);
}
- private void showPage(int pageNumber)
+ private void showPage(int pageNumber) throws IOException
{
- try
+ PageWrapper wrapper = new PageWrapper(this);
+ wrapper.displayPage(renderer, pages.get(pageNumber), pageNumber);
+ if (documentPanel.getComponentCount() > 0)
{
- PageWrapper wrapper = new PageWrapper(this);
- wrapper.displayPage(renderer, pages.get(pageNumber), pageNumber);
- if (documentPanel.getComponentCount() > 0)
- {
- documentPanel.remove(0);
- }
- documentPanel.add(wrapper.getPanel());
- pack();
- }
- catch (IOException exception)
- {
- exception.printStackTrace();
+ documentPanel.remove(0);
}
+ documentPanel.add(wrapper.getPanel());
+ pack();
}
- private void saveImage()
+ private void saveImage() throws IOException
{
- try
- {
- BufferedImage pageAsImage = renderer.renderImage(currentPage);
- String imageFilename = currentFilename;
- if (imageFilename.toLowerCase().endsWith(".pdf"))
- {
- imageFilename = imageFilename.substring(0, imageFilename.length() - 4);
- }
- imageFilename += "_" + (currentPage + 1);
- ImageIOUtil.writeImage(pageAsImage, imageFilename + ".png", 300);
- }
- catch (IOException exception)
+ BufferedImage pageAsImage = renderer.renderImage(currentPage);
+ String imageFilename = currentFilename;
+ if (imageFilename.toLowerCase().endsWith(".pdf"))
{
- exception.printStackTrace();
+ imageFilename = imageFilename.substring(0, imageFilename.length() - 4);
}
+ imageFilename += "_" + (currentPage + 1);
+ ImageIOUtil.writeImage(pageAsImage, imageFilename + ".png", 300);
}
private void parseDocument(File file, String password) throws IOException
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java Thu Jul 3 01:09:15 2014
@@ -210,10 +210,6 @@ public class TextToPDF
doc.save( args[args.length-2] );
}
}
- catch (Exception e)
- {
- e.printStackTrace();
- }
finally
{
if( doc != null )
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Version.java Thu Jul 3 01:09:15 2014
@@ -50,13 +50,12 @@ public class Version
try
{
Properties props = ResourceLoader.loadProperties( PDFBOX_VERSION_PROPERTIES, false );
- version = props.getProperty( "pdfbox.version", version );
+ return props.getProperty( "pdfbox.version", version );
}
catch( IOException io )
{
//if there is a problem loading the properties then don't throw an
//exception, 'unknown' will be returned instead.
- io.printStackTrace();
}
return version;
}
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=1607508&r1=1607507&r2=1607508&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 Thu Jul 3 01:09:15 2014
@@ -140,7 +140,7 @@ public class WriteDecodedDoc
*
* @param args command line arguments
*/
- public static void main(String[] args)
+ public static void main(String[] args) throws IOException
{
// suppress the Dock icon on OS X
System.setProperty("apple.awt.UIElement", "true");
@@ -184,18 +184,11 @@ public class WriteDecodedDoc
}
else
{
- try
+ if (outputFile == null)
{
- if (outputFile == null)
- {
- outputFile = calculateOutputFilename(pdfFile);
- }
- app.doIt(pdfFile, outputFile, password, useNonSeqParser);
- }
- catch (Exception e)
- {
- e.printStackTrace();
+ outputFile = calculateOutputFilename(pdfFile);
}
+ app.doIt(pdfFile, outputFile, password, useNonSeqParser);
}
}
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java?rev=1607508&r1=1607507&r2=1607508&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java Thu Jul 3 01:09:15 2014
@@ -88,7 +88,7 @@ public class PDFPagePanel extends JPanel
}
catch (IOException e)
{
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
}