From 8ba10b6fa16c78ec3a8661d7b050320971495405 Mon Sep 17 00:00:00 2001
From: ferbas <ferbas@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Thu, 10 Dec 2009 14:23:21 +0000
Subject: improved nonObjectExtraction. Use per signature basis

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@506 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java    | 12 ------------
 .../egiz/pdfas/api/commons/SignatureInformation.java   | 18 ++++++++++++++++++
 .../java/at/gv/egiz/pdfas/api/verify/VerifyResult.java | 15 +++++++++++++++
 .../at/gv/egiz/pdfas/api/verify/VerifyResults.java     | 18 +-----------------
 4 files changed, 34 insertions(+), 29 deletions(-)

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

diff --git a/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java b/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java
index c9dde9e..a1aabb4 100644
--- a/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java
+++ b/src/main/java/at/gv/egiz/pdfas/api/analyze/AnalyzeResult.java
@@ -30,17 +30,5 @@ public interface AnalyzeResult
   
   public List getNoSignatures();
 
-  /**
-   * Returns non textual data from pdf provided that {@link AnalyzeParameters#setReturnNonTextualObjects(boolean)}
-   * has been set {@code true}. 
-   * @return List of {@link NonTextObjectInfo}
-   */
-  public List getNonTextualObjects();
-
-  /**
-   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.
-   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.
-   */
-  public boolean hasNonTextualObjects();
   
 }
diff --git a/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java b/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java
index 8eef6e8..3b05685 100644
--- a/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java
+++ b/src/main/java/at/gv/egiz/pdfas/api/commons/SignatureInformation.java
@@ -19,7 +19,9 @@ package at.gv.egiz.pdfas.api.commons;
 
 import java.security.cert.X509Certificate;
 import java.util.Date;
+import java.util.List;
 
+import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;
 import at.gv.egiz.pdfas.api.io.DataSource;
 
 /**
@@ -99,5 +101,21 @@ public interface SignatureInformation
    * @return 
    */
   public String getTimeStampValue();
+  
+  /**
+   * Returns a list<{@link NonTextObjectInfo}> of non textual objects in the pdf document.
+   * Only available for textual signatures. Show this to the user who signed the textual content only! 
+   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)
+   */
+  public List getNonTextualObjects();
+  
+  public void setNonTextualObjects(List nonTextualObjects);
+
+  /**
+   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   */
+  public boolean hasNonTextualObjects();
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java b/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java
index 34fbcd1..9455a2d 100644
--- a/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java
+++ b/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResult.java
@@ -3,6 +3,7 @@ package at.gv.egiz.pdfas.api.verify;
 import java.util.Date;
 import java.util.List;
 
+import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;
 import at.gv.egiz.pdfas.api.commons.SignatureInformation;
 
 /**
@@ -113,6 +114,20 @@ public interface VerifyResult extends SignatureInformation
    * @see SignatureInformation#getSignedData()
    */
   public String getHashInputData();
+  
+  /**
+   * Returns a list<{@link NonTextObjectInfo}> of non textual objects in the pdf document.
+   * Only available for textual signatures. Show this to the user who signed the textual content only! 
+   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)
+   */
+  public List getNonTextualObjects();
+  
+
+  /**
+   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.
+   */
+  public boolean hasNonTextualObjects();
 
 
 }
diff --git a/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java b/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java
index ef06880..d2f79b3 100644
--- a/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java
+++ b/src/main/java/at/gv/egiz/pdfas/api/verify/VerifyResults.java
@@ -5,8 +5,6 @@ package at.gv.egiz.pdfas.api.verify;
 
 import java.util.List;
 
-import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;
-
 /**
  * The result of the verification of a document.
  * 
@@ -26,19 +24,5 @@ public interface VerifyResults
    *         signature.
    */
   public List getResults();
-  
-  /**
-   * Returns a list<{@link NonTextObjectInfo}> of non textual objects in the pdf document.
-   * Only available for textual signatures. Show this to the user who signed the textual content only! 
-   * @return  List<{@link NonTextObjectInfo} or <tt>null</tt> of not available (binary signature)
-   */
-  public List getNonTextualObjects();
-  
-
-  /**
-   * Returns <code>true</code> if non textual objects have been found, <code>false</code> if not.
-   * @return <code>true</code> if non textual objects have been found, <code>false</code> if not.
-   */
-  public boolean hasNonTextualObjects();
-  
+    
 }
-- 
cgit v1.2.3