2 files changed, 45 insertions, 5 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 3b5d0a6..704f9fd 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
@@ -45,6 +45,7 @@ import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 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.SignatureHolder;
 import at.knowcenter.wag.egov.egiz.pdf.TablePos;
 import at.knowcenter.wag.egov.egiz.sig.SignatureResponse;
@@ -268,16 +269,24 @@ public class PdfAsObject implements PdfAs
     ExtractionStage es = new ExtractionStage();
     List signature_holders = es.extractSignatureHolders(inputDataSource, parameters);
 
-    List sigInfs = new ArrayList(signature_holders.size());
+//    List sigInfs = new ArrayList(signature_holders.size());
+    List sigInfs = new ArrayList();
+    List noSigs = new ArrayList();
     Iterator it = signature_holders.iterator();
     while (it.hasNext())
     {
       SignatureHolder sh = (SignatureHolder)it.next();
-      SignatureInformation si = new SignatureInformationAdapter(sh);
-      sigInfs.add(si);
+      
+      if(sh instanceof NoSignatureHolder) {
+        noSigs.add(sh);
+      } else {
+      
+        SignatureInformation si = new SignatureInformationAdapter(sh);
+        sigInfs.add(si);
+      }
     }
     
-    return new AnalyzeResultImpl(sigInfs);
+    return new AnalyzeResultImpl(sigInfs, noSigs);
   }
 
   /**
@@ -308,7 +317,7 @@ public class PdfAsObject implements PdfAs
     {
       SignatureResponse response = (SignatureResponse) results.get(i);
       SignatureHolder holder = (SignatureHolder) signature_holders.get(i);
-      
+
       VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterAnalysisParameters.getVerificationTime());
       vrs.add(vr);
     }
diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/analyze/AnalyzeResultImpl.java b/src/main/java/at/gv/egiz/pdfas/impl/api/analyze/AnalyzeResultImpl.java
index 87a14f0..7b1dffa 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/analyze/AnalyzeResultImpl.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/analyze/AnalyzeResultImpl.java
@@ -19,6 +19,32 @@ public class AnalyzeResultImpl implements AnalyzeResult
    * The found signatures.
    */
   protected List signatures = null;
+  
+  /**
+   * The found non-signature update blocks.
+   */
+  protected List noSignatures = null;
+  
+
+  /**
+   * Constructor.
+   * 
+   * @param signatures
+   *          The found signatures.
+   * @param noSignatures
+   *          The found non-signature update blocks.             
+   */
+  public AnalyzeResultImpl(List signatures, List noSignatures)
+  {
+    if (signatures == null)
+    {
+      throw new IllegalArgumentException("The list of found signatures must not be null.");
+    }
+
+    this.signatures = signatures;
+    this.noSignatures = noSignatures;
+  }
+  
 
   /**
    * Constructor.
@@ -44,4 +70,9 @@ public class AnalyzeResultImpl implements AnalyzeResult
     return this.signatures;
   }
 
+  public List getNoSignatures() {
+    
+    return this.noSignatures;
+  }
+  
 }