From 61a2d23ef72630934c603fe9ffb96ebebff6ee09 Mon Sep 17 00:00:00 2001 From: netconomy Date: Thu, 29 Nov 2007 12:00:22 +0000 Subject: PDF-AS API git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@233 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- .../pdfas/impl/signator/IncrementalUpdateHelper.java | 8 ++++---- .../signator/binary/BinarySignatorInformation.java | 19 +++++++++++++++++++ .../impl/signator/binary/BinarySignator_1_0_0.java | 2 ++ .../signator/textual/TextualSignatorInformation.java | 19 ++++++++++++++++++- .../impl/signator/textual/TextualSignator_1_0_0.java | 4 +++- 5 files changed, 46 insertions(+), 6 deletions(-) (limited to 'src/main/java/at/gv/egiz/pdfas/impl/signator') diff --git a/src/main/java/at/gv/egiz/pdfas/impl/signator/IncrementalUpdateHelper.java b/src/main/java/at/gv/egiz/pdfas/impl/signator/IncrementalUpdateHelper.java index a95cdc6..f308e30 100644 --- a/src/main/java/at/gv/egiz/pdfas/impl/signator/IncrementalUpdateHelper.java +++ b/src/main/java/at/gv/egiz/pdfas/impl/signator/IncrementalUpdateHelper.java @@ -32,14 +32,14 @@ public final class IncrementalUpdateHelper return iui; } - public static void writeIncrementalUpdateToDataSink(PdfDataSource pdfDataSource, DataSink dataSink, PdfPTable pdf_table, PositioningInstruction pi) throws PresentableException + public static IncrementalUpdateInformation writeIncrementalUpdateToDataSink(PdfDataSource pdfDataSource, DataSink dataSink, PdfPTable pdf_table, PositioningInstruction pi) throws PresentableException { - writeIncrementalUpdateToDataSink(pdfDataSource, dataSink, pdf_table, pi, null, null); + return writeIncrementalUpdateToDataSink(pdfDataSource, dataSink, pdf_table, pi, null, null); } - public static void writeIncrementalUpdateToDataSink(PdfDataSource pdfDataSource, DataSink dataSink, PdfPTable pdf_table, PositioningInstruction pi, List variable_field_definitions, + public static IncrementalUpdateInformation writeIncrementalUpdateToDataSink(PdfDataSource pdfDataSource, DataSink dataSink, PdfPTable pdf_table, PositioningInstruction pi, List variable_field_definitions, List all_field_definitions) throws PresentableException { - BinarySignature.writeIncrementalUpdate(pdfDataSource, dataSink, pdf_table, pi, variable_field_definitions, all_field_definitions); + return BinarySignature.writeIncrementalUpdate(pdfDataSource, dataSink, pdf_table, pi, variable_field_definitions, all_field_definitions); } } diff --git a/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignatorInformation.java b/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignatorInformation.java index 916abf4..0ed3699 100644 --- a/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignatorInformation.java +++ b/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignatorInformation.java @@ -5,6 +5,7 @@ package at.gv.egiz.pdfas.impl.signator.binary; import java.util.List; +import at.knowcenter.wag.egov.egiz.pdf.ActualTablePos; import at.knowcenter.wag.egov.egiz.sig.SignatureData; import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject; import at.gv.egiz.pdfas.framework.input.PdfDataSource; @@ -31,6 +32,8 @@ public class BinarySignatorInformation implements SignatorInformation protected int enc_length = -1; protected SignSignatureObject signSignatureObject = null; + + protected ActualTablePos atp = null; /** * @see at.gv.egiz.pdfas.framework.signator.SignatorInformation#getSignatureData() @@ -48,4 +51,20 @@ public class BinarySignatorInformation implements SignatorInformation this.signSignatureObject = signSignatureObject; } + /** + * @see at.gv.egiz.pdfas.framework.signator.SignatorInformation#getSignSignatureObject() + */ + public SignSignatureObject getSignSignatureObject() + { + return this.signSignatureObject; + } + + /** + * @see at.gv.egiz.pdfas.framework.signator.SignatorInformation#getActualTablePos() + */ + public ActualTablePos getActualTablePos() + { + return this.atp; + } + } diff --git a/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignator_1_0_0.java b/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignator_1_0_0.java index b1f1cea..73d4866 100644 --- a/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignator_1_0_0.java +++ b/src/main/java/at/gv/egiz/pdfas/impl/signator/binary/BinarySignator_1_0_0.java @@ -296,6 +296,7 @@ public class BinarySignator_1_0_0 implements Signator bsi.cert_length = iui.cert_length; bsi.enc_start = iui.enc_start; bsi.enc_length = iui.enc_length; + bsi.atp = iui.actualTablePos; return bsi; } @@ -312,6 +313,7 @@ public class BinarySignator_1_0_0 implements Signator iui.cert_length = bsi.cert_length; iui.enc_start = bsi.enc_start; iui.enc_length = bsi.enc_length; + iui.actualTablePos = bsi.atp; iui.signed_signature_object = bsi.signSignatureObject; diff --git a/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignatorInformation.java b/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignatorInformation.java index c5b18ff..9e5ebb6 100644 --- a/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignatorInformation.java +++ b/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignatorInformation.java @@ -3,6 +3,7 @@ */ package at.gv.egiz.pdfas.impl.signator.textual; +import at.knowcenter.wag.egov.egiz.pdf.ActualTablePos; import at.knowcenter.wag.egov.egiz.pdf.TablePos; import at.knowcenter.wag.egov.egiz.sig.SignatureData; import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject; @@ -24,6 +25,8 @@ public class TextualSignatorInformation implements SignatorInformation protected TablePos pos = null; public SignSignatureObject signSignatureObject = null; + + protected ActualTablePos atp = null; /** * @see at.gv.egiz.pdfas.framework.signator.SignatorInformation#getSignatureData() @@ -34,7 +37,6 @@ public class TextualSignatorInformation implements SignatorInformation } /** - * * @see at.gv.egiz.pdfas.framework.signator.SignatorInformation#setSignSignatureObject(at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject) */ public void setSignSignatureObject(SignSignatureObject signSignatureObject) @@ -42,4 +44,19 @@ public class TextualSignatorInformation implements SignatorInformation this.signSignatureObject = signSignatureObject; } + /** + * @see at.gv.egiz.pdfas.framework.signator.SignatorInformation#getSignSignatureObject() + */ + public SignSignatureObject getSignSignatureObject() + { + return this.signSignatureObject; + } + + /** + * @see at.gv.egiz.pdfas.framework.signator.SignatorInformation#getActualTablePos() + */ + public ActualTablePos getActualTablePos() + { + return this.atp; + } } diff --git a/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignator_1_0_0.java b/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignator_1_0_0.java index 1714afc..b49803c 100644 --- a/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignator_1_0_0.java +++ b/src/main/java/at/gv/egiz/pdfas/impl/signator/textual/TextualSignator_1_0_0.java @@ -29,6 +29,7 @@ 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.SignatorFactory; +import at.knowcenter.wag.egov.egiz.pdf.IncrementalUpdateInformation; import at.knowcenter.wag.egov.egiz.pdf.PositioningInstruction; import at.knowcenter.wag.egov.egiz.pdf.TablePos; import at.knowcenter.wag.egov.egiz.sig.SignatureDataImpl; @@ -127,7 +128,8 @@ public class TextualSignator_1_0_0 implements Signator PositioningInstruction pi = PdfAS.determineTablePositioning(tsi.pos, tsi.profile, tsi.originalDocument, pdf_table); - IncrementalUpdateHelper.writeIncrementalUpdateToDataSink(tsi.originalDocument, dataSink, pdf_table, pi); + IncrementalUpdateInformation iui = IncrementalUpdateHelper.writeIncrementalUpdateToDataSink(tsi.originalDocument, dataSink, pdf_table, pi); + tsi.atp = iui.actualTablePos; // OutputStream os = dataSink.createOutputStream(PdfAS.PDF_MIME_TYPE); // os.write(signed_iui.signed_pdf); -- cgit v1.2.3