From 1faaccc18a3ccbc7b827da8956fb9783e9713228 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 10 Dec 2010 13:08:35 +0000
Subject: 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
---
 src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java')

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index dc6e106..1cb158e 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -370,9 +370,7 @@ public class PdfAsObject implements PdfAs
       ReconstructXMLDsigAfterAnalysisParameters reconstructParams,
       VerifyAfterAnalysisParameters verifyAfterAnalysisParameters) {
     reconstructParams.setAnalyzeResult(verifyAfterAnalysisParameters.getAnalyzeResult());
-    reconstructParams.setReturnHashInputData(verifyAfterAnalysisParameters.isReturnHashInputData());
     reconstructParams.setSignatureDevice(verifyAfterAnalysisParameters.getSignatureDevice());
-    reconstructParams.setVerificationTime(verifyAfterAnalysisParameters.getVerificationTime());
   }
 
   /**
@@ -515,20 +513,12 @@ public class PdfAsObject implements PdfAs
     AnalyzeResult ar = analyze(analyzeParameters);
     
     ReconstructXMLDsigAfterAnalysisParameters rxaap = new ReconstructXMLDsigAfterAnalysisParameters();
-    fillReconstructXMLDsigAfterAnalysisParametersWithReconstructXMLDsigParameters(rxaap, reconstructXMLDsigParameters);
+    rxaap.setSignatureDevice(reconstructXMLDsigParameters.getSignatureDevice());
     rxaap.setAnalyzeResult(ar);
     
     return reconstructXMLDSIG(rxaap);
   }
 
-  protected void fillReconstructXMLDsigAfterAnalysisParametersWithReconstructXMLDsigParameters(
-      ReconstructXMLDsigAfterAnalysisParameters rxaap,
-      ReconstructXMLDsigParameters reconstructXMLDsigParameters) {
-    rxaap.setReturnHashInputData(reconstructXMLDsigParameters.isReturnHashInputData());
-    rxaap.setSignatureDevice(reconstructXMLDsigParameters.getSignatureDevice());
-    rxaap.setVerificationTime(reconstructXMLDsigParameters.getVerificationTime());
-  }
-
   /**
    * @see PdfAs#reconstructXMLDSIG(ReconstructXMLDsigAfterAnalysisParameters)
    */
@@ -579,7 +569,7 @@ public class PdfAsObject implements PdfAs
             ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(i);
             SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();
     
-            VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());
+            VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime(), extSigInfo.getXmlDsigData());
             vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());
     
             vrs.add(vr);
@@ -589,7 +579,7 @@ public class PdfAsObject implements PdfAs
            ExtendedSignatureInformation extSigInfo = (ExtendedSignatureInformation)extSignatures.get(verifySignatureIndex);
            SignatureHolder holder = (SignatureHolder) extSigInfo.getSignatureInformation().getInternalSignatureInformation();
    
-           VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime());
+           VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterReconstructXMLDsigParameters.getVerificationTime(), extSigInfo.getXmlDsigData());
            vr.setNonTextualObjects( extSigInfo.getSignatureInformation().getNonTextualObjects());
    
            vrs.add(vr);
-- 
cgit v1.2.3