organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-20 20:19:32 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8697 J, change parseCurrency to take CharSequence, make draft ICU 49

Browse source 
X-SVN-Rev: 31445
This commit is contained in:
Peter Edberg 2012-02-19 20:13:04 +00:00
parent f0eb1ff995
commit 355b75af8e
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4j/main/classes/core/src/com/ibm/icu/text/CurrencyFormat.java
View file

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2004-2010, International Business Machines
* Copyright (c) 2004-2012, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu
@ -57,6 +57,6 @@ class CurrencyFormat extends MeasureFormat {
* @see java.text.Format#parseObject(java.lang.String, java.text.ParsePosition)
*/
public Object parseObject(String source, ParsePosition pos) {
return fmt.parseCurrency(source, pos);
return fmt.parseCurrency((CharSequence)source, pos);
}
}

22
icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
View file

@ -1639,7 +1639,7 @@ public class DecimalFormat extends NumberFormat {
* @stable ICU 2.0
*/
public Number parse(String text, ParsePosition parsePosition) {
return (Number) parse(text, parsePosition, false);
return (Number) parse(text, parsePosition, null);
}
/**
@ -1649,15 +1649,16 @@ public class DecimalFormat extends NumberFormat {
* code. This method will fail if this format is not a currency format, that is, if it
* does not contain the currency pattern symbol (U+00A4) in its prefix or suffix.
*
* @param text the string to parse
* @param text the text to parse
* @param pos input-output position; on input, the position within text to match; must
* have 0 <= pos.getIndex() < text.length(); on output, the position after the last
* matched character. If the parse fails, the position in unchanged upon output.
* @return a CurrencyAmount, or null upon failure
* @internal
* @draft ICU 49
*/
public CurrencyAmount parseCurrency(String text, ParsePosition pos) {
return (CurrencyAmount) parse(text, pos, true);
public CurrencyAmount parseCurrency(CharSequence text, ParsePosition pos) {
Currency[] currency = new Currency[1];
return (CurrencyAmount) parse(text.toString(), pos, currency);
}
/**
@ -1668,11 +1669,11 @@ public class DecimalFormat extends NumberFormat {
* match; must have 0 <= pos.getIndex() < text.length(); on output, the position after
* the last matched character. If the parse fails, the position in unchanged upon
* output.
* @param parseCurrency if true, a CurrencyAmount is parsed and returned; otherwise a
* @param currency if non-null, a CurrencyAmount is parsed and returned; otherwise a
* Number is parsed and returned
* @return a Number or CurrencyAmount or null
*/
private Object parse(String text, ParsePosition parsePosition, boolean parseCurrency) {
private Object parse(String text, ParsePosition parsePosition, Currency[] currency) {
int backup;
int i = backup = parsePosition.getIndex();
@ -1698,9 +1699,8 @@ public class DecimalFormat extends NumberFormat {
i = backup;
boolean[] status = new boolean[STATUS_LENGTH];
Currency[] currency = parseCurrency ? new Currency[1] : null;
if (currencySignCount > 0) {
if (!parseForCurrency(text, parsePosition, parseCurrency, currency, status)) {
if (!parseForCurrency(text, parsePosition, currency, status)) {
return null;
}
} else {
@ -1773,10 +1773,10 @@ public class DecimalFormat extends NumberFormat {
}
// Assemble into CurrencyAmount if necessary
return parseCurrency ? (Object) new CurrencyAmount(n, currency[0]) : (Object) n;
return (currency != null) ? (Object) new CurrencyAmount(n, currency[0]) : (Object) n;
}
private boolean parseForCurrency(String text, ParsePosition parsePosition, boolean parseCurrency,
private boolean parseForCurrency(String text, ParsePosition parsePosition,
Currency[] currency, boolean[] status) {
int origPos = parsePosition.getIndex();
if (!isReadyForParsing) {

10
icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2011, International Business Machines Corporation and *
* Copyright (C) 1996-2012, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -424,18 +424,18 @@ public abstract class NumberFormat extends UFormat {
* that is, if it does not contain the currency pattern symbol
* (U+00A4) in its prefix or suffix.
*
* @param text the string to parse
* @param text the text to parse
* @param pos input-output position; on input, the position within
* text to match; must have 0 <= pos.getIndex() < text.length();
* on output, the position after the last matched character. If
* the parse fails, the position in unchanged upon output.
* @return a CurrencyAmount, or null upon failure
* @internal
* @draft ICU 49
*/
public CurrencyAmount parseCurrency(String text, ParsePosition pos) {
public CurrencyAmount parseCurrency(CharSequence text, ParsePosition pos) {
///CLOVER:OFF
// Default implementation only -- subclasses should override
Number n = parse(text, pos);
Number n = parse(text.toString(), pos);
return n == null ? null : new CurrencyAmount(n, getEffectiveCurrency());
///CLOVER:ON
}

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
View file

@ -659,7 +659,7 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
}
parsePos.setIndex(0);
CurrencyAmount currAmt = fmt.parseCurrency(currStr, parsePos);
CurrencyAmount currAmt = fmt.parseCurrency((CharSequence)currStr, parsePos);
if ( parsePos.getIndex() != item.getCurExpectPos() || (currAmt != null && (currAmt.getNumber().intValue() != item.getCurExpectVal() ||
currAmt.getCurrency().getCurrencyCode().compareTo(item.getCurExpectCurr()) != 0)) ) {
if (currAmt != null) {