improved nonObjectExtraction. Use per signature basis

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

1 files changed, 3 insertions, 40 deletions

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 a50b7a1..154d73d 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
@@ -5,9 +5,7 @@ package at.gv.egiz.pdfas.impl.api.analyze;
 

 import java.util.List;

 

-import at.gv.egiz.pdfas.api.analyze.AnalyzeParameters;

 import at.gv.egiz.pdfas.api.analyze.AnalyzeResult;

-import at.gv.egiz.pdfas.api.analyze.NonTextObjectInfo;

 import at.gv.egiz.pdfas.api.exceptions.PdfAsException;

 

 /**

@@ -25,23 +23,8 @@ public class AnalyzeResultImpl implements AnalyzeResult
   /**

    * The found non-signature update blocks.

    */

-  protected List noSignatures = null;

+  protected List noSignatures = null;  

   

-  protected List nonTextualObjects = null;

-  

-

-  /**

-   * Constructor.

-   * 

-   * @param signatures

-   *          The found signatures.

-   * @param noSignatures

-   *          The found non-signature update blocks.             

-   */

-  public AnalyzeResultImpl(List signatures, List noSignatures)

-  {

-     this(signatures, noSignatures, null);

-  }

 

   /**

    * Constructor.

@@ -50,9 +33,8 @@ public class AnalyzeResultImpl implements AnalyzeResult
    *          The found signatures.

    * @param noSignatures

    *          The found non-signature update blocks.

-   * @param nonTextInfos Non textual data from pdf provided that {@link AnalyzeParameters#setReturnNonTextualObjects(boolean)} was set.              

    */

-  public AnalyzeResultImpl(List signatures, List noSignatures, List nonTextInfos)

+  public AnalyzeResultImpl(List signatures, List noSignatures)

   {

     if (signatures == null)

     {

@@ -60,8 +42,7 @@ public class AnalyzeResultImpl implements AnalyzeResult
     }

 

     this.signatures = signatures;

-    this.noSignatures = noSignatures;

-    this.nonTextualObjects = nonTextInfos;

+    this.noSignatures = noSignatures;   

   }

   

 

@@ -94,22 +75,4 @@ public class AnalyzeResultImpl implements AnalyzeResult
     return this.noSignatures;

   }

 

-

-  /**

-   * 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() {

-     return this.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() {

-   return this.nonTextualObjects != null && !this.nonTextualObjects.isEmpty();

-  }

-  

 }