Skip to content

Commit 72d659d

Browse files
RobThreeRobThree
committed
Minor cleanup
1 parent 6c18b46 commit 72d659d

11 files changed

Lines changed: 36 additions & 24 deletions

‎DemoApp/Program.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.AddRow(3, "Larry Page", "Founder Google", 1100000m)
99
.AddRow(4, "Mark Zuckerberg", "Founder Facebook", 1300000m);
1010

11-
var renderers = new ITableRenderer[] {
11+
var renderers = new ITableRenderer[] {
1212
new DefaultTableRenderer(),
1313
new MinimalTableRenderer(),
1414
new MSDOSTableRenderer(),
@@ -21,9 +21,10 @@
2121
};
2222

2323
var tablebuilder = new TableBuilder();
24-
tablebuilder.TypeHandlers.AddHandler<decimal>((v, f) => $"$ {v.ToString("N2")}");
24+
tablebuilder.TypeHandlers.AddHandler<decimal>((v, f) => $"$ {v:N2}");
2525

26-
foreach (var r in renderers) {
26+
foreach (var r in renderers)
27+
{
2728
Console.Write($"{r.GetType().Name}:\n\n");
2829
Console.Write(tablebuilder.Build(table, r));
2930
Console.Write("\n\n");

‎TextTableBuilder/Table.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public class Table
1313
public Table() { }
1414
public Table(IEnumerable<Column> columns)
1515
: this(columns, Enumerable.Empty<Row>()) { }
16-
17-
public Table(IEnumerable<Column> columns, IEnumerable<Row> rows)
18-
=> AddColumns(columns).AddRow(rows);
16+
17+
public Table(IEnumerable<Column> columns, IEnumerable<Row> rows)
18+
=> AddColumns(columns).AddRow(rows);
1919

2020
public Table AddColumn(string name, Align align = Align.Left, Align rowAlign = Align.Left, int? minWidth = null, int? width = null, ITypeHandler? typeHandler = null)
2121
=> AddColumn(new Column(name, align, rowAlign, minWidth, width, typeHandler));
@@ -33,8 +33,10 @@ public Table AddColumn(Column column)
3333
public Table AddColumns(IEnumerable<Column> columns)
3434
{
3535
if (columns is null)
36+
{
3637
throw new ArgumentNullException(nameof(columns));
37-
38+
}
39+
3840
foreach (var column in columns)
3941
{
4042
AddColumn(column);

‎TextTableBuilder/TableRenderers/BaseTableRenderer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ public abstract class BaseTableRenderer : ITableRenderer
66
{
77
public const char DEFAULTPADDINGCHAR = ' ';
88
public const int DEFAULTCELLPADDING = 1;
9-
9+
1010
public abstract string Render(ReadOnlyCollection<RenderColumn> columns, IEnumerable<string[]> rows);
1111

12-
protected static string RenderRow(char columnSeparator, IEnumerable<string> values, char paddingChar, int cellPadding)
12+
protected static string RenderRow(char columnSeparator, IEnumerable<string> values)
1313
=> string.Join(columnSeparator.ToString(), values);
1414

1515
protected static string RenderLine(char left, char mid, char right, char pad, ReadOnlyCollection<RenderColumn> widths, int cellPadding)

‎TextTableBuilder/TableRenderers/BorderedTableRenderer.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ public class BorderedTableRenderer : BaseTableRenderer
1212
public BorderedTableRenderer(string borderChars, int cellPadding = DEFAULTCELLPADDING, char paddingChar = DEFAULTPADDINGCHAR)
1313
{
1414
if (borderChars.Length != 15)
15+
{
1516
throw new Exception($"{nameof(borderChars)} must be exactly 15 characters long");
17+
}
18+
1619
_chars = borderChars;
1720
_cellpadding = cellPadding;
1821
_paddingchar = paddingChar;
@@ -24,19 +27,19 @@ public override string Render(ReadOnlyCollection<RenderColumn> columns, IEnumera
2427

2528
// Top border
2629
sb.AppendLine(RenderLine(_chars[0], _chars[2], _chars[3], _chars[1], columns, _cellpadding));
27-
30+
2831
// Headers
29-
sb.AppendLine($"{_chars[4]}{RenderRow(_chars[5], columns.Select(c => RenderCell(c.Name, c.HeaderAlign, c.Width, _paddingchar, _cellpadding)), _paddingchar, _cellpadding)}{_chars[6]}");
32+
sb.AppendLine($"{_chars[4]}{RenderRow(_chars[5], columns.Select(c => RenderCell(c.Name, c.HeaderAlign, c.Width, _paddingchar, _cellpadding)))}{_chars[6]}");
3033

3134
// Header separator
3235
sb.AppendLine(RenderLine(_chars[7], _chars[9], _chars[10], _chars[8], columns, _cellpadding));
33-
36+
3437
// Rows
3538
foreach (var row in rows)
3639
{
37-
sb.AppendLine($"{_chars[4]}{RenderRow(_chars[5], row.Select((value, i) => RenderCell(value, columns[i].ValueAlign, columns[i].Width, _paddingchar, _cellpadding)), _paddingchar, _cellpadding)}{_chars[6]}");
40+
sb.AppendLine($"{_chars[4]}{RenderRow(_chars[5], row.Select((value, i) => RenderCell(value, columns[i].ValueAlign, columns[i].Width, _paddingchar, _cellpadding)))}{_chars[6]}");
3841
}
39-
42+
4043
// Bottom border
4144
sb.AppendLine(RenderLine(_chars[11], _chars[13], _chars[14], _chars[12], columns, _cellpadding));
4245
return sb.ToString();

‎TextTableBuilder/TableRenderers/DotsTableRenderer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace TextTableBuilder.TableRenderers;
22

3-
public class DotsTableRenderer : BorderedTableRenderer {
3+
public class DotsTableRenderer : BorderedTableRenderer
4+
{
45
public DotsTableRenderer(int cellPadding = DEFAULTCELLPADDING, char paddingChar = DEFAULTPADDINGCHAR)
56
: base("....::::.::....", cellPadding, paddingChar) { }
67
}

‎TextTableBuilder/TableRenderers/DoubleLineTableRenderer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace TextTableBuilder.TableRenderers;
22

3-
public class DoubleLineTableRenderer : BorderedTableRenderer {
3+
public class DoubleLineTableRenderer : BorderedTableRenderer
4+
{
45
public DoubleLineTableRenderer(int cellPadding = DEFAULTCELLPADDING, char paddingChar = DEFAULTPADDINGCHAR)
56
: base("╔═╦╗║║║╠═╬╣╚═╩╝", cellPadding, paddingChar) { }
67
}

‎TextTableBuilder/TableRenderers/HatchedTableRenderer.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace TextTableBuilder.TableRenderers;
22

3-
public class HatchedTableRenderer : BorderedTableRenderer {
4-
public HatchedTableRenderer(int cellPadding = DEFAULTCELLPADDING, char paddingChar = DEFAULTPADDINGCHAR)
3+
public class HatchedTableRenderer : BorderedTableRenderer
4+
{
5+
public HatchedTableRenderer(int cellPadding = DEFAULTCELLPADDING, char paddingChar = DEFAULTPADDINGCHAR)
56
: base(@"/-+\|||+-++\-+/", cellPadding, paddingChar) { }
67
}

‎TextTableBuilder/TableRenderers/RoundedCornersTableRenderer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace TextTableBuilder.TableRenderers;
22

3-
public class RoundedCornersTableRenderer : BorderedTableRenderer {
3+
public class RoundedCornersTableRenderer : BorderedTableRenderer
4+
{
45
public RoundedCornersTableRenderer(int cellPadding = DEFAULTCELLPADDING, char paddingChar = DEFAULTPADDINGCHAR)
56
: base("╭─┬╮│││├─┼┤╰─┴╯", cellPadding, paddingChar) { }
67
}

‎TextTableBuilder/TableRenderers/SimpleLineTableRenderer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace TextTableBuilder.TableRenderers;
22

3-
public class SimpleLineTableRenderer : BorderedTableRenderer {
3+
public class SimpleLineTableRenderer : BorderedTableRenderer
4+
{
45
public SimpleLineTableRenderer(int cellPadding = DEFAULTCELLPADDING, char paddingChar = DEFAULTPADDINGCHAR)
56
: base("+-++|||+-+++-++", cellPadding, paddingChar) { }
67
}

‎TextTableBuilder/TableRenderers/SimpleTableRenderer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ public override string Render(ReadOnlyCollection<RenderColumn> columns, IEnumera
2323
var sb = new StringBuilder();
2424

2525
// Headers
26-
sb.AppendLine(RenderRow(_columnseparator, columns.Select(c => RenderCell(c.Name, c.HeaderAlign, c.Width, _paddingchar, _cellpadding)), _paddingchar, _cellpadding));
26+
sb.AppendLine(RenderRow(_columnseparator, columns.Select(c => RenderCell(c.Name, c.HeaderAlign, c.Width, _paddingchar, _cellpadding))));
2727

2828
// Header separator
2929
if (_rowseparator is not null)
3030
{
31-
sb.AppendLine(RenderRow(_columnseparator, columns.Select(c => new string(_rowseparator.Value, c.Width + (_cellpadding * 2))), _paddingchar, _cellpadding));
31+
sb.AppendLine(RenderRow(_columnseparator, columns.Select(c => new string(_rowseparator.Value, c.Width + (_cellpadding * 2)))));
3232
}
3333

3434
// Rows
3535
foreach (var row in rows)
3636
{
37-
sb.AppendLine(RenderRow(_columnseparator, row.Select((value, i) => RenderCell(value, columns[i].ValueAlign, columns[i].Width, _paddingchar, _cellpadding)), _paddingchar, _cellpadding));
37+
sb.AppendLine(RenderRow(_columnseparator, row.Select((value, i) => RenderCell(value, columns[i].ValueAlign, columns[i].Width, _paddingchar, _cellpadding))));
3838
}
3939
return sb.ToString();
4040
}

0 commit comments

Comments
 (0)