added annotation extraction with pdfbox 0.8.0

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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
index 621b96f..43f7f14 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/PdfAS.java
@@ -60,6 +60,7 @@ import at.knowcenter.wag.egov.egiz.framework.FoundBlock;
 import at.knowcenter.wag.egov.egiz.framework.FoundKey;

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

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

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

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

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

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

@@ -1091,21 +1092,22 @@ public abstract class PdfAS
 //    return extractNormalizedTextTextual(pdf, pdf.length);

 //  }

 

+

   /**

    * 

    * @param pdfDs

    * @return List of {@link NonTextObjectInfo}

    */

   public static List extractNonTextualObjects(PdfDataSource pdfDs) {

-     return TextualSignature.extractNonTextInfo(pdfDs);

+     return ObjectExtractor.extractNonTextInfo(pdfDs);

   }

   

   

   public static String extractNormalizedTextTextual(PdfDataSource pdfDataSource) throws PresentableException

   {

-    String raw_document_text = TextualSignature.extractTextTextual(pdfDataSource);

-    String document_text = normalizeText(raw_document_text);

-    return document_text;   

+     String raw_document_text = TextualSignature.extractTextTextual(pdfDataSource);

+     String document_text = normalizeText(raw_document_text);

+     return document_text;   

   }

   /**

   @deprecated