Error code created for protected pdf documents.

SettingsReader: Debug message for getInternalResource added (TRACE)
multipart/formdata: align multipart charset with data charset
added FIXME notes for FileHelper.readFromFile
Signature/Verification-Demo updated


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

1 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TextualSignature.java b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TextualSignature.java
index d5b3c5d..c2a253b 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TextualSignature.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/pdf/TextualSignature.java
@@ -27,11 +27,12 @@ import org.pdfbox.pdfparser.PDFParser;
 import org.pdfbox.pdmodel.PDDocument;

 import org.pdfbox.util.PDFTextStripper;

 

-import at.gv.egiz.pdfas.exceptions.pdf.TextExtractionException;

+import at.gv.egiz.pdfas.exceptions.ErrorCode;

 import at.gv.egiz.pdfas.framework.input.PdfDataSource;

 import at.gv.egiz.pdfas.performance.PerformanceCounters;

 import at.knowcenter.wag.egov.egiz.cfg.ConfigLogger;

 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;

+import at.knowcenter.wag.egov.egiz.exceptions.PDFDocumentException;

 

 import com.lowagie.text.Document;

 import com.lowagie.text.DocumentException;

@@ -59,10 +60,11 @@ public class TextualSignature
    * @param pdf_stream

    *          The pdf_input stream.

    * @return Returns the extracted document text.

+ * @throws PDFDocumentException 

    * @throws TextExtractionException

    *           Forwarded exception.

    */

-  public static String extractTextTextual(PdfDataSource pdfDataSource) throws TextExtractionException

+  public static String extractTextTextual(PdfDataSource pdfDataSource) throws PDFDocumentException 

   {

     PerformanceCounters.textExtractions.increment();

     

@@ -85,7 +87,7 @@ public class TextualSignature
         PdfReader reader = new PdfReader(pdf_data);

         if (!reader.isOpenedWithFullPermissions()) {

            // cannot perform modification and extraction

-           throw new TextExtractionException("Document is protected");

+           throw new PDFDocumentException(ErrorCode.DOCUMENT_IS_PROTECTED, "Document is protected.");

            

         }

         //pdf_stream.close();

@@ -178,15 +180,15 @@ public class TextualSignature
     }

     catch (IllegalArgumentException e)

     {

-      throw new TextExtractionException(e);

+       throw new PDFDocumentException(ErrorCode.DOCUMENT_CANNOT_BE_READ, e);

     }

     catch (IOException e)

     {

-      throw new TextExtractionException(e);

+      throw new PDFDocumentException(ErrorCode.DOCUMENT_CANNOT_BE_READ, e);

     }

     catch (DocumentException e)

     {

-      throw new TextExtractionException(e);

+       throw new PDFDocumentException(ErrorCode.DOCUMENT_CANNOT_BE_READ, e);

     }

   }