svn commit: r1753567 - in /pdfbox/trunk/examples/src: main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java

[ti...@apache.org]

Author: tilman
Date: Wed Jul 20 17:02:21 2016
New Revision: 1753567

URL: http://svn.apache.org/viewvc?rev=1753567&view=rev
Log:
PDFBOX-3017: close image stream, clarify variable names

Modified:
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java
    pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java

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=1753567&r1=1753566&r2=1753567&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 Jul 20 17:02:21 2016
@@ -52,10 +52,10 @@ public class CreateVisibleSignature exte
     private final PDVisibleSigProperties visibleSignatureProperties = new PDVisibleSigProperties();
 
     public void setvisibleSignDesigner(String filename, int x, int y, int zoomPercent, 
-            FileInputStream image, int page) 
+            FileInputStream imageStream, int page) 
             throws IOException
     {
-        visibleSignDesigner = new PDVisibleSignDesigner(filename, image, page);
+        visibleSignDesigner = new PDVisibleSignDesigner(filename, imageStream, page);
         visibleSignDesigner.xAxis(x).yAxis(y).zoom(zoomPercent).signatureFieldName("signature");
     }
     
@@ -204,7 +204,7 @@ public class CreateVisibleSignature exte
 
         CreateVisibleSignature signing = new CreateVisibleSignature(keystore, pin.clone());
 
-        FileInputStream image = new FileInputStream(args[3]);
+        FileInputStream imageStream = new FileInputStream(args[3]);
 
         String name = documentFile.getName();
         String substring = name.substring(0, name.lastIndexOf('.'));
@@ -212,7 +212,8 @@ public class CreateVisibleSignature exte
 
         // page is 1-based here
         int page = 1;
-        signing.setvisibleSignDesigner (args[2], 0, 0, -50, image, page);
+        signing.setvisibleSignDesigner (args[2], 0, 0, -50, imageStream, page);
+        imageStream.close();
         signing.setVisibleSignatureProperties ("name", "location", "Security", 0, page, true);
         signing.signPDF(documentFile, signedDocumentFile, tsaClient);
     }

Modified: pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java?rev=1753567&r1=1753566&r2=1753567&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java (original)
+++ pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java Wed Jul 20 17:02:21 2016
@@ -79,6 +79,8 @@ public class TestCreateSignature extends
      *
      * @throws IOException
      * @throws GeneralSecurityException
+     * @throws CMSException
+     * @throws OperatorCreationException
      */
     public void testDetachedSHA256()
             throws IOException, CMSException, OperatorCreationException, GeneralSecurityException
@@ -105,6 +107,8 @@ public class TestCreateSignature extends
      *
      * @throws IOException
      * @throws GeneralSecurityException
+     * @throws CMSException
+     * @throws OperatorCreationException
      */
     public void testDetachedSHA256WithTSA()
             throws IOException, CMSException, OperatorCreationException, GeneralSecurityException
@@ -153,6 +157,8 @@ public class TestCreateSignature extends
      * Test creating visual signature.
      *
      * @throws IOException
+     * @throws CMSException
+     * @throws OperatorCreationException
      * @throws GeneralSecurityException
      */
     public void testCreateVisibleSignature()
@@ -170,6 +176,7 @@ public class TestCreateSignature extends
         signing.setVisibleSignatureProperties("name", "location", "Security", 0, 1, true);
         File destFile = new File(outDir + "signed_visible.pdf");
         signing.signPDF(new File(inPath), destFile, null);
+        fis.close();
 
         checkSignature(destFile);
     }