From b66d68d7f93c4a92f1b614ce9913368b97dd8423 Mon Sep 17 00:00:00 2001
From: ferbas <ferbas@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 13 Nov 2009 12:58:19 +0000
Subject: added timestamp support

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@405 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../egov/egiz/framework/signators/BinarySignator_1_0_0.java | 13 ++++++-------
 .../egiz/framework/signators/TextualSignator_1_0_0.java     |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov')

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
index 1c90aef..3e300ee 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/BinarySignator_1_0_0.java
@@ -24,10 +24,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import at.gv.egiz.pdfas.impl.input.CompoundPdfDataSourceImpl;
-import at.gv.egiz.pdfas.impl.signator.IncrementalUpdateHelper;
 import at.gv.egiz.pdfas.framework.input.DataSource;
 import at.gv.egiz.pdfas.framework.input.PdfDataSource;
+import at.gv.egiz.pdfas.impl.input.CompoundPdfDataSourceImpl;
+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.PDFDocumentException;
@@ -46,7 +46,6 @@ import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl;
 import at.knowcenter.wag.egov.egiz.sig.SignatureFieldDefinition;
 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;
 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
-import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObjectHelper;
 import at.knowcenter.wag.exactparser.ByteArrayUtils;
 
 import com.lowagie.text.pdf.PdfPTable;
@@ -102,7 +101,7 @@ public class BinarySignator_1_0_0 implements Signator
     try
     {
       SignatureObject signature_object = PdfAS.createSignatureObjectFromType(signature_type);
-      signature_object.fillValues((char) BinarySignature.LAYOUT_PLACEHOLDER, has_SIG_ID);
+      signature_object.fillValues((char) BinarySignature.LAYOUT_PLACEHOLDER, has_SIG_ID, false);
 
       signature_object.setKZ(getMyId());
 
@@ -124,7 +123,7 @@ public class BinarySignator_1_0_0 implements Signator
           variable_field_definitions.add(sfd);
         }
       }
-      IncrementalUpdateInformation iui = IncrementalUpdateHelper.writeIncrementalUpdate(pdf, pdf_table, signature_type, pi, variable_field_definitions, all_field_definitions);
+      IncrementalUpdateInformation iui = IncrementalUpdateHelper.writeIncrementalUpdate(pdf, pdf_table, signature_type, pi, variable_field_definitions, all_field_definitions, null);
 
       String temp_string = iui.temp_ir_number + " " + iui.temp_ir_generation + " obj"; //$NON-NLS-1$//$NON-NLS-2$
       byte[] temp_bytes = temp_string.getBytes("US-ASCII"); //$NON-NLS-1$
@@ -203,8 +202,8 @@ public class BinarySignator_1_0_0 implements Signator
     while (it.hasNext())
     {
       ReplaceInfo ri = (ReplaceInfo) it.next();
-
-      ri.value = SignSignatureObjectHelper.retrieveStringValueFromSignatureObject(iui.signed_signature_object, ri.sfd.field_name);
+      
+      ri.value = iui.signed_signature_object.retrieveStringValue(ri.sfd.field_name);
     }
   }
 
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 99ba28b..a15250a 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
@@ -115,7 +115,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 = IncrementalUpdateHelper.writeIncrementalUpdate(iui.original_document, pdf_table, iui.signature_type, pi, null, null);
+    IncrementalUpdateInformation signed_iui = IncrementalUpdateHelper.writeIncrementalUpdate(iui.original_document, pdf_table, iui.signature_type, pi, null, null, null);
 
     SignResult sign_result = new SignResult(PdfAS.PDF_MIME_TYPE, signed_iui.signed_pdf);
     return sign_result;
-- 
cgit v1.2.3