From 932e6fe6d06767413239dda01e16340c971e5419 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Wed, 24 Oct 2018 12:38:27 +0700
Subject: [PATCH] IDEMPIERE-3798:Move iDempiere default branch to openjdk 10
 (hamless warrning)

---
 org.adempiere.base/META-INF/MANIFEST.MF       |  1 +
 .../impexp/AbstractExcelExporter.java         | 21 ++++++++++---------
 .../compiere/process/DocActionTemplate.java   |  1 -
 .../src/org/compiere/util/CCachedRowSet.java  |  9 +++++++-
 .../src/org/compiere/util/ZipUtil.java        |  2 ++
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 6586e4c7eb..04ab1e3524 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -126,3 +126,4 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  groovy,
  javax.xml;bundle-version="1.3.4"
 Automatic-Module-Name: org.adempiere.base
+Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
index db5d908eb9..f9fadcb40d 100644
--- a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
+++ b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
@@ -35,6 +35,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.BorderStyle;
 import org.compiere.model.MSysConfig;
 import org.compiere.util.CLogger;
 import org.compiere.util.DisplayType;
@@ -166,13 +167,13 @@ public abstract class AbstractExcelExporter
 		if (isHeader) {
 			if (m_fontHeader == null) {
 				m_fontHeader = m_workbook.createFont();
-				m_fontHeader.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+				m_fontHeader.setBold(true);
 			}
 			font = m_fontHeader;
 		}
 		else if (isFunctionRow()) {
 			font = m_workbook.createFont();
-			font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+			font.setBold(true);
 			font.setItalic(true);
 		}
 		else {
@@ -233,10 +234,10 @@ public abstract class AbstractExcelExporter
 			HSSFFont font = getFont(false);
 			cs.setFont(font);
 			// Border
-			cs.setBorderLeft((short)1);
-			cs.setBorderTop((short)1);
-			cs.setBorderRight((short)1);
-			cs.setBorderBottom((short)1);
+			cs.setBorderLeft(BorderStyle.THIN);
+			cs.setBorderTop(BorderStyle.THIN);
+			cs.setBorderRight(BorderStyle.THIN);
+			cs.setBorderBottom(BorderStyle.THIN);
 			//
 			if (DisplayType.isDate(displayType)) {
 				cs.setDataFormat(m_dataFormat.getFormat(DisplayType.getDateFormat(getLanguage()).toPattern()));
@@ -259,10 +260,10 @@ public abstract class AbstractExcelExporter
 			HSSFFont font_header = getFont(true);
 			cs_header = m_workbook.createCellStyle();
 			cs_header.setFont(font_header);
-			cs_header.setBorderLeft((short)2);
-			cs_header.setBorderTop((short)2);
-			cs_header.setBorderRight((short)2);
-			cs_header.setBorderBottom((short)2);
+			cs_header.setBorderLeft(BorderStyle.MEDIUM);
+			cs_header.setBorderTop(BorderStyle.MEDIUM);
+			cs_header.setBorderRight(BorderStyle.MEDIUM);
+			cs_header.setBorderBottom(BorderStyle.MEDIUM);
 			cs_header.setDataFormat(HSSFDataFormat.getBuiltinFormat("text"));
 			cs_header.setWrapText(true);
 			m_styles.put(key, cs_header);
diff --git a/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java b/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
index 1e775a36f8..d5053e8ace 100644
--- a/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
+++ b/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
@@ -26,7 +26,6 @@ import org.compiere.model.ModelValidationEngine;
 import org.compiere.model.ModelValidator;
 import org.compiere.model.PO;
 import org.compiere.model.POInfo;
-import org.compiere.util.TimeUtil;
 
 /**
  *	Template for DocAction
diff --git a/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java b/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
index 7291952c30..bb1f225a2b 100644
--- a/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
+++ b/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
@@ -188,6 +188,7 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet
 	 */
 	public static void main (String[] args)
 	{
+		CachedRowSetImpl rs = null;
 		try
 		{
 			Locale.setDefault(Locale.CANADA);
@@ -195,12 +196,18 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet
 			System.out.println("OK 1");
 			get();
 			System.out.println("OK 1a");
-			new CachedRowSetImpl();
+			rs = new CachedRowSetImpl();
 			System.out.println("OK 2");
 		}
 		catch (Exception e)
 		{
 			e.printStackTrace();
+			if (rs != null)
+				try {
+					rs.close();
+				} catch (SQLException e1) {
+					e1.printStackTrace();
+				}
 		}
 	}	//	main
 	
diff --git a/org.adempiere.base/src/org/compiere/util/ZipUtil.java b/org.adempiere.base/src/org/compiere/util/ZipUtil.java
index 292240de04..34b03e074f 100644
--- a/org.adempiere.base/src/org/compiere/util/ZipUtil.java
+++ b/org.adempiere.base/src/org/compiere/util/ZipUtil.java
@@ -401,6 +401,8 @@ public class ZipUtil
 				return pathEntries[i];
 		}
 		path = System.getProperty("sun.boot.class.path");
+		if (path == null)
+			return null;
 		pathEntries = path.split(System.getProperty("path.separator"));
 		for (int i = 0; i < pathEntries.length; i++)
 		{