Merge branch 'develop'

Author: fugerit79

docgen/parameters.json

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

docgen/release-notes.txt

@@ -1,4 +1,10 @@
-0.5.6 (2022-12-05)
+0.5.7 (2022-12-09)
+------------------
++ Updated fj-core version to 0.8.4
++ Updated fj-bom version to 0.2.3
++ Added facade for creating new SimpleTable
+
+0.5.6 (2022-12-05)
 ------------------
 + Changed base path of freemarker config to avoid conflict
 + Changed base path of mod fop config to avoid conflict

fj-doc-lib-simpletable/README.md

@@ -20,7 +20,7 @@ This module is already configured, and can be called just creating the model of
 		DocTypeHandler handler = ...
 
 		// the table model
-		SimpleTable simpleTableModel = new SimpleTable( "30;30;40" );
+		SimpleTable simpleTableModel = SimpleTableFacade.newTable( 30, 30, 40 );
 		SimpleRow headerRow = new SimpleRow( BooleanUtils.BOOLEAN_TRUE );
 		headerRow.addCell( "Name" );
 		headerRow.addCell( "Surname" );

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

@@ -0,0 +1,62 @@
+package org.fugerit.java.doc.lib.simpletable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.fugerit.java.core.cfg.ConfigRuntimeException;
+import org.fugerit.java.core.lang.helpers.StringUtils;
+import org.fugerit.java.doc.lib.simpletable.model.SimpleTable;
+
+public class SimpleTableFacade {
+
+	/**
+	 * Creates a new {@link SimpleTable}
+	 * 
+	 * A minimum of one column must be provided.
+	 * Sum of column widths must be 100
+	 * 
+	 * @param   colWidths	columns width percentage (minimum column width must be 1, sum must be 100)
+	 * @return	the new table model initialized
+	 */
+	public static SimpleTable newTable( Integer... colWidths ) {
+		if ( colWidths == null ) {
+			throw new ConfigRuntimeException( "Minimum one colunm must be provided" );
+		}
+		return newTable( Arrays.asList( colWidths ) );
+	}
+
+	/**
+	 * Creates a new {@link SimpleTable}
+	 * 
+	 * A minimum of one column must be provided.
+	 * Sum of column widths must be 100
+	 * 
+	 * @param	colWidths	columns width percentage (minimum column width must be 1, sum must be 100)
+	 * @return	the new table model initialized
+	 */
+	public static SimpleTable newTable( List<Integer> colWidths ) {
+		if ( colWidths == null ) {
+			throw new ConfigRuntimeException( "Minimum one colunm must be provided" );
+		} else {
+			int sum = 0;
+			for ( int v : colWidths ) {
+				sum+=v;
+			}
+			if ( sum != 100 ) {
+				throw new ConfigRuntimeException( "Column width sum must be 100, while is : "+sum );
+			}
+		}
+		return new SimpleTable( StringUtils.concat( ";" , colWidths.stream().map( v -> v.toString() ).collect( Collectors.toList() ) ) );
+	}
+	
+	/**
+	 * Creates a new {@link SimpleTable} , made of a single column with width 100.
+	 * 
+	 * @return	the new table model initialized
+	 */
+	public static SimpleTable newTableSingleColumn() {
+		return newTable( 100 );
+	}
+	
+}

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

@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.fugerit.java.doc.lib.simpletable.SimpleTableFacade;
+
 public class SimpleTable {
 
 	public static final String ATT_NAME = "simpleTableModel";
@@ -19,6 +21,13 @@ public List<SimpleRow> getRows() {
 		return rows;
 	}
 
+	/**
+	 * Creates a new SimpleTable.
+	 * 
+	 * NOTE: betteer using the factory method in {@link SimpleTableFacade}
+	 * 
+	 * @param colwidths	the semicolons separeted columns widh in percentage
+	 */
 	public SimpleTable( String colwidths ) {
 		this.rows = new ArrayList<SimpleRow>();
 		this.columns = String.valueOf( colwidths.split( ";" ).length );

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

@@ -9,6 +9,7 @@
 import org.fugerit.java.core.lang.helpers.BooleanUtils;
 import org.fugerit.java.doc.base.config.DocTypeHandler;
 import org.fugerit.java.doc.lib.simpletable.SimpleTableDocConfig;
+import org.fugerit.java.doc.lib.simpletable.SimpleTableFacade;
 import org.fugerit.java.doc.lib.simpletable.model.SimpleRow;
 import org.fugerit.java.doc.lib.simpletable.model.SimpleTable;
 import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler;
@@ -37,7 +38,7 @@ public void init() throws ConfigException {
 
 	@Test
 	public void testSimpleTable01() {
-		SimpleTable simpleTableModel = new SimpleTable( "30;30;40" );
+		SimpleTable simpleTableModel = SimpleTableFacade.newTable( 30, 30, 40 );
 		SimpleRow headerRow = new SimpleRow( BooleanUtils.BOOLEAN_TRUE );
 		headerRow.addCell( "Name" );
 		headerRow.addCell( "Surname" );

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-bom</artifactId>
-		<version>0.2.2</version>
+		<version>0.2.3</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 	    <maven.compiler.source>${java-version-compliance}</maven.compiler.source>
 	    <maven.compiler.target>${java-version-compliance}</maven.compiler.target>
 	    <!-- fj java versions -->
-	    <fj-version>0.8.0</fj-version>
+	    <fj-version>0.8.4</fj-version>
 	    <fj-doc-version>${project.version}</fj-doc-version>
 	</properties>