Cleaned up classes CSVWriter and TSVWriter

giorgiga · jazzido · commit 3310c0e6f919 · 2017-09-14T13:57:14.000-03:00
diff --git a/src/main/java/technology/tabula/writers/CSVWriter.java b/src/main/java/technology/tabula/writers/CSVWriter.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.csv.CSVPrinter;
@@ -11,47 +12,34 @@
 import technology.tabula.Table;
 
 public class CSVWriter implements Writer {
-    
-    CSVPrinter printer;
-    private boolean useLineReturns = true;
-    
-//    public CSVWriter() {
-//        super();
-//    }
-//    
-//    public CSVWriter(boolean useLineReturns) {
-//        super();
-//        this.useLineReturns = useLineReturns;
-//    }
-    
-    void createWriter(Appendable out) {
-        try {
-            this.printer = new CSVPrinter(out, CSVFormat.EXCEL);
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-    
-    @Override
-    public void write(Appendable out, Table table) throws IOException {
-        this.createWriter(out);
-        for (List<RectangularTextContainer> row: table.getRows()) {
-            List<String> cells = new ArrayList<String>(row.size());
-            for (RectangularTextContainer tc: row) {
-                cells.add(tc.getText());
-            }
-            this.printer.printRecord(cells);
-        }
-        printer.flush();
-    }
+
+	public CSVWriter() {
+		this(CSVFormat.EXCEL);
+	}
+
+	protected CSVWriter(CSVFormat format) {
+		this.format = format;
+	}
+
+	private final CSVFormat format;
+
+	@Override
+	public void write(Appendable out, Table table) throws IOException {
+		write(out, Collections.singletonList(table));
+	}
 
 	@Override
 	public void write(Appendable out, List<Table> tables) throws IOException {
-		for (Table table : tables) {
-			write(out, table);
+		try (CSVPrinter printer = new CSVPrinter(out, format)) {
+			for (Table table : tables) {
+				for (List<RectangularTextContainer> row : table.getRows()) {
+					List<String> cells = new ArrayList<>(row.size());
+					for (RectangularTextContainer<?> tc : row) cells.add(tc.getText());
+					printer.printRecord(cells);
+				}
+			}
+			printer.flush();
 		}
-		
 	}
 
 }
diff --git a/src/main/java/technology/tabula/writers/TSVWriter.java b/src/main/java/technology/tabula/writers/TSVWriter.java
@@ -1,20 +1,12 @@
 package technology.tabula.writers;
 
-import java.io.IOException;
-
 import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
 
 public class TSVWriter extends CSVWriter {
-    
-    @Override
-    void createWriter(Appendable out) {
-        try {
-            this.printer = new CSVPrinter(out, CSVFormat.TDF);
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-    
+
+	public TSVWriter() {
+		super(CSVFormat.TDF);
+	}
+
+
 }
