svn commit: r1846537 - /pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java

[tilman]

Author: tilman
Date: Tue Nov 13 19:46:51 2018
New Revision: 1846537

URL: http://svn.apache.org/viewvc?rev=1846537&view=rev
Log:
PDFBOX-4071: simplify

Modified:
    
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java

Modified: 
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java?rev=1846537&r1=1846536&r2=1846537&view=diff
==============================================================================
--- 
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
 (original)
+++ 
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/AddValidationInformation.java
 Tue Nov 13 19:46:51 2018
@@ -35,7 +35,6 @@ import org.apache.commons.logging.LogFac
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSInteger;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSStream;
 import org.apache.pdfbox.cos.COSUpdateInfo;
@@ -198,7 +197,7 @@ public class AddValidationInformation
     private void addRevocationData(CertSignatureInformation certInfo) throws 
IOException
     {
         COSDictionary vri = new COSDictionary();
-        vriBase.setItem(COSName.getPDFName(certInfo.getSignatureHash()), vri);
+        vriBase.setItem(certInfo.getSignatureHash(), vri);
 
         correspondingOCSPs = new COSArray();
         correspondingCRLs = new COSArray();
@@ -207,11 +206,11 @@ public class AddValidationInformation
 
         if (correspondingOCSPs.size() > 0)
         {
-            vri.setItem(COSName.getPDFName("OCSP"), correspondingOCSPs);
+            vri.setItem("OCSP", correspondingOCSPs);
         }
         if (correspondingCRLs.size() > 0)
         {
-            vri.setItem(COSName.getPDFName("CRL"), correspondingCRLs);
+            vri.setItem("CRL", correspondingCRLs);
         }
 
         if (certInfo.getTsaCerts() != null)
@@ -439,16 +438,16 @@ public class AddValidationInformation
     {
         COSDictionary dssExtensions = new COSDictionary();
         dssExtensions.setDirect(true);
-        catalog.getCOSObject().setItem(COSName.getPDFName("Extensions"), 
dssExtensions);
+        catalog.getCOSObject().setItem("Extensions", dssExtensions);
 
         COSDictionary adbeExtension = new COSDictionary();
         adbeExtension.setDirect(true);
-        dssExtensions.setItem(COSName.getPDFName("ADBE"), adbeExtension);
+        dssExtensions.setItem("ADBE", adbeExtension);
 
-        adbeExtension.setItem(COSName.getPDFName("BaseVersion"), 
COSName.getPDFName("1.7"));
-        adbeExtension.setItem(COSName.getPDFName("ExtensionLevel"), 
COSInteger.get(5));
+        adbeExtension.setName("BaseVersion", "1.7");
+        adbeExtension.setInt("ExtensionLevel", 5);
 
-        catalog.getCOSObject().setItem(COSName.getPDFName("Version"), 
COSName.getPDFName("1.7"));
+        catalog.setVersion("1.7");
     }
 
     public static void main(String[] args) throws IOException, 
GeneralSecurityException