Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

forbidden apis fixes 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1700076 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2015-08-29 21:45:08 +00:00
parent a9f220d154
commit 72433ac405
5 changed files with 95 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/poi/ss/usermodel/DataFormatter.java
View File

@ -440,8 +440,8 @@ public class DataFormatter {
Matcher dateMatcher = daysAsText.matcher(formatStr); Matcher dateMatcher = daysAsText.matcher(formatStr);
if (dateMatcher.find()) { if (dateMatcher.find()) {
String match = dateMatcher.group(0); String match = dateMatcher.group(0).toUpperCase(Locale.ROOT).replaceAll("D", "E");
formatStr = dateMatcher.replaceAll(match.toUpperCase().replaceAll("D", "E")); formatStr = dateMatcher.replaceAll(match);
} }
// Convert excel date format to SimpleDateFormat. // Convert excel date format to SimpleDateFormat.
@ -903,8 +903,9 @@ public class DataFormatter {
/** /**
* @return a <tt>DecimalFormat</tt> with parseIntegerOnly set <code>true</code> * @return a <tt>DecimalFormat</tt> with parseIntegerOnly set <code>true</code>
*/ */
/* package */ static DecimalFormat createIntegerOnlyFormat(String fmt) { private static DecimalFormat createIntegerOnlyFormat(String fmt) {
DecimalFormat result = new DecimalFormat(fmt); DecimalFormatSymbols dsf = DecimalFormatSymbols.getInstance(Locale.ROOT);
DecimalFormat result = new DecimalFormat(fmt, dsf);
result.setParseIntegerOnly(true); result.setParseIntegerOnly(true);
return result; return result;
} }

13
src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
View File

@ -40,13 +40,18 @@ public class ExcelStyleDateFormatter extends SimpleDateFormat {
public static final char L_BRACKET_SYMBOL = '\ue016'; public static final char L_BRACKET_SYMBOL = '\ue016';
public static final char LL_BRACKET_SYMBOL = '\ue017'; public static final char LL_BRACKET_SYMBOL = '\ue017';
private DecimalFormat format1digit = new DecimalFormat("0"); private final DecimalFormat format1digit;
private DecimalFormat format2digits = new DecimalFormat("00"); private final DecimalFormat format2digits;
private DecimalFormat format3digit = new DecimalFormat("0"); private final DecimalFormat format3digit;
private DecimalFormat format4digits = new DecimalFormat("00"); private final DecimalFormat format4digits;
{ {
DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(Locale.ROOT);
format1digit = new DecimalFormat("0", dfs);
format2digits = new DecimalFormat("00", dfs);
format3digit = new DecimalFormat("0", dfs);
format4digits = new DecimalFormat("00", dfs);
DataFormatter.setExcelStyleRoundingMode(format1digit, RoundingMode.DOWN); DataFormatter.setExcelStyleRoundingMode(format1digit, RoundingMode.DOWN);
DataFormatter.setExcelStyleRoundingMode(format2digits, RoundingMode.DOWN); DataFormatter.setExcelStyleRoundingMode(format2digits, RoundingMode.DOWN);
DataFormatter.setExcelStyleRoundingMode(format3digit); DataFormatter.setExcelStyleRoundingMode(format3digit);

3
src/java/org/apache/poi/ss/util/CellReference.java
View File

@ -17,6 +17,7 @@
package org.apache.poi.ss.util; package org.apache.poi.ss.util;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -86,7 +87,7 @@ public class CellReference {
* delimited and escaped as per normal syntax rules for formulas. * delimited and escaped as per normal syntax rules for formulas.
*/ */
public CellReference(String cellRef) { public CellReference(String cellRef) {
if(cellRef.toUpperCase().endsWith("#REF!")) { if(cellRef.toUpperCase(Locale.ROOT).endsWith("#REF!")) {
throw new IllegalArgumentException("Cell reference invalid: " + cellRef); throw new IllegalArgumentException("Cell reference invalid: " + cellRef);
} }

7
src/testcases/org/apache/poi/ss/util/AllSSUtilTests.java
View File

@ -26,12 +26,17 @@ import org.junit.runners.Suite;
*/ */
@RunWith(Suite.class) @RunWith(Suite.class)
@Suite.SuiteClasses({ @Suite.SuiteClasses({
TestAreaReference.class,
TestCellRangeAddress.class, TestCellRangeAddress.class,
TestCellReference.class, TestCellReference.class,
TestDateFormatConverter.class,
TestExpandedDouble.class, TestExpandedDouble.class,
TestNumberComparer.class, TestNumberComparer.class,
TestNumberToTextConverter.class, TestNumberToTextConverter.class,
TestRegion.class TestRegion.class,
TestSheetBuilder.class,
TestSheetUtil.class,
TestWorkbookUtil.class
}) })
public class AllSSUtilTests { public class AllSSUtilTests {
} }

142
src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java
View File

@ -42,78 +42,82 @@ public final class TestDateFormatConverter extends TestCase {
private void outputLocaleDataFormats( Date date, boolean dates, boolean times, int style, String styleName ) throws Exception { private void outputLocaleDataFormats( Date date, boolean dates, boolean times, int style, String styleName ) throws Exception {
Workbook workbook = new HSSFWorkbook(); Workbook workbook = new HSSFWorkbook();
String sheetName;
if( dates ) {
if( times ) {
sheetName = "DateTimes";
} else {
sheetName = "Dates";
}
} else {
sheetName = "Times";
}
Sheet sheet = workbook.createSheet(sheetName);
Row header = sheet.createRow(0);
header.createCell(0).setCellValue("locale");
header.createCell(1).setCellValue("DisplayName");
header.createCell(2).setCellValue("Excel " + styleName);
header.createCell(3).setCellValue("java.text.DateFormat");
header.createCell(4).setCellValue("Equals");
header.createCell(5).setCellValue("Java pattern");
header.createCell(6).setCellValue("Excel pattern");
int rowNum = 1;
for( Locale locale : DateFormat.getAvailableLocales() ) {
try {
Row row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue(locale.toString());
row.createCell(1).setCellValue(locale.getDisplayName());
DateFormat dateFormat;
if( dates ) {
if( times ) {
dateFormat = DateFormat.getDateTimeInstance(style, style, locale);
} else {
dateFormat = DateFormat.getDateInstance(style, locale);
}
} else {
dateFormat = DateFormat.getTimeInstance(style, locale);
}
Cell cell = row.createCell(2);
cell.setCellValue(date);
CellStyle cellStyle = row.getSheet().getWorkbook().createCellStyle();
String javaDateFormatPattern = ((SimpleDateFormat)dateFormat).toPattern();
String excelFormatPattern = DateFormatConverter.convert(locale, javaDateFormatPattern);
DataFormat poiFormat = row.getSheet().getWorkbook().createDataFormat();
cellStyle.setDataFormat(poiFormat.getFormat(excelFormatPattern));
row.createCell(3).setCellValue(dateFormat.format(date));
cell.setCellStyle(cellStyle);
// the formula returns TRUE is the formatted date in column C equals to the string in column D
row.createCell(4).setCellFormula("TEXT(C"+rowNum+",G"+rowNum+")=D" + rowNum);
row.createCell(5).setCellValue(javaDateFormatPattern);
row.createCell(6).setCellValue(excelFormatPattern);
} catch (Exception e) {
throw new RuntimeException("Failed for locale: " + locale + ", having locales: " +
Arrays.toString(DateFormat.getAvailableLocales()), e);
}
}
File outputFile = TempFile.createTempFile("Locale" + sheetName + styleName, ".xlsx");
FileOutputStream outputStream = new FileOutputStream(outputFile);
try { try {
workbook.write(outputStream); String sheetName;
if( dates ) {
if( times ) {
sheetName = "DateTimes";
} else {
sheetName = "Dates";
}
} else {
sheetName = "Times";
}
Sheet sheet = workbook.createSheet(sheetName);
Row header = sheet.createRow(0);
header.createCell(0).setCellValue("locale");
header.createCell(1).setCellValue("DisplayName");
header.createCell(2).setCellValue("Excel " + styleName);
header.createCell(3).setCellValue("java.text.DateFormat");
header.createCell(4).setCellValue("Equals");
header.createCell(5).setCellValue("Java pattern");
header.createCell(6).setCellValue("Excel pattern");
int rowNum = 1;
for( Locale locale : DateFormat.getAvailableLocales() ) {
try {
Row row = sheet.createRow(rowNum++);
row.createCell(0).setCellValue(locale.toString());
row.createCell(1).setCellValue(locale.getDisplayName());
DateFormat dateFormat;
if( dates ) {
if( times ) {
dateFormat = DateFormat.getDateTimeInstance(style, style, locale);
} else {
dateFormat = DateFormat.getDateInstance(style, locale);
}
} else {
dateFormat = DateFormat.getTimeInstance(style, locale);
}
Cell cell = row.createCell(2);
cell.setCellValue(date);
CellStyle cellStyle = row.getSheet().getWorkbook().createCellStyle();
String javaDateFormatPattern = ((SimpleDateFormat)dateFormat).toPattern();
String excelFormatPattern = DateFormatConverter.convert(locale, javaDateFormatPattern);
DataFormat poiFormat = row.getSheet().getWorkbook().createDataFormat();
cellStyle.setDataFormat(poiFormat.getFormat(excelFormatPattern));
row.createCell(3).setCellValue(dateFormat.format(date));
cell.setCellStyle(cellStyle);
// the formula returns TRUE is the formatted date in column C equals to the string in column D
row.createCell(4).setCellFormula("TEXT(C"+rowNum+",G"+rowNum+")=D" + rowNum);
row.createCell(5).setCellValue(javaDateFormatPattern);
row.createCell(6).setCellValue(excelFormatPattern);
} catch (Exception e) {
throw new RuntimeException("Failed for locale: " + locale + ", having locales: " +
Arrays.toString(DateFormat.getAvailableLocales()), e);
}
}
File outputFile = TempFile.createTempFile("Locale" + sheetName + styleName, ".xlsx");
FileOutputStream outputStream = new FileOutputStream(outputFile);
try {
workbook.write(outputStream);
} finally {
outputStream.close();
}
System.out.println("Open " + outputFile.getAbsolutePath()+" in Excel");
} finally { } finally {
outputStream.close(); workbook.close();
} }
System.out.println("Open " + outputFile.getAbsolutePath()+" in Excel");
} }
public void testJavaDateFormatsInExcel() throws Exception { public void testJavaDateFormatsInExcel() throws Exception {