svn commit: r1654364 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java

[tilman]

Author: tilman
Date: Fri Jan 23 20:23:44 2015
New Revision: 1654364

URL: http://svn.apache.org/r1654364
Log:
PDFBOX-2576: merge if statements

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java

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=1654364&r1=1654363&r2=1654364&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 
Fri Jan 23 20:23:44 2015
@@ -230,8 +230,12 @@ public class PDDocument implements Close
         if (signatureField == null)
         {
             signatureField = new PDSignatureField(acroForm);
-            signatureField.setSignature(sigObject); // append the signature 
object
-            signatureField.getWidget().setPage(page); // backward linking
+
+            // append the signature object
+            signatureField.setSignature(sigObject); 
+            
+            // backward linking
+            signatureField.getWidget().setPage(page); 
         }
 
         // Set the AcroForm Fields
@@ -387,7 +391,8 @@ public class PDDocument implements Close
         acroFormDict.setNeedToBeUpdate(true);
         if (!acroForm.isSignaturesExist())
         {
-            acroForm.setSignaturesExist(true); // 1 if at least one signature 
field is available
+            // 1 if at least one signature field is available
+            acroForm.setSignaturesExist(true); 
         }
 
         List<PDFieldTreeNode> field = acroForm.getFields();
@@ -397,7 +402,7 @@ public class PDDocument implements Close
             PDSignature sigObject = sigField.getSignature();
             sigField.getCOSObject().setNeedToBeUpdate(true);
 
-            // Check if the field already exist
+            // Check if the field already exists
             boolean checkFields = false;
             for (PDFieldTreeNode fieldNode : field)
             {
@@ -613,12 +618,9 @@ public class PDDocument implements Close
      */
     public PDEncryption getEncryption()
     {
-        if (encryption == null)
+        if (encryption == null && isEncrypted())
         {
-            if (isEncrypted())
-            {
-                encryption = new 
PDEncryption(document.getEncryptionDictionary());
-            }
+            encryption = new PDEncryption(document.getEncryptionDictionary());
         }
         return encryption;
     }