Merge branch 'develop'

Author: fugerit79

docgen/parameters.json

@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.5.7",
-	"date" : "09/12/2022",
+	"version" : "0.5.8",
+	"date" : "10/12/2022",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

docgen/release-notes.txt

@@ -1,4 +1,8 @@
-0.5.7 (2022-12-09)
+0.5.8 (2022-12-10)
+------------------
++ Added support for border width in simpletable module
+
+0.5.7 (2022-12-09)
 ------------------
 + Updated fj-core version to 0.8.4
 + Updated fj-bom version to 0.2.3

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

@@ -2,7 +2,11 @@
 
 public class SimpleCell {
 
+	public static final int BORDER_WIDTH_UNSET = -1;
+	
 	private String content;
+	
+	private int borderWidth;
 
 	public String getContent() {
 		return content;
@@ -12,9 +16,24 @@ public void setContent(String content) {
 		this.content = content;
 	}
 
+	public int getBorderWidth() {
+		return borderWidth;
+	}
+
+	public void setBorderWidth(int borderWidth) {
+		this.borderWidth = borderWidth;
+	}
+	
 	public SimpleCell(String content) {
 		super();
 		this.content = content;
+		this.borderWidth = BORDER_WIDTH_UNSET;
+	}
+
+	public SimpleCell(String content, int borderWidth) {
+		super();
+		this.content = content;
+		this.borderWidth = borderWidth;
 	}
 
 }

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

@@ -9,11 +9,17 @@ public class SimpleTable {
 
 	public static final String ATT_NAME = "simpleTableModel";
 
+	public static final String DEFAULT_SHEET_NAME = "Table";
+	
+	public static final int DEFAULT_BORDER_WIDTH = 0;
+	
 	private String columns;
 
 	private String sheetName;
 
 	private String  colwidths;
+
+	private int defaultBorderWidth;
 
 	private List<SimpleRow> rows;
 
@@ -32,11 +38,17 @@ public SimpleTable( String colwidths ) {
 		this.rows = new ArrayList<SimpleRow>();
 		this.columns = String.valueOf( colwidths.split( ";" ).length );
 		this.colwidths = colwidths;
-		this.sheetName = "decodifica";
+		this.sheetName = DEFAULT_SHEET_NAME;
+		this.defaultBorderWidth = DEFAULT_BORDER_WIDTH;
 	}
 
 	public void addRow( SimpleRow row ) {
 		this.getRows().add( row );
+		for ( SimpleCell cell : row.getCells() ) {
+			if ( cell.getBorderWidth() == SimpleCell.BORDER_WIDTH_UNSET ) {
+				cell.setBorderWidth( this.defaultBorderWidth );
+			}
+		}
 	}
 
 	public String getColumns() {
@@ -55,5 +67,12 @@ public void setSheetName(String sheetName) {
 		this.sheetName = sheetName;
 	}
 
-	
+	public int getDefaultBorderWidth() {
+		return defaultBorderWidth;
+	}
+
+	public void setDefaultBorderWidth(int defaultBorderWidth) {
+		this.defaultBorderWidth = defaultBorderWidth;
+	}
+
 }

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

@@ -20,7 +20,7 @@
 			<#list simpleTableModel.rows as simpleRow>
        		<row header="${simpleRow.head}">
        			<#list simpleRow.cells as simpleCell>
-    			<cell <#if (simpleRow.head == 'true') > align="center" </#if> border-width="0"><para <#if (simpleRow.head == 'true') > style="bold" </#if>  ><#if (simpleCell.content)??>${simpleCell.content}</#if></para></cell>
+    			<cell <#if (simpleRow.head == 'true') > align="center" </#if> border-width="${simpleCell.borderWidth}"><para <#if (simpleRow.head == 'true') > style="bold" </#if>  ><#if (simpleCell.content)??>${simpleCell.content}</#if></para></cell>
     			</#list>  
     		</row>
 			</#list>   		

fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java

@@ -39,6 +39,7 @@ public void init() throws ConfigException {
 	@Test
 	public void testSimpleTable01() {
 		SimpleTable simpleTableModel = SimpleTableFacade.newTable( 30, 30, 40 );
+		simpleTableModel.setDefaultBorderWidth( 1 );
 		SimpleRow headerRow = new SimpleRow( BooleanUtils.BOOLEAN_TRUE );
 		headerRow.addCell( "Name" );
 		headerRow.addCell( "Surname" );