svn commit: r1677414 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption: PublicKeySecurityHandler.java SecurityHandler.java StandardSecurityHandler.java

[tilman]

Author: tilman
Date: Sun May  3 15:19:11 2015
New Revision: 1677414

URL: http://svn.apache.org/r1677414
Log:
PDFBOX-2576: refactored to make field decryptMetadata private

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java?rev=1677414&r1=1677413&r2=1677414&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
 Sun May  3 15:19:11 2015
@@ -128,7 +128,7 @@ public final class PublicKeySecurityHand
                     "Provided decryption material is not compatible with the 
document");
         }
 
-        decryptMetadata = encryption.isEncryptMetaData();
+        setDecryptMetadata(encryption.isEncryptMetaData());
         if (encryption.getLength() != 0)
         {
             this.keyLength = encryption.getLength();

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1677414&r1=1677413&r2=1677414&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
 Sun May  3 15:19:11 2015
@@ -79,7 +79,7 @@ public abstract class SecurityHandler
     protected RC4Cipher rc4 = new RC4Cipher();
 
     /** indicates if the Metadata have to be decrypted of not. */ 
-    protected boolean decryptMetadata; 
+    private boolean decryptMetadata; 
     
     private final Set<COSBase> objects = new HashSet<COSBase>();
 
@@ -92,6 +92,16 @@ public abstract class SecurityHandler
     protected AccessPermission currentAccessPermission = null;
 
     /**
+     * Set wether to decrypt meta data.
+     *
+     * @param decryptMetadata true if meta data has to be decrypted.
+     */
+    protected void setDecryptMetadata(boolean decryptMetadata)
+    {
+        this.decryptMetadata = decryptMetadata;
+    }   
+
+    /**
      * Prepare the document for encryption.
      *
      * @param doc The document that will be encrypted.

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java?rev=1677414&r1=1677413&r2=1677414&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
 Sun May  3 15:19:11 2015
@@ -164,8 +164,7 @@ public final class StandardSecurityHandl
         {
             throw new IOException("Decryption material is not compatible with 
the document");
         }
-        decryptMetadata = encryption.isEncryptMetaData();
-
+        setDecryptMetadata(encryption.isEncryptMetaData());
         StandardDecryptionMaterial material = 
(StandardDecryptionMaterial)decryptionMaterial;
 
         String password = material.getPassword();