1 files changed, 5 insertions, 23 deletions
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 d28ac3b..6f167c8 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
@@ -22,11 +22,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-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.PDFDocumentException;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
 import at.knowcenter.wag.egov.egiz.framework.SignResult;
@@ -34,6 +31,7 @@ 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.ReplaceInfo;
 import at.knowcenter.wag.egov.egiz.pdf.StringInfo;
 import at.knowcenter.wag.egov.egiz.pdf.TablePos;
@@ -42,6 +40,8 @@ import at.knowcenter.wag.egov.egiz.sig.SignatureObject;
 import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
 import at.knowcenter.wag.exactparser.ByteArrayUtils;
 
+import com.lowagie.text.pdf.PdfPTable;
+
 /**
  * Signs the document binary.
  * 
@@ -90,25 +90,7 @@ public class BinarySignator_1_0_0 implements Signator
 
       PdfPTable pdf_table = PdfAS.createPdfPTableFromSignatureObject(signature_object);
 
-      if (pos == null)
-      {
-        String pos_string = SettingsReader.getInstance().getSetting(SignatureTypes.SIG_OBJ + signature_type + ".pos", null);
-        if (pos_string != null)
-        {
-          pos = PdfAS.parsePositionFromPosString(pos_string);
-          pdf_table.setTotalWidth(pos.width);
-          pdf_table.setLockedWidth(true);
-        }
-        else
-        {
-          pos = PdfAS.adjustTableAndCalculatePosition(pdf, pdf_table);
-        }
-      }
-      else
-      {
-        pdf_table.setTotalWidth(pos.width);
-        pdf_table.setLockedWidth(true);
-      }
+      PositioningInstruction pi = PdfAS.determineTablePositioning(pos, signature_type, pdf, pdf_table);
 
       List all_field_definitions = signature_object.getSignatureTypeDefinition().getFieldDefinitions();
       List variable_field_definitions = new ArrayList();
@@ -124,7 +106,7 @@ public class BinarySignator_1_0_0 implements Signator
           variable_field_definitions.add(sfd);
         }
       }
-      IncrementalUpdateInformation iui = BinarySignature.writeIncrementalUpdate(pdf, pdf_table, pos, variable_field_definitions, all_field_definitions);
+      IncrementalUpdateInformation iui = BinarySignature.writeIncrementalUpdate(pdf, pdf_table, pi, variable_field_definitions, all_field_definitions);
 
       String temp_string = iui.temp_ir_number + " " + iui.temp_ir_generation + " obj";
       byte[] temp_bytes = temp_string.getBytes("US-ASCII");