1 files changed, 8 insertions, 33 deletions

diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureProperties.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureProperties.java
index 24ef3881..05cce46d 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureProperties.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureProperties.java
@@ -1,26 +1,16 @@
 package at.gv.egiz.pdfas.lib.impl.stamping.pdfbox;
 
-import iaik.x509.X509Certificate;
-
 import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.interactive.digitalsignature.visible.PDFTemplateBuilder;
-import org.apache.pdfbox.pdmodel.interactive.digitalsignature.visible.PDFTemplateCreator;
 import org.apache.pdfbox.pdmodel.interactive.digitalsignature.visible.PDVisibleSigProperties;
-import org.apache.pdfbox.pdmodel.interactive.digitalsignature.visible.PDVisibleSignDesigner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import at.gv.egiz.pdfas.common.settings.ISettings;
-import at.gv.egiz.pdfas.common.settings.SignatureProfileSettings;
-import at.gv.egiz.pdfas.lib.impl.stamping.TableFactory;
 import at.gv.egiz.pdfas.lib.impl.status.PDFObject;
-import at.gv.egiz.pdfas.lib.test.mains.CertificateHolderRequest;
-import at.knowcenter.wag.egov.egiz.table.Table;
+import at.knowcenter.wag.egov.egiz.pdf.PositioningInstruction;
 
 public class PDFAsVisualSignatureProperties extends PDVisibleSigProperties {
 
@@ -29,40 +19,25 @@ public class PDFAsVisualSignatureProperties extends PDVisibleSigProperties {
 	private ISettings settings;
 
 	private PDFBoxTable main;
-	private PDFont tableFont;
 	
 	private PDFAsVisualSignatureDesigner designer;
 
-	public PDFAsVisualSignatureProperties(ISettings settings, PDFObject object) {
+	public PDFAsVisualSignatureProperties(ISettings settings, PDFObject object, 
+			PdfBoxVisualObject visObj, PositioningInstruction pos) {
 		this.settings = settings;
 		try {
-			SignatureProfileSettings profileSettings = TableFactory
-					.createProfile(object.getStatus().getRequestedSignature().getSignatureProfileID(), 
-							settings);
-			//float width = object.getStatus().getRequestedSignature().getSignaturePosition().getWidth();
-			object.getStatus().getRequestedSignature().getCertificate();
-			X509Certificate cert = object.getStatus().getRequestedSignature().getCertificate();
-
-			CertificateHolderRequest request = new CertificateHolderRequest(
-					cert);
-
-			Table mainTable = TableFactory.createSigTable(profileSettings, "main",
-					settings, request);
-			
-			main = new PDFBoxTable(mainTable, null, 230.f);
-			
-			//tableFont = PDFont.
+			main = visObj.getTable();
 			
-			//main.setWidth(100);
 		} catch (Throwable e) {
 			e.printStackTrace();
 		}
 		try {
 			PDDocument origDoc = PDDocument.load(new ByteArrayInputStream(
-					object.getStampedDocument()));
+					object.getOriginalDocument()));
 
-			designer = new PDFAsVisualSignatureDesigner(origDoc, 1, this);
-			designer.coordinates(100, 100);
+			designer = new PDFAsVisualSignatureDesigner(origDoc, pos.getPage(), this, pos.isMakeNewPage());
+			float posy = designer.getPageHeight() - pos.getY();
+			designer.coordinates(pos.getX(), posy);
 			float[] form_rect = new float[] {0,0, main.getWidth() + 2, main.getHeight() + 2};
 			logger.info("AP Rect: {} {} {} {}", form_rect[0], form_rect[1], form_rect[2], form_rect[3]);
 			designer.formaterRectangleParams(form_rect);