improved nonObjectExtraction. Use per signature basis

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

2 files changed, 16 insertions, 17 deletions

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();

-  

+    

 }