diff --git a/README.md b/README.md index 77697d4..0ed9a2f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ The `PrettyTable` class handles a table as shown above. The `TableBuilder` class Here are the basics for how to create a `PrettyTable` as shown above: ```Java import rickwporter.prettytable.PrettyTable; -import rickwporter.prettytable.PrettyTable.OutputFormat; +import rickwporter.prettytable.OutputFormat; PrettyTable table = new PrettyTable("Column A", "Column 2", "Column III"); table.addRow("A", "B", "c"); @@ -131,7 +131,7 @@ Using the **json** format (e.g. `OutputFormat.JSON`), you get the following outp ### Alignment ASCII **text**, **rich**, and **html** support different alignments. Here's how you would update the above table: ```Java -import rickwporter.prettytable.PrettyTable.HorizontalAlign; +import rickwporter.prettytable.HorizontalAlign; table.setHorizAligns(HorizontalAlign.LEFT, HorizontalAlign.CENTER, HorizontalAlign.RIGHT); ``` diff --git a/src/main/java/rickwporter/prettytable/BaseTextTableRender.java b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java index 1e51fc6..ccedc83 100644 --- a/src/main/java/rickwporter/prettytable/BaseTextTableRender.java +++ b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java @@ -8,8 +8,6 @@ import org.apache.commons.lang3.StringUtils; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; - abstract class BaseTextTableRender implements TableRenderInterface { private static final Pattern NEWLINE = Pattern.compile("\\R"); diff --git a/src/main/java/rickwporter/prettytable/HorizontalAlign.java b/src/main/java/rickwporter/prettytable/HorizontalAlign.java new file mode 100644 index 0000000..4cfbdab --- /dev/null +++ b/src/main/java/rickwporter/prettytable/HorizontalAlign.java @@ -0,0 +1,17 @@ +package rickwporter.prettytable; + +public enum HorizontalAlign { + CENTER("text-align:center"), + LEFT("text-align:left"), + RIGHT("text-align:right"); + + private final String htmlStyle; + + HorizontalAlign(String html) { + this.htmlStyle = html; + } + + public String getHtmlStyle() { + return this.htmlStyle; + } +} diff --git a/src/main/java/rickwporter/prettytable/HtmlTableRender.java b/src/main/java/rickwporter/prettytable/HtmlTableRender.java index ff91149..cacd284 100644 --- a/src/main/java/rickwporter/prettytable/HtmlTableRender.java +++ b/src/main/java/rickwporter/prettytable/HtmlTableRender.java @@ -4,9 +4,6 @@ import java.util.List; import java.util.stream.Collectors; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; -import rickwporter.prettytable.PrettyTable.OutputFormat; - class HtmlTableRender implements TableRenderInterface { private static final String HTML_TABLE_TAG = "table"; private static final String HTML_HEADER_TAG = "thead"; diff --git a/src/main/java/rickwporter/prettytable/JsonTableRender.java b/src/main/java/rickwporter/prettytable/JsonTableRender.java index 871a476..666cfff 100644 --- a/src/main/java/rickwporter/prettytable/JsonTableRender.java +++ b/src/main/java/rickwporter/prettytable/JsonTableRender.java @@ -5,8 +5,6 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; -import rickwporter.prettytable.PrettyTable.OutputFormat; - class JsonTableRender implements TableRenderInterface { String jsonEncode(Object object) { if (object instanceof Integer) { diff --git a/src/main/java/rickwporter/prettytable/OutputFormat.java b/src/main/java/rickwporter/prettytable/OutputFormat.java new file mode 100644 index 0000000..5955c01 --- /dev/null +++ b/src/main/java/rickwporter/prettytable/OutputFormat.java @@ -0,0 +1,9 @@ +package rickwporter.prettytable; + +public enum OutputFormat { + TEXT, + RICH, + CSV, + HTML, + JSON, +} diff --git a/src/main/java/rickwporter/prettytable/PrettyTable.java b/src/main/java/rickwporter/prettytable/PrettyTable.java index be0a84a..efe642c 100644 --- a/src/main/java/rickwporter/prettytable/PrettyTable.java +++ b/src/main/java/rickwporter/prettytable/PrettyTable.java @@ -10,28 +10,6 @@ public final class PrettyTable { private static final Pattern NEWLINE = Pattern.compile("\\R"); - public enum HorizontalAlign { - CENTER("text-align:center"), - LEFT("text-align:left"), - RIGHT("text-align:right"); - - private final String htmlStyle; - HorizontalAlign(String html) { - this.htmlStyle = html; - } - public String getHtmlStyle() { - return this.htmlStyle; - } - } - - public enum OutputFormat { - TEXT, - RICH, - CSV, - HTML, - JSON, - } - private List headers = new ArrayList<>(); private List> rows = new ArrayList<>(); private List hAligns = new ArrayList<>(); diff --git a/src/main/java/rickwporter/prettytable/RichTableRender.java b/src/main/java/rickwporter/prettytable/RichTableRender.java index b976a95..b058024 100644 --- a/src/main/java/rickwporter/prettytable/RichTableRender.java +++ b/src/main/java/rickwporter/prettytable/RichTableRender.java @@ -3,8 +3,6 @@ import java.util.ArrayList; import java.util.List; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; - class RichTableRender extends BaseTextTableRender { // Four characters are left, fill, junction, right. private static final TableGlyphs HEAVY_TOP = new TableGlyphs('┏', '━', '┳', '┓'); diff --git a/src/main/java/rickwporter/prettytable/TableBuilder.java b/src/main/java/rickwporter/prettytable/TableBuilder.java index 2fb274a..4ac9f0f 100644 --- a/src/main/java/rickwporter/prettytable/TableBuilder.java +++ b/src/main/java/rickwporter/prettytable/TableBuilder.java @@ -8,8 +8,6 @@ import java.util.Map; import java.util.Set; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; - public final class TableBuilder { private static final String WILDCARD_COLUMN = "*"; private static final Object MANY_KEYS = new Object(); diff --git a/src/main/java/rickwporter/prettytable/TextTableRender.java b/src/main/java/rickwporter/prettytable/TextTableRender.java index ae7d37e..1de5b90 100644 --- a/src/main/java/rickwporter/prettytable/TextTableRender.java +++ b/src/main/java/rickwporter/prettytable/TextTableRender.java @@ -3,8 +3,6 @@ import java.util.ArrayList; import java.util.List; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; - class TextTableRender extends BaseTextTableRender { private static final TableGlyphs RULE = new TableGlyphs('+', '-', '+', '+'); private static final TableGlyphs VERTICAL = new TableGlyphs('|', ' ', '|', '|'); diff --git a/src/test/java/rickwporter/prettytable/PrettyTableTest.java b/src/test/java/rickwporter/prettytable/PrettyTableTest.java index f8a3b7d..e4a998f 100644 --- a/src/test/java/rickwporter/prettytable/PrettyTableTest.java +++ b/src/test/java/rickwporter/prettytable/PrettyTableTest.java @@ -1,8 +1,5 @@ package rickwporter.prettytable; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; -import rickwporter.prettytable.PrettyTable.OutputFormat; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/rickwporter/prettytable/RichTableRenderTest.java b/src/test/java/rickwporter/prettytable/RichTableRenderTest.java index bdd0cd9..806efa9 100644 --- a/src/test/java/rickwporter/prettytable/RichTableRenderTest.java +++ b/src/test/java/rickwporter/prettytable/RichTableRenderTest.java @@ -12,9 +12,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; -import rickwporter.prettytable.PrettyTable.OutputFormat; - public class RichTableRenderTest { @Test public void testBasicRich() { diff --git a/src/test/java/rickwporter/prettytable/TableBuilderTest.java b/src/test/java/rickwporter/prettytable/TableBuilderTest.java index a1a5f0f..ba6bf2a 100644 --- a/src/test/java/rickwporter/prettytable/TableBuilderTest.java +++ b/src/test/java/rickwporter/prettytable/TableBuilderTest.java @@ -1,7 +1,5 @@ package rickwporter.prettytable; -import rickwporter.prettytable.PrettyTable.HorizontalAlign; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/rickwporter/prettytable/TextTableRenderTest.java b/src/test/java/rickwporter/prettytable/TextTableRenderTest.java index 6508b18..a85fdc7 100644 --- a/src/test/java/rickwporter/prettytable/TextTableRenderTest.java +++ b/src/test/java/rickwporter/prettytable/TextTableRenderTest.java @@ -1,11 +1,7 @@ package rickwporter.prettytable; -import org.junit.jupiter.api.Test; - -import rickwporter.prettytable.PrettyTable.HorizontalAlign; -import rickwporter.prettytable.PrettyTable.OutputFormat; - import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TextTableRenderTest { @Test