moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix forbidden apis issue and make non-static as decimalformat is not thread-safe

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1707166 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2015-10-06 22:52:05 +00:00
parent bf0dcc16c9
commit cab7f9c2e0
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
View File

@ -30,27 +30,29 @@ import java.text.Format;
import java.text.ParsePosition; import java.text.ParsePosition;
import java.util.Locale; import java.util.Locale;
/** A format that formats a double as Excel would, ignoring FieldPosition. All other operations are unsupported. */ /**
* A format that formats a double as Excel would, ignoring FieldPosition.
* All other operations are unsupported.
**/
public class ExcelGeneralNumberFormat extends Format { public class ExcelGeneralNumberFormat extends Format {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final DecimalFormat SCIENTIFIC_FORMAT = new DecimalFormat("0.#####E0");
static {
SCIENTIFIC_FORMAT.setRoundingMode(RoundingMode.HALF_UP);
}
private static final MathContext TO_10_SF = new MathContext(10, RoundingMode.HALF_UP); private static final MathContext TO_10_SF = new MathContext(10, RoundingMode.HALF_UP);
private final DecimalFormatSymbols decimalSymbols; private final DecimalFormatSymbols decimalSymbols;
private final DecimalFormat wholeNumFormat; private final DecimalFormat integerFormat;
private final DecimalFormat decimalNumFormat; private final DecimalFormat decimalFormat;
private final DecimalFormat scientificFormat;
public ExcelGeneralNumberFormat(final Locale locale) { public ExcelGeneralNumberFormat(final Locale locale) {
decimalSymbols = new DecimalFormatSymbols(locale); decimalSymbols = new DecimalFormatSymbols(locale);
wholeNumFormat = new DecimalFormat("#", decimalSymbols); scientificFormat = new DecimalFormat("0.#####E0", decimalSymbols);
DataFormatter.setExcelStyleRoundingMode(wholeNumFormat); DataFormatter.setExcelStyleRoundingMode(scientificFormat);
decimalNumFormat = new DecimalFormat("#.##########", decimalSymbols); integerFormat = new DecimalFormat("#", decimalSymbols);
DataFormatter.setExcelStyleRoundingMode(decimalNumFormat); DataFormatter.setExcelStyleRoundingMode(integerFormat);
decimalFormat = new DecimalFormat("#.##########", decimalSymbols);
DataFormatter.setExcelStyleRoundingMode(decimalFormat);
} }
public StringBuffer format(Object number, StringBuffer toAppendTo, FieldPosition pos) { public StringBuffer format(Object number, StringBuffer toAppendTo, FieldPosition pos) {
@ -58,26 +60,26 @@ public class ExcelGeneralNumberFormat extends Format {
if (number instanceof Number) { if (number instanceof Number) {
value = ((Number)number).doubleValue(); value = ((Number)number).doubleValue();
if (Double.isInfinite(value) || Double.isNaN(value)) { if (Double.isInfinite(value) || Double.isNaN(value)) {
return wholeNumFormat.format(number, toAppendTo, pos); return integerFormat.format(number, toAppendTo, pos);
} }
} else { } else {
// testBug54786 gets here with a date, so retain previous behaviour // testBug54786 gets here with a date, so retain previous behaviour
return wholeNumFormat.format(number, toAppendTo, pos); return integerFormat.format(number, toAppendTo, pos);
} }
final double abs = Math.abs(value); final double abs = Math.abs(value);
if (abs >= 1E11 || (abs <= 1E-10 && abs > 0)) { if (abs >= 1E11 || (abs <= 1E-10 && abs > 0)) {
return SCIENTIFIC_FORMAT.format(number, toAppendTo, pos); return scientificFormat.format(number, toAppendTo, pos);
} else if (Math.floor(value) == value || abs >= 1E10) { } else if (Math.floor(value) == value || abs >= 1E10) {
// integer, or integer portion uses all 11 allowed digits // integer, or integer portion uses all 11 allowed digits
return wholeNumFormat.format(number, toAppendTo, pos); return integerFormat.format(number, toAppendTo, pos);
} }
// Non-integers of non-scientific magnitude are formatted as "up to 11 // Non-integers of non-scientific magnitude are formatted as "up to 11
// numeric characters, with the decimal point counting as a numeric // numeric characters, with the decimal point counting as a numeric
// character". We know there is a decimal point, so limit to 10 digits. // character". We know there is a decimal point, so limit to 10 digits.
// https://support.microsoft.com/en-us/kb/65903 // https://support.microsoft.com/en-us/kb/65903
final double rounded = new BigDecimal(value).round(TO_10_SF).doubleValue(); final double rounded = new BigDecimal(value).round(TO_10_SF).doubleValue();
return decimalNumFormat.format(rounded, toAppendTo, pos); return decimalFormat.format(rounded, toAppendTo, pos);
} }
public Object parseObject(String source, ParsePosition pos) { public Object parseObject(String source, ParsePosition pos) {