Author: tilman
Date: Sun May 3 14:52:56 2015
New Revision: 1677412
URL: http://svn.apache.org/r1677412
Log:
PDFBOX-2576: refactored to remove unused document field
Modified:
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/SecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java?rev=1677412&r1=1677411&r2=1677412&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 14:52:56 2015
@@ -78,9 +78,6 @@ public abstract class SecurityHandler
/** The encryption key that will used to encrypt / decrypt.*/
protected byte[] encryptionKey;
- /** The document whose security is handled by this security handler.*/
- protected PDDocument document;
-
/** The RC4 implementation used for cryptographic functions. */
protected RC4Cipher rc4 = new RC4Cipher();
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=1677412&r1=1677411&r2=1677412&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 14:52:56 2015
@@ -319,14 +319,13 @@ public final class StandardSecurityHandl
/**
* Prepare document for encryption.
*
- * @param doc The documeent to encrypt.
+ * @param document The documeent to encrypt.
*
* @throws IOException If there is an error accessing data.
*/
@Override
- public void prepareDocumentForEncryption(PDDocument doc) throws IOException
+ public void prepareDocumentForEncryption(PDDocument document) throws IOException
{
- document = doc;
PDEncryption encryptionDictionary = document.getEncryption();
if(encryptionDictionary == null)
{
@@ -373,8 +372,8 @@ public final class StandardSecurityHandl
}
else
{
- prepareEncryptionDictRev2345(ownerPassword, userPassword, encryptionDictionary, permissionInt,
- revision, length);
+ prepareEncryptionDictRev2345(ownerPassword, userPassword, encryptionDictionary, permissionInt,
+ document, revision, length);
}
document.setEncryptionDictionary( encryptionDictionary );
@@ -476,7 +475,8 @@ public final class StandardSecurityHandl
}
private void prepareEncryptionDictRev2345(String ownerPassword, String userPassword,
- PDEncryption encryptionDictionary, int permissionInt, int revision, int length)
+ PDEncryption encryptionDictionary, int permissionInt, PDDocument document,
+ int revision, int length)
throws IOException
{
COSArray idArray = document.getDocument().getDocumentID();