Non-textual objects may be extracted during the analysis phase of the signature verification process

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

1 files changed, 12 insertions, 7 deletions

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 df72a65..f98b0f0 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
@@ -53,8 +53,10 @@ import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;

 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;

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

+import at.knowcenter.wag.egov.egiz.pdf.ObjectExtractor;

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

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

+import at.knowcenter.wag.egov.egiz.pdf.TextualSignature;

 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;

 import at.knowcenter.wag.egov.egiz.sig.SignatureTypeDefinition;

 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;

@@ -280,10 +282,6 @@ public class PdfAsObject implements PdfAs
     fillVerifyAfterAnalysisParametersWithVerifyParameters(vaap, verifyParameters);

     VerifyResults res = verify(vaap);

     

-    if (verifyParameters.isReturnNonTextObjects()) {

-       res.setNonTextualObjects(PdfAS.extractNonTextualObjects(new PdfDataSourceAdapter(verifyParameters.getDocument())));    

-    }

-    

     return res;

     

   }

@@ -302,6 +300,7 @@ public class PdfAsObject implements PdfAs
   {

     ap.setDocument(vp.getDocument());

     ap.setVerifyMode(vp.getVerifyMode());

+    ap.setReturnNonTextualObjects(vp.isReturnNonTextualObjects());

   }

 

   /**

@@ -381,8 +380,12 @@ public class PdfAsObject implements PdfAs
         sigInfs.add(si);

       }

     }

+    List nonTextInfos = null;

+    if (analyzeParameters.isReturnNonTextualObjects()) {

+       nonTextInfos = ObjectExtractor.extractNonTextInfo(new PdfDataSourceAdapter(analyzeParameters.getDocument()));

+    }

     

-    return new AnalyzeResultImpl(sigInfs, noSigs);

+    return new AnalyzeResultImpl(sigInfs, noSigs, nonTextInfos);

   }

 

   /**

@@ -423,8 +426,10 @@ public class PdfAsObject implements PdfAs
       VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterAnalysisParameters.getVerificationTime());

       vrs.add(vr);

     }

-

-    return new VerifyResultsImpl(vrs);

+    

+    VerifyResultsImpl verifyResults = new VerifyResultsImpl(vrs); 

+    verifyResults.setNonTextualObjects(verifyAfterAnalysisParameters.getAnalyzeResult().getNonTextualObjects());

+    return verifyResults;

   }

 

 }