Refactor/export CSV+PDF (#166)

* copyright + remove empty lines

* make functions private

* use basic constructor

* avoid redundant initialization = null

* append.append

* remove unused FontMapper

* use basic constructor

* make pdfheight a local variable

* make properties private

Author: Pitterling

src/main/java/net/atomique/ksar/export/FileCSV.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 The kSAR Project. All rights reserved.
+ * Copyright 2018 The kSAR Project. All rights reserved.
  * See the LICENSE file in the project root for more information.
  */
 
@@ -33,19 +33,18 @@ public class FileCSV implements Runnable {
   public FileCSV(String filename, kSar hissar) {
     csvfilename = filename;
     mysar = hissar;
-
   }
 
   public FileCSV(String filename, kSar hissar, JProgressBar g, JDialog d) {
-    csvfilename = filename;
-    mysar = hissar;
+    this(filename, hissar);
+
     progress_bar = g;
     dialog = d;
   }
 
   public void run() {
     // open file
-    BufferedWriter out = null;
+    BufferedWriter out;
     try {
       out = new BufferedWriter(new FileWriter(csvfilename));
     } catch (IOException ex) {
@@ -71,7 +70,7 @@ public void run() {
 
       DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yy HH:mm:ss");
       String text = tmpLDT.format(formatter);
-      tmpcsv.append(text + ";");
+      tmpcsv.append(text).append(";");
       export_treenode_data(mysar.graphtree, tmp);
       tmpcsv.append("\n");
     }
@@ -89,8 +88,7 @@ public void run() {
 
   }
 
-
-  public void export_treenode_header(SortedTreeNode node) {
+  private void export_treenode_header(SortedTreeNode node) {
     int num = node.getChildCount();
 
     if (num > 0) {
@@ -116,7 +114,7 @@ public void export_treenode_header(SortedTreeNode node) {
     }
   }
 
-  public void export_treenode_data(SortedTreeNode node, RegularTimePeriod time) {
+  private void export_treenode_data(SortedTreeNode node, RegularTimePeriod time) {
     int num = node.getChildCount();
 
     if (num > 0) {
@@ -151,11 +149,10 @@ private void update_ui() {
 
   }
 
-
   private StringBuilder tmpcsv = new StringBuilder();
   private int progress_info = 0;
-  private String csvfilename = null;
-  private kSar mysar = null;
+  private String csvfilename;
+  private kSar mysar;
   private JProgressBar progress_bar = null;
   private JDialog dialog = null;
 }

src/main/java/net/atomique/ksar/export/FilePDF.java

@@ -5,8 +5,6 @@
 
 package net.atomique.ksar.export;
 
-import com.itextpdf.awt.DefaultFontMapper;
-import com.itextpdf.awt.FontMapper;
 import com.itextpdf.awt.PdfGraphics2D;
 import com.itextpdf.text.BaseColor;
 import com.itextpdf.text.Document;
@@ -51,12 +49,11 @@ public class FilePDF extends PdfPageEventHelper implements Runnable {
   public FilePDF(String filename, kSar hissar) {
     pdffilename = filename;
     mysar = hissar;
-
   }
 
   public FilePDF(String filename, kSar hissar, JProgressBar g, JDialog d) {
-    pdffilename = filename;
-    mysar = hissar;
+    this(filename, hissar);
+
     progress_bar = g;
     dialog = d;
   }
@@ -83,10 +80,11 @@ public void run() {
         break;
     }
 
-    pdfheight = document.getPageSize().getHeight();
+    float pdfheight = document.getPageSize().getHeight();
     pdfwidth = document.getPageSize().getWidth();
     pageheight = pdfheight - (2 * pdfmargins);
     pagewidth = pdfwidth - (2 * pdfmargins);
+
     try {
       writer = PdfWriter.getInstance(document, new FileOutputStream(pdffilename));
     } catch (DocumentException | FileNotFoundException ex) {
@@ -217,19 +215,17 @@ public void IndexPage(PdfWriter writer, Document document) {
   }
 
   private int progress_info = 0;
-  private float pdfheight;
   private float pdfwidth;
   private int pdfmargins = 10;
-  float pageheight;
-  float pagewidth;
+  private float pageheight;
+  private float pagewidth;
   private int total_pages = 1; // page 1 (index)
   private String pdffilename = null;
   private Document document = null;
   private PdfWriter writer = null;
   private PdfContentByte pdfcb;
   private kSar mysar = null;
-  FontMapper mapper = new DefaultFontMapper();
-  BaseFont bf = FontFactory.getFont(FontFactory.COURIER).getCalculatedBaseFont(false);
+  private BaseFont bf = FontFactory.getFont(FontFactory.COURIER).getCalculatedBaseFont(false);
   private JProgressBar progress_bar = null;
   private JDialog dialog = null;
   private ChartRenderingInfo chartinfo = null;