midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3798:Move iDempiere default branch to openjdk 10 (hamless warrning)

This commit is contained in:
hieplq 2018-10-24 12:38:27 +07:00
parent ef57afb335
commit 932e6fe6d0
5 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -126,3 +126,4 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
groovy, groovy,
javax.xml;bundle-version="1.3.4" javax.xml;bundle-version="1.3.4"
Automatic-Module-Name: org.adempiere.base Automatic-Module-Name: org.adempiere.base
Bundle-Vendor: iDempiere Community

21
org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java
View File

@ -35,6 +35,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
@ -166,13 +167,13 @@ public abstract class AbstractExcelExporter
if (isHeader) { if (isHeader) {
if (m_fontHeader == null) { if (m_fontHeader == null) {
m_fontHeader = m_workbook.createFont(); m_fontHeader = m_workbook.createFont();
m_fontHeader.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); m_fontHeader.setBold(true);
} }
font = m_fontHeader; font = m_fontHeader;
} }
else if (isFunctionRow()) { else if (isFunctionRow()) {
font = m_workbook.createFont(); font = m_workbook.createFont();
font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); font.setBold(true);
font.setItalic(true); font.setItalic(true);
} }
else { else {
@ -233,10 +234,10 @@ public abstract class AbstractExcelExporter
HSSFFont font = getFont(false); HSSFFont font = getFont(false);
cs.setFont(font); cs.setFont(font);
// Border // Border
cs.setBorderLeft((short)1); cs.setBorderLeft(BorderStyle.THIN);
cs.setBorderTop((short)1); cs.setBorderTop(BorderStyle.THIN);
cs.setBorderRight((short)1); cs.setBorderRight(BorderStyle.THIN);
cs.setBorderBottom((short)1); cs.setBorderBottom(BorderStyle.THIN);
// //
if (DisplayType.isDate(displayType)) { if (DisplayType.isDate(displayType)) {
cs.setDataFormat(m_dataFormat.getFormat(DisplayType.getDateFormat(getLanguage()).toPattern())); cs.setDataFormat(m_dataFormat.getFormat(DisplayType.getDateFormat(getLanguage()).toPattern()));
@ -259,10 +260,10 @@ public abstract class AbstractExcelExporter
HSSFFont font_header = getFont(true); HSSFFont font_header = getFont(true);
cs_header = m_workbook.createCellStyle(); cs_header = m_workbook.createCellStyle();
cs_header.setFont(font_header); cs_header.setFont(font_header);
cs_header.setBorderLeft((short)2); cs_header.setBorderLeft(BorderStyle.MEDIUM);
cs_header.setBorderTop((short)2); cs_header.setBorderTop(BorderStyle.MEDIUM);
cs_header.setBorderRight((short)2); cs_header.setBorderRight(BorderStyle.MEDIUM);
cs_header.setBorderBottom((short)2); cs_header.setBorderBottom(BorderStyle.MEDIUM);
cs_header.setDataFormat(HSSFDataFormat.getBuiltinFormat("text")); cs_header.setDataFormat(HSSFDataFormat.getBuiltinFormat("text"));
cs_header.setWrapText(true); cs_header.setWrapText(true);
m_styles.put(key, cs_header); m_styles.put(key, cs_header);

1
org.adempiere.base/src/org/compiere/process/DocActionTemplate.java
View File

@ -26,7 +26,6 @@ import org.compiere.model.ModelValidationEngine;
import org.compiere.model.ModelValidator; import org.compiere.model.ModelValidator;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.model.POInfo; import org.compiere.model.POInfo;
import org.compiere.util.TimeUtil;
/** /**
* Template for DocAction * Template for DocAction

9
org.adempiere.base/src/org/compiere/util/CCachedRowSet.java
View File

@ -188,6 +188,7 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet
*/ */
public static void main (String[] args) public static void main (String[] args)
{ {
CachedRowSetImpl rs = null;
try try
{ {
Locale.setDefault(Locale.CANADA); Locale.setDefault(Locale.CANADA);
@ -195,12 +196,18 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet
System.out.println("OK 1"); System.out.println("OK 1");
get(); get();
System.out.println("OK 1a"); System.out.println("OK 1a");
new CachedRowSetImpl(); rs = new CachedRowSetImpl();
System.out.println("OK 2"); System.out.println("OK 2");
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
if (rs != null)
try {
rs.close();
} catch (SQLException e1) {
e1.printStackTrace();
}
} }
} // main } // main

2
org.adempiere.base/src/org/compiere/util/ZipUtil.java
View File

@ -401,6 +401,8 @@ public class ZipUtil
return pathEntries[i]; return pathEntries[i];
} }
path = System.getProperty("sun.boot.class.path"); path = System.getProperty("sun.boot.class.path");
if (path == null)
return null;
pathEntries = path.split(System.getProperty("path.separator")); pathEntries = path.split(System.getProperty("path.separator"));
for (int i = 0; i < pathEntries.length; i++) for (int i = 0; i < pathEntries.length; i++)
{ {