From a9113ff8822e5a784316be020f8968086a06ecc7 Mon Sep 17 00:00:00 2001
From: jomu <jomu@711a9084-f618-47a6-a783-754c49204487>
Date: Mon, 20 Jun 2016 11:09:47 +0000
Subject: [PATCH] minor api enhancements

---
 .../main/java/de/muehlencord/shared/pdf/Content.java  | 10 +++++-----
 .../java/de/muehlencord/shared/pdf/PDFDocument.java   | 11 +++--------
 .../de/muehlencord/shared/pdf/PDFTableContent.java    |  2 +-
 .../java/de/muehlencord/shared/pdf/PDFTemplate.java   |  2 +-
 .../muehlencord/shared/pdf/test/PDFDocumentTest.java  |  3 +--
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java b/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java
index 79a4556..566c377 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/Content.java
@@ -19,7 +19,7 @@ abstract class Content {
 
     @Expose
     protected Float y;
-    
+
     public Content(PDFDocument document) {
         this.document = document;
         this.x = null;
@@ -63,12 +63,12 @@ abstract class Content {
     public void setY(float y) {
         this.y = y;
     }
-    
+
     protected PDRectangle getRectangle() {
-        return rect;        
-    }    
+        return rect;
+    }
 
     protected void setRect(PDRectangle rect) {
         this.rect = rect;
-    }        
+    }
 }
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java
index 03a6558..86832c7 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFDocument.java
@@ -17,7 +17,7 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font;
 public class PDFDocument {
 
     @Expose
-    private PDFPaperSize paperSize;
+    private final PDFPaperSize paperSize;
 
     @Expose
     protected PDFFont standardFont;
@@ -30,7 +30,8 @@ public class PDFDocument {
     
     private PDDocument pdDocument;
 
-    public PDFDocument() {
+    public PDFDocument(PDFPaperSize ps) {
+        this.paperSize = ps;
         this.contentList = new ArrayList<>();
         this.standardFont = new PDFFont("Helvetica", 11);
         this.fontMap = null;
@@ -79,7 +80,6 @@ public class PDFDocument {
                         currentStartOfSubelement = posCloseBracket + 1;
 
                         String jsonSubString = templateString.substring(posOpenBracket, posCloseBracket + 1);
-                        System.out.println(jsonSubString);
 
                         // insert the list values into the gson string
                         TableRow element = GsonUtil.getGsonInstance().fromJson(jsonSubString, TableRow.class);
@@ -102,7 +102,6 @@ public class PDFDocument {
                             templateString = newString;
                             currentPosInTemplate += listStartString.length();
                             currentPosInTemplate += listEndString.length();
-                            System.out.println(templateString.substring(posOpenBracket-10, posCloseBracket + listStartString.length() + listEndString.length()+10));
                         }
                     }
                 }
@@ -150,10 +149,6 @@ public class PDFDocument {
         return paperSize;
     }
 
-    public void setPaperSize(PDFPaperSize paperSize) {
-        this.paperSize = paperSize;
-    }
-
     public PDFFont getStandardFont() {
         return standardFont;
     }
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java
index 7de7802..d3391d3 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTableContent.java
@@ -31,7 +31,7 @@ public class PDFTableContent extends Content {
 
     }
 
-    public PDFTableContent(PDFDocument doc, PDFFont hf, int x, int y) {
+    public PDFTableContent(PDFDocument doc, PDFFont hf, float x, float y) {
         super(doc, x, y);
         this.columSizes = new ArrayList<>();
         this.data = new ArrayList<>();
diff --git a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java
index 6354257..fe373c0 100644
--- a/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java
+++ b/pdf/src/main/java/de/muehlencord/shared/pdf/PDFTemplate.java
@@ -62,7 +62,7 @@ public class PDFTemplate {
         pdfDoc.getPdDocument().addPage(page);
 
         PDPageContentStream cos = new PDPageContentStream(pdfDoc.getPdDocument(), page, AppendMode.APPEND, false);
-        Coordinate coord = null;
+        Coordinate coord = new Coordinate(page.getMediaBox().getLowerLeftX(), page.getMediaBox().getUpperRightY());
         for (Content content : pdfDoc.getContentList()) {
             content.setDocument(pdfDoc); // FIXME move to serialization            
             content.setRect(page.getMediaBox());
diff --git a/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java b/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java
index 5ada2bf..a305fbb 100644
--- a/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java
+++ b/pdf/src/test/java/de/muehlencord/shared/pdf/test/PDFDocumentTest.java
@@ -38,11 +38,10 @@ public class PDFDocumentTest {
     @Test
     public void testToJson() throws FileNotFoundException, IOException, ConfigurationException, TemplateException {
         System.out.println("testToJson");
-        PDFDocument doc = new PDFDocument();
+        PDFDocument doc = new PDFDocument(PDFPaperSize.A4);
         doc.addFont("bold", new PDFFont("Helvetica-Bold", 12, 2));
         doc.addFont("helv12", new PDFFont("Helvetica", 12, 2));
 
-        doc.setPaperSize(PDFPaperSize.A4);
         PDFTextContent addressContent = new PDFTextContent(doc, 40F, 692F, "Max Mustermann")
                 .addLine("Musterstraße 123")
                 .addLine("12345 Musterhausen");