From 70dbcc01b20fc0869f14b93f3e5a11e1a784cf77 Mon Sep 17 00:00:00 2001 From: Rick Porter Date: Mon, 2 Nov 2026 11:42:40 -0500 Subject: [PATCH 1/3] Refactor TextTableRender to pull out reusable pieces to BaseTextTableRender --- .../prettytable/BaseTextTableRender.java | 117 ++++++++++++++++++ .../prettytable/TextTableRender.java | 114 +++-------------- 2 files changed, 133 insertions(+), 98 deletions(-) create mode 100644 src/main/java/rickwporter/prettytable/BaseTextTableRender.java diff --git a/src/main/java/rickwporter/prettytable/BaseTextTableRender.java b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java new file mode 100644 index 0000000..cdb9d70 --- /dev/null +++ b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java @@ -0,0 +1,117 @@ +package rickwporter.prettytable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.StringUtils; + +import rickwporter.prettytable.PrettyTable.HorizontalAlign; + +abstract class BaseTextTableRender implements TableRenderInterface { + private static final Pattern NEWLINE = Pattern.compile("\\R"); + + // Pattern characters are left, fill, junction, right. The fill of a vertical pattern is unused. + final String pad(String value, int width, HorizontalAlign align) { + if (align == HorizontalAlign.LEFT) { + return " " + StringUtils.rightPad(value, width) + " "; + } else if (align == HorizontalAlign.RIGHT) { + return " " + StringUtils.leftPad(value, width) + " "; + } else if (align == HorizontalAlign.CENTER) { + return StringUtils.center(value, width + 2); + } else { + throw new IllegalArgumentException("Unsupported HorizontalAlignment: " + align); + } + } + + final List alignments(PrettyTable table) { + List hAligns = new ArrayList(table.getHorizAligns()); + int maxColumns = table.getMaxColumns(); + for (int i = hAligns.size(); i <= maxColumns; i++) { + hAligns.add(table.getDefaultHorizAlign()); + } + return hAligns; + } + + final List cellText(List row) { + return row.stream().map(c -> c.toString()).collect(Collectors.toList()); + } + + final String textRow(List row, List maxWidths, List hAligns, + String glyphs) { + StringBuilder result = new StringBuilder(); + List> splits = row.stream() + .map(c -> Arrays.asList(NEWLINE.split(c.toString()))) + .collect(Collectors.toList()); + int maxLines = splits.stream().map(c -> c.size()).max(Integer::compare).get(); + for (int idx = 0; idx < maxLines; idx++) { + List line = new ArrayList(); + for (List column : splits) { + line.add(idx < column.size() ? column.get(idx) : ""); + } + result.append(this.textRowLine(line, maxWidths, hAligns, glyphs)); + } + return result.toString(); + } + + private String textRowLine(List row, List maxWidths, List hAligns, + String glyphs) { + StringBuilder result = new StringBuilder(); + if (glyphs != null) { + result.append(glyphs.charAt(0)); + } + for (int cIdx = 0; cIdx < row.size(); cIdx++) { + if (glyphs != null && cIdx > 0) { + result.append(glyphs.charAt(2)); + } + result.append(this.pad(row.get(cIdx), maxWidths.get(cIdx), hAligns.get(cIdx))); + } + if (glyphs != null) { + result.append(glyphs.charAt(glyphs.length() - 1)); + } + result.append("\n"); + return result.toString(); + } + + final String rule(String glyphs, List maxWidths, boolean visible) { + if (!visible) { + return ""; + } + StringBuilder result = new StringBuilder(); + result.append(glyphs.charAt(0)); + for (int i = 0; i < maxWidths.size(); i++) { + if (i > 0) { + result.append(glyphs.charAt(2)); + } + int span = maxWidths.get(i) + 2; + for (int j = 0; j < span; j++) { + result.append(glyphs.charAt(1)); + } + } + result.append(glyphs.charAt(glyphs.length() - 1)); + result.append("\n"); + return result.toString(); + } + + // Caption is drawn under the table. + final String textCaption(String caption) { + if (caption == null || caption.isEmpty()) { + return ""; + } + return caption + "\n"; + } + + final boolean sharesLeadingCells(List lastRow, List currentRow) { + boolean shared = false; + for (int i = 0; i < lastRow.size(); i++) { + if (!lastRow.get(i).equals(currentRow.get(i))) { + break; + } + currentRow.set(i, ""); + shared = true; + } + return shared; + } +} diff --git a/src/main/java/rickwporter/prettytable/TextTableRender.java b/src/main/java/rickwporter/prettytable/TextTableRender.java index fcd0380..e1423db 100644 --- a/src/main/java/rickwporter/prettytable/TextTableRender.java +++ b/src/main/java/rickwporter/prettytable/TextTableRender.java @@ -1,124 +1,42 @@ package rickwporter.prettytable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import rickwporter.prettytable.PrettyTable.HorizontalAlign; -class TextTableRender implements TableRenderInterface { - private static final Pattern NEWLINE = Pattern.compile("\\R"); - - String pad(String value, int width, HorizontalAlign align) { - if (align == HorizontalAlign.LEFT) { - return " " + StringUtils.rightPad(value, width) + " "; - } else if (align == HorizontalAlign.RIGHT) { - return " " + StringUtils.leftPad(value, width) + " "; - } else if (align == HorizontalAlign.CENTER) { - return StringUtils.center(value, width + 2); - } else { - throw new IllegalArgumentException("Unsupported HorizontalAlignment: " + align); - } - } - - private String textRow(List row, List maxWidths, List hAligns, - boolean showLines) { - StringBuilder result = new StringBuilder(); - List> splits = row.stream() - .map(c -> Arrays.asList(NEWLINE.split(c.toString()))) - .collect(Collectors.toList()); - int maxLines = splits.stream().map(c -> c.size()).max(Integer::compare).get(); - for (int idx = 0; idx < maxLines; idx++) { - List line = new ArrayList(); - for (List column : splits) { - line.add(idx < column.size() ? column.get(idx) : ""); - } - result.append(this.textRowLine(line, maxWidths, hAligns, showLines)); - } - return result.toString(); - } - - private String textRowLine(List row, List maxWidths, List hAligns, - boolean showLines) { - StringBuilder result = new StringBuilder(); - if (showLines) { - result.append("|"); - } - for (int cIdx = 0; cIdx < row.size(); cIdx++) { - result.append(this.pad(row.get(cIdx), maxWidths.get(cIdx), hAligns.get(cIdx))); - if (showLines) { - result.append("|"); - } - } - result.append("\n"); - return result.toString(); - } - - // Caption is drawn under the table - private String textCaption(String caption) { - if (caption == null || caption.isEmpty()) { - return ""; - } - return caption + "\n"; - } - - private String textRule(List maxWidths, Integer maxColumns, boolean showLines) { - if (!showLines) { - return ""; - } - - StringBuilder result = new StringBuilder(); - result.append("+"); - for (int i = 0; i < maxColumns; i++) { - for (int j = 0; j < maxWidths.get(i) + 2; j++) { - result.append("-"); - } - result.append("+"); - } - result.append("\n"); - return result.toString(); - } +class TextTableRender extends BaseTextTableRender { + private static final String RULE = "+-++"; + private static final String VERTICAL = "| ||"; @Override public String render(PrettyTable table, boolean removeRedundant) { List maxWidths = table.getMaxWidths(); StringBuilder result = new StringBuilder(); - Integer maxColumns = table.getMaxColumns(); boolean showLines = table.isShowLines(); boolean rowDividers = table.isRowDividers() && showLines; - List hAligns = new ArrayList<>(table.getHorizAligns()); - for (int i = hAligns.size(); i <= maxColumns; i++) { - hAligns.add(table.getDefaultHorizAlign()); - } + List hAligns = this.alignments(table); + String vertical = showLines ? VERTICAL : null; if (table.isShowHeader() && !table.getHeaders().isEmpty()) { - result.append(textRule(maxWidths, maxColumns, showLines)); - result.append(textRow(table.getHeaders(), maxWidths, hAligns, showLines)); + result.append(this.rule(RULE, maxWidths, showLines)); + result.append(this.textRow(table.getHeaders(), maxWidths, hAligns, vertical)); } - result.append(textRule(maxWidths, maxColumns, showLines)); - List lastRow = new ArrayList<>(); + result.append(this.rule(RULE, maxWidths, showLines)); + List lastRow = new ArrayList(); for (List row : table.getRows()) { - List currentRow = row.stream().map(c -> c.toString()).collect(Collectors.toList()); - List fullRow = new ArrayList(currentRow); // make a copy before manipulating + List currentRow = this.cellText(row); + List fullRow = new ArrayList(currentRow); boolean divider = true; if (removeRedundant) { - for (int i = 0; i < lastRow.size(); i++) { - if (!lastRow.get(i).equals(currentRow.get(i))) { - break; - } - currentRow.set(i, ""); - divider = false; - } + divider = !this.sharesLeadingCells(lastRow, currentRow); lastRow = fullRow; } - result.append(textRow(currentRow, maxWidths, hAligns, showLines)); - result.append(textRule(maxWidths, maxColumns, rowDividers && divider)); + result.append(this.textRow(currentRow, maxWidths, hAligns, vertical)); + result.append(this.rule(RULE, maxWidths, rowDividers && divider)); } - result.append(textRule(maxWidths, maxColumns, showLines && !rowDividers)); - result.append(textCaption(table.getCaption())); + result.append(this.rule(RULE, maxWidths, showLines && !rowDividers)); + result.append(this.textCaption(table.getCaption())); return result.toString(); } From d6a8004843e6ab9e016f4490db7b9ac9a7f81e40 Mon Sep 17 00:00:00 2001 From: Rick Porter Date: Mon, 2 Nov 2026 13:25:33 -0500 Subject: [PATCH 2/3] Introduce TableGlyphs class with data members instead of a String with positional values --- .../prettytable/BaseTextTableRender.java | 20 ++++++------ .../rickwporter/prettytable/TableGlyphs.java | 31 +++++++++++++++++++ .../prettytable/TextTableRender.java | 6 ++-- 3 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 src/main/java/rickwporter/prettytable/TableGlyphs.java diff --git a/src/main/java/rickwporter/prettytable/BaseTextTableRender.java b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java index cdb9d70..ef6218c 100644 --- a/src/main/java/rickwporter/prettytable/BaseTextTableRender.java +++ b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java @@ -40,7 +40,7 @@ final List cellText(List row) { } final String textRow(List row, List maxWidths, List hAligns, - String glyphs) { + TableGlyphs glyphs) { StringBuilder result = new StringBuilder(); List> splits = row.stream() .map(c -> Arrays.asList(NEWLINE.split(c.toString()))) @@ -57,40 +57,40 @@ final String textRow(List row, List maxWidths, List row, List maxWidths, List hAligns, - String glyphs) { + TableGlyphs glyphs) { StringBuilder result = new StringBuilder(); if (glyphs != null) { - result.append(glyphs.charAt(0)); + result.append(glyphs.left()); } for (int cIdx = 0; cIdx < row.size(); cIdx++) { if (glyphs != null && cIdx > 0) { - result.append(glyphs.charAt(2)); + result.append(glyphs.junction()); } result.append(this.pad(row.get(cIdx), maxWidths.get(cIdx), hAligns.get(cIdx))); } if (glyphs != null) { - result.append(glyphs.charAt(glyphs.length() - 1)); + result.append(glyphs.right()); } result.append("\n"); return result.toString(); } - final String rule(String glyphs, List maxWidths, boolean visible) { + final String rule(TableGlyphs glyphs, List maxWidths, boolean visible) { if (!visible) { return ""; } StringBuilder result = new StringBuilder(); - result.append(glyphs.charAt(0)); + result.append(glyphs.left()); for (int i = 0; i < maxWidths.size(); i++) { if (i > 0) { - result.append(glyphs.charAt(2)); + result.append(glyphs.junction()); } int span = maxWidths.get(i) + 2; for (int j = 0; j < span; j++) { - result.append(glyphs.charAt(1)); + result.append(glyphs.fill()); } } - result.append(glyphs.charAt(glyphs.length() - 1)); + result.append(glyphs.right()); result.append("\n"); return result.toString(); } diff --git a/src/main/java/rickwporter/prettytable/TableGlyphs.java b/src/main/java/rickwporter/prettytable/TableGlyphs.java new file mode 100644 index 0000000..a0a5ade --- /dev/null +++ b/src/main/java/rickwporter/prettytable/TableGlyphs.java @@ -0,0 +1,31 @@ +package rickwporter.prettytable; + +public final class TableGlyphs { + private Character mLeft; + private Character mFill; + private Character mJunction; + private Character mRight; + + public TableGlyphs(Character left, Character fill, Character junction, Character right) { + this.mLeft = left; + this.mFill = fill; + this.mJunction = junction; + this.mRight = right; + } + + public Character left() { + return this.mLeft; + } + + public Character fill() { + return this.mFill; + } + + public Character junction() { + return this.mJunction; + } + + public Character right() { + return this.mRight; + } +} diff --git a/src/main/java/rickwporter/prettytable/TextTableRender.java b/src/main/java/rickwporter/prettytable/TextTableRender.java index e1423db..1220287 100644 --- a/src/main/java/rickwporter/prettytable/TextTableRender.java +++ b/src/main/java/rickwporter/prettytable/TextTableRender.java @@ -6,8 +6,8 @@ import rickwporter.prettytable.PrettyTable.HorizontalAlign; class TextTableRender extends BaseTextTableRender { - private static final String RULE = "+-++"; - private static final String VERTICAL = "| ||"; + private static final TableGlyphs RULE = new TableGlyphs('+', '-', '+', '+'); + private static final TableGlyphs VERTICAL = new TableGlyphs('|', ' ', '|', '|'); @Override public String render(PrettyTable table, boolean removeRedundant) { @@ -16,7 +16,7 @@ public String render(PrettyTable table, boolean removeRedundant) { boolean showLines = table.isShowLines(); boolean rowDividers = table.isRowDividers() && showLines; List hAligns = this.alignments(table); - String vertical = showLines ? VERTICAL : null; + TableGlyphs vertical = showLines ? VERTICAL : null; if (table.isShowHeader() && !table.getHeaders().isEmpty()) { result.append(this.rule(RULE, maxWidths, showLines)); From 0db79120a72510fbe1e2c984af42d41ad7c21640 Mon Sep 17 00:00:00 2001 From: Rick Porter Date: Mon, 2 Nov 2026 13:34:41 -0500 Subject: [PATCH 3/3] Shorten textCaption() to caption() --- src/main/java/rickwporter/prettytable/BaseTextTableRender.java | 2 +- src/main/java/rickwporter/prettytable/TextTableRender.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/rickwporter/prettytable/BaseTextTableRender.java b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java index ef6218c..1e51fc6 100644 --- a/src/main/java/rickwporter/prettytable/BaseTextTableRender.java +++ b/src/main/java/rickwporter/prettytable/BaseTextTableRender.java @@ -96,7 +96,7 @@ final String rule(TableGlyphs glyphs, List maxWidths, boolean visible) } // Caption is drawn under the table. - final String textCaption(String caption) { + final String caption(String caption) { if (caption == null || caption.isEmpty()) { return ""; } diff --git a/src/main/java/rickwporter/prettytable/TextTableRender.java b/src/main/java/rickwporter/prettytable/TextTableRender.java index 1220287..ae7d37e 100644 --- a/src/main/java/rickwporter/prettytable/TextTableRender.java +++ b/src/main/java/rickwporter/prettytable/TextTableRender.java @@ -36,7 +36,7 @@ public String render(PrettyTable table, boolean removeRedundant) { result.append(this.rule(RULE, maxWidths, rowDividers && divider)); } result.append(this.rule(RULE, maxWidths, showLines && !rowDividers)); - result.append(this.textCaption(table.getCaption())); + result.append(this.caption(table.getCaption())); return result.toString(); }