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

ICU-8460 Make draft, incorporate Markus's review notes.

Browse Source 
X-SVN-Rev: 31515
This commit is contained in:
Mark Davis 2012-02-25 01:59:54 +00:00
parent 830de364b6
commit 01b36214be
4 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalFormat.java
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2012, Google, International Business Machines Corporation and *
* Copyright (C) 1996-2012, Google, International Business Machines Corporation and
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -41,7 +41,8 @@ import com.ibm.icu.util.ULocale;
* NumberFormat.
*
* @author markdavis
* @internal
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
public class CompactDecimalFormat extends DecimalFormat {
private static final long serialVersionUID = 4716293295276629682L;
@ -55,15 +56,14 @@ public class CompactDecimalFormat extends DecimalFormat {
private final String[] currencyAffixes;
/**
* The normal mechanism is to use NumberFormat.getCompactDecimalInstance(). This is intended only for testing.
* The public mechanism is NumberFormat.getCompactDecimalInstance().
*
* @param locale
* the desired locale
* @param style
* the compact style
* @internal
*/
public CompactDecimalFormat(ULocale locale, CompactStyle style) {
CompactDecimalFormat(ULocale locale, CompactStyle style) {
DecimalFormat format = (DecimalFormat) NumberFormat.getInstance(locale);
Data data;
while (true) {
@ -178,21 +178,41 @@ public class CompactDecimalFormat extends DecimalFormat {
return super.format(number, toAppendTo, pos);
}
/**
* @inheritDoc
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
@Override
public StringBuffer format(long number, StringBuffer toAppendTo, FieldPosition pos) {
return format((double) number, toAppendTo, pos);
}
/**
* @inheritDoc
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
@Override
public StringBuffer format(BigInteger number, StringBuffer toAppendTo, FieldPosition pos) {
return format(number.doubleValue(), toAppendTo, pos);
}
/**
* @inheritDoc
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
@Override
public StringBuffer format(BigDecimal number, StringBuffer toAppendTo, FieldPosition pos) {
return format(number.doubleValue(), toAppendTo, pos);
}
/**
* @inheritDoc
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
@Override
public StringBuffer format(com.ibm.icu.math.BigDecimal number, StringBuffer toAppendTo, FieldPosition pos) {
return format(number.doubleValue(), toAppendTo, pos);
@ -200,13 +220,15 @@ public class CompactDecimalFormat extends DecimalFormat {
/**
* Parsing is currently unsupported, and throws an UnsupportedOperationException.
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
@Override
public Number parse(String text, ParsePosition parsePosition) {
throw new UnsupportedOperationException();
}
// DISALLOW Serialization
// DISALLOW Serialization, at least while draft
private void writeObject(ObjectOutputStream out) throws IOException {
throw new NotSerializableException();

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

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2012, Google, International Business Machines Corporation and *
* Copyright (C) 1996-2012, Google, International Business Machines Corporation and
* others. All Rights Reserved. *
*******************************************************************************
*/

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

@ -730,24 +730,26 @@ public abstract class NumberFormat extends UFormat {
}
/**
* Create a CompactDecimalFormat appropriate for a locale (Mockup for what would be in NumberFormat). The result may
* Create a CompactDecimalFormat appropriate for a locale. The result may
* be affected by the number system in the locale, such as ar-u-nu-latn.
*
* @param locale the desired locale
* @param style the compact style
* @internal
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
public static final CompactDecimalFormat getCompactDecimalInstance(ULocale locale, CompactStyle style) {
return new CompactDecimalFormat(locale, style);
}
/**
* Create a CompactDecimalFormat appropriate for a locale (Mockup for what would be in NumberFormat). The result may
* Create a CompactDecimalFormat appropriate for a locale. The result may
* be affected by the number system in the locale, such as ar-u-nu-latn.
*
* @param locale the desired locale
* @param style the compact style
* @internal
* @draft ICU 49
* @provisional This API might change or be removed in a future release.
*/
public static final CompactDecimalFormat getCompactDecimalInstance(Locale locale, CompactStyle style) {
return new CompactDecimalFormat(ULocale.forLocale(locale), style);

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

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2012, Google, International Business Machines Corporation and *
* Copyright (C) 1996-2012, Google, International Business Machines Corporation and
* others. All Rights Reserved. *
*******************************************************************************
*/