AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-13526 Adding package-private getNumberFormatInternal() to reduce unnecessary object cloning.

Browse Source 
X-SVN-Rev: 40835
This commit is contained in:
Shane Carr 2018-02-03 07:54:35 +00:00
parent bf49bd2afc
commit 4385fb0348
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4j/main/classes/core/src/com/ibm/icu/text/CurrencyFormat.java
View File

@ -58,7 +58,7 @@ class CurrencyFormat extends MeasureFormat {
*/
@Override
public CurrencyAmount parseObject(String source, ParsePosition pos) {
return getNumberFormat().parseCurrency(source, pos);
return getNumberFormatInternal().parseCurrency(source, pos);
}
// Serialization

17
icu4j/main/classes/core/src/com/ibm/icu/text/MeasureFormat.java
View File

@ -494,7 +494,7 @@ public class MeasureFormat extends UFormat {
// A very slow but safe implementation.
return getWidth() == rhs.getWidth()
&& getLocale().equals(rhs.getLocale())
&& getNumberFormat().equals(rhs.getNumberFormat());
&& getNumberFormatInternal().equals(rhs.getNumberFormatInternal());
}
/**
@ -505,7 +505,7 @@ public class MeasureFormat extends UFormat {
@Override
public final int hashCode() {
// A very slow but safe implementation.
return (getLocale().hashCode() * 31 + getNumberFormat().hashCode()) * 31 + getWidth().hashCode();
return (getLocale().hashCode() * 31 + getNumberFormatInternal().hashCode()) * 31 + getWidth().hashCode();
}
/**
@ -535,6 +535,13 @@ public class MeasureFormat extends UFormat {
return (NumberFormat) numberFormat.clone();
}
/**
* Get a copy of the number format without cloning. Internal method.
*/
NumberFormat getNumberFormatInternal() {
return numberFormat;
}
/**
* Return a formatter for CurrencyAmount objects in the given locale.
*
@ -954,15 +961,15 @@ public class MeasureFormat extends UFormat {
}
Object toTimeUnitProxy() {
return new MeasureProxy(getLocale(), formatWidth, getNumberFormat(), TIME_UNIT_FORMAT);
return new MeasureProxy(getLocale(), formatWidth, getNumberFormatInternal(), TIME_UNIT_FORMAT);
}
Object toCurrencyProxy() {
return new MeasureProxy(getLocale(), formatWidth, getNumberFormat(), CURRENCY_FORMAT);
return new MeasureProxy(getLocale(), formatWidth, getNumberFormatInternal(), CURRENCY_FORMAT);
}
private Object writeReplace() throws ObjectStreamException {
return new MeasureProxy(getLocale(), formatWidth, getNumberFormat(), MEASURE_FORMAT);
return new MeasureProxy(getLocale(), formatWidth, getNumberFormatInternal(), MEASURE_FORMAT);
}
static class MeasureProxy implements Externalizable {

7
icu4j/main/classes/core/src/com/ibm/icu/text/TimeUnitFormat.java
View File

@ -150,7 +150,7 @@ public class TimeUnitFormat extends MeasureFormat {
@Deprecated
public TimeUnitFormat(ULocale locale, int style) {
super(locale, style == FULL_NAME ? FormatWidth.WIDE : FormatWidth.SHORT);
format = super.getNumberFormat();
format = super.getNumberFormatInternal();
if (style < FULL_NAME || style >= TOTAL_STYLES) {
throw new IllegalArgumentException("style should be either FULL_NAME or ABBREVIATED_NAME style");
}
@ -225,6 +225,11 @@ public class TimeUnitFormat extends MeasureFormat {
@Override
public NumberFormat getNumberFormat() {
return (NumberFormat) format.clone();
}
@Override
NumberFormat getNumberFormatInternal() {
return format;
}