Performance

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

1 files changed, 9 insertions, 14 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/TextualSignator_1_0_0.java b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/TextualSignator_1_0_0.java
index 7fe9e4f..33de15e 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/TextualSignator_1_0_0.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/TextualSignator_1_0_0.java
@@ -17,15 +17,16 @@
  */

 package at.knowcenter.wag.egov.egiz.framework.signators;

 

-import java.io.UnsupportedEncodingException;

-

+import at.gv.egiz.pdfas.framework.input.DataSource;

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

+import at.gv.egiz.pdfas.impl.input.TextDataSourceImpl;

+import at.gv.egiz.pdfas.impl.signator.IncrementalUpdateHelper;

 import at.knowcenter.wag.egov.egiz.PdfAS;

 import at.knowcenter.wag.egov.egiz.PdfASID;

 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;

 import at.knowcenter.wag.egov.egiz.framework.SignResult;

 import at.knowcenter.wag.egov.egiz.framework.Signator;

 import at.knowcenter.wag.egov.egiz.framework.SignatorFactory;

-import at.knowcenter.wag.egov.egiz.pdf.BinarySignature;

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

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

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

@@ -80,7 +81,7 @@ public class TextualSignator_1_0_0 implements Signator
    * @see at.knowcenter.wag.egov.egiz.framework.Signator#prepareSign(byte[],

    *      String, TablePos, boolean)

    */

-  public IncrementalUpdateInformation prepareSign(byte[] pdf,

+  public IncrementalUpdateInformation prepareSign(PdfDataSource pdf,

       String signature_type, TablePos pos, boolean has_SIG_ID) throws PresentableException

   {

     IncrementalUpdateInformation iui = new IncrementalUpdateInformation();

@@ -88,17 +89,11 @@ public class TextualSignator_1_0_0 implements Signator
     iui.signature_type = signature_type;

     iui.pos = pos;

 

-    String document_text = PdfAS.extractNormalizedTextTextual(pdf);

+    String document_text = PdfAS.extractNormalizedTextTextual(pdf.createInputStream());

     // logger_.debug("signed_text = " + document_text);

     

-    try

-    {

-      iui.signature_data = new SignatureDataImpl(document_text.getBytes("UTF-8"), "text/plain", "UTF-8");

-    }

-    catch (UnsupportedEncodingException e)

-    {

-      throw new RuntimeException("Very strange: UTF-8 character encoding not supported???"); //$NON-NLS-1$

-    }

+    DataSource ds = new TextDataSourceImpl(document_text);

+    iui.signature_data = new SignatureDataImpl(ds, "text/plain", "UTF-8");

 

     return iui;

   }

@@ -118,7 +113,7 @@ public class TextualSignator_1_0_0 implements Signator
 

     PositioningInstruction pi = PdfAS.determineTablePositioning(iui.pos, iui.signature_type, iui.original_document, pdf_table);

 

-    IncrementalUpdateInformation signed_iui = BinarySignature.writeIncrementalUpdate(iui.original_document, pdf_table, pi, null, null);

+    IncrementalUpdateInformation signed_iui = IncrementalUpdateHelper.writeIncrementalUpdate(iui.original_document, pdf_table, pi, null, null);

 

     SignResult sign_result = new SignResult(PdfAS.PDF_MIME_TYPE, signed_iui.signed_pdf);

     return sign_result;