svn commit: r1707896 - in /pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature: CreateSignature.java CreateSignatureBase.java CreateVisibleSignature.java

[ti...@apache.org]

Author: tilman
Date: Sat Oct 10 16:36:42 2015
New Revision: 1707896

URL: http://svn.apache.org/viewvc?rev=1707896&view=rev
Log:
PDFBOX-3011: make fields private, add getter and setters

Modified:
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateVisibleSignature.java

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java?rev=1707896&r1=1707895&r2=1707896&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignature.java Sat Oct 10 16:36:42 2015
@@ -91,9 +91,9 @@ public class CreateSignature extends Cre
         {
             throw new KeyStoreException("Keystore is empty");
         }
-        privateKey = (PrivateKey) keystore.getKey(alias, password);
+        setPrivateKey((PrivateKey) keystore.getKey(alias, password));
         Certificate[] certificateChain = keystore.getCertificateChain(alias);
-        certificate = certificateChain[0];
+        setCertificate(certificateChain[0]);
     }
 
     /**
@@ -142,7 +142,7 @@ public class CreateSignature extends Cre
     public void signDetached(PDDocument document, OutputStream output, TSAClient tsaClient)
             throws IOException
     {
-        this.tsaClient = tsaClient;
+        setTsaClient(tsaClient);
 
         // create signature dictionary
         PDSignature signature = new PDSignature();
@@ -202,7 +202,7 @@ public class CreateSignature extends Cre
             vector = unsignedAttributes.toASN1EncodableVector();
         }
 
-        byte[] token = tsaClient.getTimeStampToken(signer.getSignature());
+        byte[] token = getTsaClient().getTimeStampToken(signer.getSignature());
         ASN1ObjectIdentifier oid = PKCSObjectIdentifiers.id_aa_signatureTimeStampToken;
         ASN1Encodable signatureTimeStamp = new Attribute(oid, new DERSet(ASN1Primitive.fromByteArray(token)));
 

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java?rev=1707896&r1=1707895&r2=1707896&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java Sat Oct 10 16:36:42 2015
@@ -40,9 +40,29 @@ import org.bouncycastle.util.Store;
 
 public abstract class CreateSignatureBase implements SignatureInterface
 {
-    protected PrivateKey privateKey;
-    protected Certificate certificate;
-    protected TSAClient tsaClient;
+    private PrivateKey privateKey;
+    private Certificate certificate;
+    private TSAClient tsaClient;
+
+    public void setPrivateKey(PrivateKey privateKey)
+    {
+        this.privateKey = privateKey;
+    }
+
+    public void setCertificate(Certificate certificate)
+    {
+        this.certificate = certificate;
+    }
+
+    public void setTsaClient(TSAClient tsaClient)
+    {
+        this.tsaClient = tsaClient;
+    }
+
+    public TSAClient getTsaClient()
+    {
+        return tsaClient;
+    }
 
     /**
      * Does nothing. Override this if needed.

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=1707896&r1=1707895&r2=1707896&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 Sat Oct 10 16:36:42 2015
@@ -90,8 +90,8 @@ public class CreateVisibleSignature exte
         {
             throw new IOException("Could not find alias");
         }
-        privateKey = (PrivateKey) keystore.getKey(alias, pin);
-        certificate = keystore.getCertificateChain(alias)[0];
+        setPrivateKey((PrivateKey) keystore.getKey(alias, pin));
+        setCertificate(keystore.getCertificateChain(alias)[0]);
     }
 
     /**