Fix to code smells

fugerit-org · Sep 6, 2023 · 860f246 · 860f246
1 parent 2e649a1
commit 860f246
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 77 deletions.
diff --git a/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/CellParent.java b/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/CellParent.java
@@ -14,7 +14,7 @@ public CellParent( Cell cell ) {
 	/* (non-Javadoc)
 	 * @see org.fugerit.java.doc.mod.itext.ParentElement#add(com.lowagie.text.Element)
 	 */
-	public void add(Element element) throws Exception {
+	public void add(Element element) {
 		this.cell.addElement( element );
 	}
 

diff --git a/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/DocumentParent.java b/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/DocumentParent.java
@@ -14,7 +14,7 @@ public DocumentParent( Document document) {
 	/* (non-Javadoc)
 	 * @see org.fugerit.java.doc.mod.itext.ParentElement#add(com.lowagie.text.Element)
 	 */
-	public void add(Element element) throws Exception {
+	public void add(Element element) {
 		this.document.add( element );
 	}
 

diff --git a/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/OpenPdfDocTableHelper.java b/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/OpenPdfDocTableHelper.java
@@ -1,12 +1,12 @@
 package org.fugerit.java.doc.mod.openpdf.helpers;
 
 import java.awt.Color;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 
-import org.fugerit.java.core.log.LogFacade;
 import org.fugerit.java.doc.base.model.DocBarcode;
 import org.fugerit.java.doc.base.model.DocBorders;
 import org.fugerit.java.doc.base.model.DocCell;
@@ -20,13 +20,17 @@
 
 import com.lowagie.text.Cell;
 import com.lowagie.text.Chunk;
+import com.lowagie.text.DocumentException;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
 import com.lowagie.text.Paragraph;
 import com.lowagie.text.Table;
 import com.lowagie.text.alignment.HorizontalAlignment;
 import com.lowagie.text.alignment.VerticalAlignment;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class OpenPdfDocTableHelper {
 
 	private OpenPdfDocTableHelper() {}
@@ -84,7 +88,7 @@ private static void handleAligns( DocCell docCell, Cell cell ) {
 		}
 	}
 
-	private static List<Font> handleContent( Table table, CellParent cellParent, DocCell docCell, Cell cell, OpenPdfHelper docHelper ) throws Exception {
+	private static List<Font> handleContent( Table table, CellParent cellParent, DocCell docCell, Cell cell, OpenPdfHelper docHelper ) throws DocumentException, IOException {
 		List<Font> fontList = new ArrayList<>();
 		Iterator<DocElement> itCurrent = docCell.docElements();
 		while ( itCurrent.hasNext() ) {
@@ -96,23 +100,20 @@ private static List<Font> handleContent( Table table, CellParent cellParent, Doc
 				cellParent.add( paragraph );
 			} else if ( docElement instanceof DocPhrase ) {
 				DocPhrase docPhrase = (DocPhrase)docElement;
-				//setStyle( docCell , docPara );
+				log.trace( "docCell -> {}, docPara : {}", docCell, cell );
 				cellParent.add( OpenPpfDocHandler.createPhrase( docPhrase, docHelper, fontList ) );						
 			} else if ( docElement instanceof DocTable ) {
-				LogFacade.getLog().debug( "nested table" );
 				table.insertTable( createTable( (DocTable)docElement, docHelper ) );
 			} else if ( docElement instanceof DocImage ) {
-				LogFacade.getLog().debug( "cell DocImage : "+docElement );
 				cellParent.add( OpenPpfDocHandler.createImage( (DocImage)docElement ) );
 			} else if ( docElement instanceof DocBarcode ) {
-				LogFacade.getLog().info( "cell DocBarcode : "+docElement );
 				cellParent.add( OpenPpfDocHandler.createBarcode( (DocBarcode)docElement, docHelper ) );
 			}
 		}
 		return fontList;
 	}
 
-	private static boolean handleCell( Table table, DocCell docCell, boolean startHeader, DocTable docTable, OpenPdfHelper docHelper ) throws Exception {
+	private static boolean handleCell( Table table, DocCell docCell, boolean startHeader, DocTable docTable, OpenPdfHelper docHelper ) throws DocumentException, IOException {
 		OpenPpfDocHandler.setStyle( docTable, docCell );
 		Cell cell = new Cell();
 		if ( docCell.isHeader() ) {
@@ -144,7 +145,7 @@ private static boolean handleCell( Table table, DocCell docCell, boolean startHe
 		if ( listChunk.size() == fontList.size() ) {
 			for ( int k=0; k<listChunk.size(); k++ ) {
 				Chunk c = (Chunk)listChunk.get( k );
-				Font f = (Font) fontList.get( k );
+				Font f = fontList.get( k );
 				c.setFont( f );
 			}
 		}
@@ -154,7 +155,7 @@ private static boolean handleCell( Table table, DocCell docCell, boolean startHe
 		return startHeader;
 	}
 
-	protected static Table createTable( DocTable docTable, OpenPdfHelper docHelper ) throws Exception {
+	protected static Table createTable( DocTable docTable, OpenPdfHelper docHelper ) throws DocumentException, IOException {
 
 		boolean startHeader = false;
 		Table table = new Table( docTable.getColumns() );
@@ -176,7 +177,7 @@ protected static Table createTable( DocTable docTable, OpenPdfHelper docHelper )
 		if (  cw != null ) {
 			float[] w = new float[ cw.length ];
 			for ( int k=0; k<w.length; k++ ) {
-				w[k] = (float)((float)cw[k]/(float)100);
+				w[k] = ((float)cw[k]/(float)100);
 			}
 			table.setWidths( w );
 		}

diff --git a/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/OpenPdfFontHelper.java b/src/main/java/org/fugerit/java/doc/mod/openpdf/helpers/OpenPdfFontHelper.java
@@ -38,7 +38,7 @@ private static int handleFontStyle( int style, int fontStyle ) {
 		return style;
 	}
 
-	protected static Font createFont( String fontName, String fontPath, int fontSize, int fontStyle, OpenPdfHelper docHelper, String color ) throws Exception {
+	protected static Font createFont( String fontName, String fontPath, int fontSize, int fontStyle, OpenPdfHelper docHelper, String color ) throws DocumentException, IOException {
 		Font font = null;
 		int size = fontSize;
 		int style = Font.NORMAL;