Skip to content

Commit 4ce9747

Browse files
committed
Added support for maximum table width and doc language in simpletable
module
1 parent 7c96da2 commit 4ce9747

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

docgen/release-notes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
0.5.9 (2022-12-12)
22
------------------
3-
+ Added support for maximum table width in simpletable module
3+
+ Added support for maximum table width and doc language in simpletable module
44

55
0.5.9 (2022-12-11)
66
------------------

fj-doc-lib-simpletable/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## version 0.5.10 - 2022-12-12
44
* Added maximum table width
5+
* Added doc language support
56

67
## version 0.5.9 - 2022-12-11
7-
* Added support for cell style and align
8+
* Added support for cell style and align

fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/model/SimpleTable.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5+
import java.util.Locale;
56

67
import org.fugerit.java.core.lang.helpers.BooleanUtils;
78
import org.fugerit.java.doc.lib.simpletable.SimpleTableFacade;
@@ -14,6 +15,8 @@ public class SimpleTable {
1415

1516
public static final String DEFAULT_TABLE_WIDTH = "100";
1617

18+
public static final String DEFAULT_DOC_LANGUAGE = Locale.ENGLISH.getLanguage();
19+
1720
public static final int DEFAULT_BORDER_WIDTH = 0;
1821

1922
private String tableWidth;
@@ -23,6 +26,8 @@ public class SimpleTable {
2326
private String sheetName;
2427

2528
private String colwidths;
29+
30+
private String docLanguage;
2631

2732
private int defaultBorderWidth;
2833

@@ -46,6 +51,7 @@ public SimpleTable( String colwidths ) {
4651
this.sheetName = DEFAULT_SHEET_NAME;
4752
this.defaultBorderWidth = DEFAULT_BORDER_WIDTH;
4853
this.tableWidth = DEFAULT_TABLE_WIDTH;
54+
this.docLanguage = DEFAULT_DOC_LANGUAGE;
4955
}
5056

5157
public void addRow( SimpleRow row ) {
@@ -88,6 +94,14 @@ public String getTableWidth() {
8894
return tableWidth;
8995
}
9096

97+
public String getDocLanguage() {
98+
return docLanguage;
99+
}
100+
101+
public void setDocLanguage(String docLanguage) {
102+
this.docLanguage = docLanguage;
103+
}
104+
91105
public SimpleTable withTableWidth( String tableWidth ) {
92106
this.tableWidth = tableWidth;
93107
return this;
@@ -97,5 +111,10 @@ public SimpleTable withSheetName( String tableWidth ) {
97111
this.tableWidth = tableWidth;
98112
return this;
99113
}
114+
115+
public SimpleTable withDocLanguage( String docLanguage ) {
116+
this.docLanguage = docLanguage;
117+
return this;
118+
}
100119

101120
}

fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<info name="csv-table-id">simple-table</info>
1313
<!-- for fixed size formats, like pdf -->
1414
<info name="page-width">29.7cm</info>
15-
<info name="page-height">21cm</info>
15+
<info name="page-height">21cm</info>
16+
<!-- language -->
17+
<info name="doc-language">${simpleTableModel.docLanguage}</info>
1618
</metadata>
1719
<body>
1820

0 commit comments

Comments
 (0)