diff --git a/src/main/java/fi/dy/masa/malilib/data/DataDump.java b/src/main/java/fi/dy/masa/malilib/data/DataDump.java index 4544f6966a..31ba9bbf1d 100644 --- a/src/main/java/fi/dy/masa/malilib/data/DataDump.java +++ b/src/main/java/fi/dy/masa/malilib/data/DataDump.java @@ -3,6 +3,7 @@ import java.io.*; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -338,7 +339,7 @@ private String getFormattedLineASCII(Row row) if (values.length == 1 && this.columns > 1) { int space = this.totalWidth + (Math.max(this.columns - 1, 0) * 3); - String fmt = null; + String fmt; boolean isCenter = false; if (this.centerTitle) @@ -497,7 +498,7 @@ protected List getFormattedData(List lines) public List getLines() { - List lines = new ArrayList(); + List lines = new ArrayList<>(); this.generateFormatStrings(); this.getFormattedData(lines); @@ -505,6 +506,61 @@ public List getLines() return lines; } + @Deprecated + @Nullable + public static File dumpDataToFile(File dir, String fileNameBase, List lines, Format format) + { + Path dirPath = Paths.get(dir.toURI()); + Path out; + + if (format == Format.CSV) + { + out = dumpDataToFile(dirPath, fileNameBase + "-csv", ".csv", lines); + } + else + { + out = dumpDataToFile(dirPath, fileNameBase, ".txt", lines); + } + + if (out != null) + { + return out.toFile(); + } + + return null; + } + + @Deprecated + @Nullable + public static File dumpDataToFile(File dir, String fileNameBase, List lines) + { + Path dirPath = Paths.get(dir.toURI()); + Path out = dumpDataToFile(dirPath, fileNameBase, ".txt", lines); + + if (out != null) + { + return out.toFile(); + } + + return null; + } + + @Deprecated + @Nullable + public static File dumpDataToFile(File dir, String fileNameBase, String fileNameExtension, List lines) + { + Path dirPath = Paths.get(dir.toURI()); + + Path out = dumpDataToFile(dirPath, fileNameBase, fileNameExtension, lines); + + if (out != null) + { + return out.toFile(); + } + + return null; + } + @Nullable public static Path dumpDataToFile(Path dir, String fileNameBase, List lines, Format format) { @@ -655,12 +711,12 @@ else if (d1 > d2) public enum Alignment { LEFT, - RIGHT; + RIGHT } public enum Format { ASCII, - CSV; + CSV } }