Menu

Diff of /trunk/xls-generator/src/main/java/net/sf/ennahdi/automatic/report/generator/xls/engine/XLSEngine.java [r111] .. [r112]  Maximize  Restore

Switch to side-by-side view

--- a/trunk/xls-generator/src/main/java/net/sf/ennahdi/automatic/report/generator/xls/engine/XLSEngine.java
+++ b/trunk/xls-generator/src/main/java/net/sf/ennahdi/automatic/report/generator/xls/engine/XLSEngine.java
@@ -10,14 +10,10 @@
 import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 
-import net.sf.ennahdi.automatic.report.generator.generic.engine.Engine;
-import net.sf.ennahdi.automatic.report.generator.generic.query.Row;
-
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.ss.usermodel.BorderStyle;
@@ -30,6 +26,9 @@
 import org.apache.poi.xssf.streaming.SXSSFRow;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+
+import net.sf.ennahdi.automatic.report.generator.generic.engine.Engine;
+import net.sf.ennahdi.automatic.report.generator.generic.engine.SQLQuery;
 /**
  * 
  * @author 	ENNAHDI EL IDRISSI, Mohamed
@@ -63,8 +62,8 @@
     SXSSFCell cell;
     SXSSFWorkbook workbook;
 	
-	public XLSEngine(Connection connection, List<Row> rows, String fileName) {
-		super(connection, rows);
+	public XLSEngine(Connection connection, SQLQuery queryType, String query, String fileName) {
+		super(connection, queryType, query);
 		this.path = System.getProperty("user.home") + "//AutomaticReportGenerator/" + fileName;
 	}
 
@@ -296,7 +295,7 @@
 	 */
 	private Font newFont(String fontName, boolean bold) {
 		Font font = workbook.createFont();
-		if (StringUtils.isNotBlank(fontName)) {
+		if (Objects.nonNull(fontName) && !fontName.isEmpty()) {
 			font.setFontName(fontName);
 		}
         font.setBold(bold);
MongoDB Logo MongoDB