From a0de2a3b2a5f4a99f280f5caebbca0d183ae109a Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Wed, 7 Feb 2007 10:08:21 +0000
Subject: Bugfix: Querformat, BKU 2.7.x, ...

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@35 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../framework/signators/TextualSignator_1_0_0.java | 29 ++++------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov/egiz/framework/signators/TextualSignator_1_0_0.java')

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 6e605ff..8cdcf63 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,19 +17,18 @@
  */
 package at.knowcenter.wag.egov.egiz.framework.signators;
 
-import com.lowagie.text.pdf.PdfPTable;
-
 import at.knowcenter.wag.egov.egiz.PdfAS;
 import at.knowcenter.wag.egov.egiz.PdfASID;
-import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 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;
-import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
+
+import com.lowagie.text.pdf.PdfPTable;
 
 /**
  * Signs a document textually.
@@ -93,27 +92,9 @@ public class TextualSignator_1_0_0 implements Signator
 
     PdfPTable pdf_table = PdfAS.createPdfPTableFromSignatureObject(iui.signed_signature_object);
 
-    if (iui.pos == null)
-    {
-      String pos_string = SettingsReader.getInstance().getSetting(SignatureTypes.SIG_OBJ + iui.signature_type + ".pos", null);
-      if (pos_string != null)
-      {
-        iui.pos = PdfAS.parsePositionFromPosString(pos_string);
-        pdf_table.setTotalWidth(iui.pos.width);
-        pdf_table.setLockedWidth(true);
-      }
-      else
-      {
-        iui.pos = PdfAS.adjustTableAndCalculatePosition(iui.original_document, pdf_table);
-      }
-    }
-    else
-    {
-      pdf_table.setTotalWidth(iui.pos.width);
-      pdf_table.setLockedWidth(true);
-    }
+    PositioningInstruction pi = PdfAS.determineTablePositioning(iui.pos, iui.signature_type, iui.original_document, pdf_table);
 
-    IncrementalUpdateInformation signed_iui = BinarySignature.writeIncrementalUpdate(iui.original_document, pdf_table, iui.pos, null, null);
+    IncrementalUpdateInformation signed_iui = BinarySignature.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;
-- 
cgit v1.2.3