Removed unnecessary parameters from ReconstructXMLDsigAfterAnalysisParameters; Added getReconstructedXMLDsig() method to VerifyResult

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@700 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 13 insertions, 1 deletions

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/verify/VerifyResultAdapter.java b/src/main/java/at/gv/egiz/pdfas/impl/api/verify/VerifyResultAdapter.java
index b640bc7..265c916 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/verify/VerifyResultAdapter.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/verify/VerifyResultAdapter.java
@@ -14,6 +14,7 @@ import org.apache.commons.logging.LogFactory;
 import at.gv.egiz.pdfas.api.exceptions.PdfAsException;

 import at.gv.egiz.pdfas.api.verify.SignatureCheck;

 import at.gv.egiz.pdfas.api.verify.VerifyResult;

+import at.gv.egiz.pdfas.api.xmldsig.XMLDsigData;

 import at.gv.egiz.pdfas.impl.api.commons.SignatureInformationAdapter;

 import at.knowcenter.wag.egov.egiz.exceptions.SettingNotFoundException;

 import at.knowcenter.wag.egov.egiz.pdf.BinarySignatureHolder;

@@ -38,6 +39,8 @@ public class VerifyResultAdapter extends SignatureInformationAdapter implements
   protected Date vTime = null;

 

   private String timestamp;

+

+  private XMLDsigData xmlDsigData;

   

 

   /**

@@ -49,12 +52,14 @@ public class VerifyResultAdapter extends SignatureInformationAdapter implements
    *          The SignatureHolder.

    * @param verificationTime

    *          The time of verification. This is directly returned by {@link #getVerificationTime()}

+ * @param xmlDsigData 

    */

-  public VerifyResultAdapter(SignatureResponse sigRes, SignatureHolder sh, Date verificationTime)

+  public VerifyResultAdapter(SignatureResponse sigRes, SignatureHolder sh, Date verificationTime, XMLDsigData xmlDsigData)

   {

     super(sh);

     this.sigRes = sigRes;

     this.vTime = verificationTime;

+    this.xmlDsigData = xmlDsigData;

     if (sh instanceof BinarySignatureHolder) {

        this.timestamp = ((BinarySignatureHolder)sh).getSignatureObject().getTimeStamp();

     }    

@@ -169,5 +174,12 @@ public class VerifyResultAdapter extends SignatureInformationAdapter implements
    public boolean isVerificationDone() {

       return this.sigRes.getVerificationImpossibleEx() == null;

    }

+

+   /**

+    * @see VerifyResult#getReconstructedXMLDsig()

+    */

+   public XMLDsigData getReconstructedXMLDsig() {

+      return this.xmlDsigData;

+   }

   

 }