organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-5124 merge changes back to head

Browse source 
X-SVN-Rev: 19434
This commit is contained in:
Ram Viswanadha 2006-03-25 00:08:28 +00:00
parent 485ca2f705
commit b2be982c5f
15 changed files with 334 additions and 1026 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1163
icu4j/build.xml
View file

File diff suppressed because it is too large Load diff

6
icu4j/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java
View file

@ -2127,9 +2127,9 @@ public class CollationMiscTest extends TestFmwk {
};
/* TODO: port builder fixes to before */
genericRulesStarter(rules, test);
genericLocaleStarter(new Locale("zh"), test);
genericLocaleStarter(new Locale("zh","",""), test);
genericRulesStarter(rules, test2);
genericLocaleStarter(new Locale("zh"), test2);
genericLocaleStarter(new Locale("zh","",""), test2);
}
public void
@ -2138,7 +2138,7 @@ public class CollationMiscTest extends TestFmwk {
String tests[] = { "B", "b", "Bb", "bB" };
String[] att = { "strength", "UpperFirst" };
Object attVals[] = { new Integer(Collator.QUATERNARY), new Boolean(true) };
genericLocaleStarterWithOptions(new Locale("root"), tests, att, attVals);
genericLocaleStarterWithOptions(new Locale("root","",""), tests, att, attVals);
}
public void
TestJ4960()

4
icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
View file

@ -1221,7 +1221,11 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
}
}
} catch (java.io.IOException e) {
//#ifndef FOUNDATION
throw new RuntimeException(e);
//#else
//## throw new RuntimeException(e.getMessage());
//#endif
}
}

2
icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View file

@ -109,7 +109,7 @@ public class TimeZoneTest extends TestFmwk
new ZoneDescriptor("PNT", -420, false),
new ZoneDescriptor("MST", -420, false),// updated Aug 2003 aliu
new ZoneDescriptor("CST", -360, true),
new ZoneDescriptor("IET", -300, false),
new ZoneDescriptor("IET", -300, true), // updated Feb 2006 srl
new ZoneDescriptor("EST", -300, false),// updated Aug 2003 aliu
new ZoneDescriptor("PRT", -240, false),
new ZoneDescriptor("CNT", -210, true),

2
icu4j/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java
View file

@ -1055,7 +1055,7 @@ public final class ICUResourceBundleTest extends TestFmwk {
logln("loaded data for abbreviated month names: "+ b1.getKey());
}
}catch(MissingResourceException ex){
errln("Failed to load data for abbreviated month names");
warnln("Failed to load data for abbreviated month names");
}
}
}

3
icu4j/src/com/ibm/icu/impl/ICUResourceBundle.java
View file

@ -261,7 +261,6 @@ public abstract class ICUResourceBundle extends UResourceBundle {
throw new UResourceTypeMismatchException("");
}
/**
* Returns a 32 bit integer array from a resource.
*
@ -1140,7 +1139,7 @@ public abstract class ICUResourceBundle extends UResourceBundle {
if (other instanceof ICUResourceBundle) {
ICUResourceBundle o = (ICUResourceBundle) other;
if (getBaseName().equals(o.getBaseName())
&& getULocale().equals(o.getULocale())) {
&& getLocaleID().equals(o.getLocaleID())) {
return true;
}
}

1
icu4j/src/com/ibm/icu/impl/ICUResourceBundleImpl.java
View file

@ -529,7 +529,6 @@ public class ICUResourceBundleImpl extends ICUResourceBundle {
public byte [] getBinary(byte []ba) {
return value;
}
private byte[] getValue() {
int offset = RES_GET_OFFSET(resource);
int length = ICUResourceBundleImpl.getInt(rawData,offset);

4
icu4j/src/com/ibm/icu/impl/data/icudata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2dde0c1c01c0cb0c524e74208678f984c3f39f7d8a18dc6e642c93ba2723bb6
size 2093384
oid sha256:1eff925c1e544551f1c3d29d24da85f3343866b38d4a3ac6c67dbb9ec55beb27
size 2108198

24
icu4j/src/com/ibm/icu/text/CharsetDetector.java
View file

@ -34,7 +34,7 @@ import java.util.Arrays;
* ignore html or xml style markup that could otherwise obscure the content.
* <p/>
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public class CharsetDetector {
@ -52,7 +52,7 @@ public class CharsetDetector {
* Constructor
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public CharsetDetector() {
}
@ -72,7 +72,7 @@ public class CharsetDetector {
* @param encoding The declared encoding
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public CharsetDetector setDeclaredEncoding(String encoding) {
fDeclaredEncoding = encoding;
@ -87,7 +87,7 @@ public class CharsetDetector {
* @return This CharsetDetector
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public CharsetDetector setText(byte [] in) {
fRawInput = in;
@ -114,7 +114,7 @@ public class CharsetDetector {
* @return This CharsetDetector
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public CharsetDetector setText(InputStream in) throws IOException {
@ -159,7 +159,7 @@ public class CharsetDetector {
* <code>null</code> if there are no matches.
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public CharsetMatch detect() {
// TODO: A better implementation would be to copy the detect loop from
@ -189,7 +189,7 @@ public class CharsetDetector {
* @return An array of CharsetMatch objects representing possibly matching charsets.
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public CharsetMatch[] detectAll() {
CharsetRecognizer csr;
@ -238,7 +238,7 @@ public class CharsetDetector {
* or null or an empty string if none is available.
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public Reader getReader(InputStream in, String declaredEncoding) {
fDeclaredEncoding = declaredEncoding;
@ -273,7 +273,7 @@ public class CharsetDetector {
* or null or an empty string if none is available.
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public String getString(byte[] in, String declaredEncoding)
{
@ -302,7 +302,7 @@ public class CharsetDetector {
* by the charset detector.
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static String[] getAllDetectableCharsets() {
return fCharsetNames;
@ -316,7 +316,7 @@ public class CharsetDetector {
* @see #enableInputFilter
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public boolean inputFilterEnabled()
{
@ -333,7 +333,7 @@ public class CharsetDetector {
* @return The previous setting.
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public boolean enableInputFilter(boolean filter)
{

27
icu4j/src/com/ibm/icu/text/DecimalFormat.java
View file

@ -2306,7 +2306,8 @@ public class DecimalFormat extends NumberFormat {
* @see #getRoundingIncrement
* @see #getRoundingMode
* @see #setRoundingMode
* @stable ICU 2.0
* @draft ICU 3.4.2
* @deprecated This is a draft API and might change in a future release of ICU.
*/
public void setRoundingIncrement(BigDecimal newValue) {
int i = newValue == null
@ -2749,22 +2750,14 @@ public class DecimalFormat extends NumberFormat {
* posPrefixPattern, posSuffixPattern, negPrefixPattern, negSuffixPattern.
* [Richard/GCL]
*/
return ((posPrefixPattern == other.posPrefixPattern &&
positivePrefix.equals(other.positivePrefix))
|| (posPrefixPattern != null &&
posPrefixPattern.equals(other.posPrefixPattern)))
&& ((posSuffixPattern == other.posSuffixPattern &&
positiveSuffix.equals(other.positiveSuffix))
|| (posSuffixPattern != null &&
posSuffixPattern.equals(other.posSuffixPattern)))
&& ((negPrefixPattern == other.negPrefixPattern &&
negativePrefix.equals(other.negativePrefix))
|| (negPrefixPattern != null &&
negPrefixPattern.equals(other.negPrefixPattern)))
&& ((negSuffixPattern == other.negSuffixPattern &&
negativeSuffix.equals(other.negativeSuffix))
|| (negSuffixPattern != null &&
negSuffixPattern.equals(other.negSuffixPattern)))
return (posPrefixPattern != null &&
posPrefixPattern.equals(other.posPrefixPattern))
&& (posSuffixPattern != null &&
posSuffixPattern.equals(other.posSuffixPattern))
&& (negPrefixPattern != null &&
negPrefixPattern.equals(other.negPrefixPattern))
&& (negSuffixPattern != null &&
negSuffixPattern.equals(other.negSuffixPattern))
&& multiplier == other.multiplier
&& groupingSize == other.groupingSize
&& groupingSize2 == other.groupingSize2

18
icu4j/src/com/ibm/icu/text/DecimalFormatSymbols.java
View file

@ -63,7 +63,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* Create a DecimalFormatSymbols object for the given locale.
* @param locale the locale
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public DecimalFormatSymbols( ULocale locale ) {
initialize( locale );
@ -91,7 +91,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* Return the character used to represent a significant digit in a pattern.
* @return the significant digit pattern character
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public char getSignificantDigit() {
return sigDigit;
@ -101,7 +101,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* Set the character used to represent a significant digit in a pattern.
* @param sigDigit the significant digit pattern character
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public void setSignificantDigit(char sigDigit) {
this.sigDigit = sigDigit;
@ -327,7 +327,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* ICU clients should use the Currency API directly.
* @return the currency used, or null
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public Currency getCurrency() {
return currency;
@ -348,7 +348,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* @see #setInternationalCurrencySymbol
*
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public void setCurrency(Currency currency) {
if (currency == null) {
@ -373,7 +373,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* Return the monetary decimal separator.
* @return the monetary decimal separator character
* @draft ICU 3.6
* @deprecated
* @provisional This API might change or be removed in a future release.
*/
public char getMonetaryGroupingSeparator()
{
@ -401,7 +401,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* Set the monetary decimal separator.
* @param sep the monetary decimal separator character
* @draft ICU 3.6
* @deprecated
* @provisional This API might change or be removed in a future release.
*/
public void setMonetaryGroupingSeparator(char sep)
{
@ -510,7 +510,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* Returns the locale for which this object was constructed.
* @return the locale for which this object was constructed
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public ULocale getULocale() {
return ulocale;
@ -962,7 +962,7 @@ final public class DecimalFormatSymbols implements Cloneable, Serializable {
* @see com.ibm.icu.util.ULocale#VALID_LOCALE
* @see com.ibm.icu.util.ULocale#ACTUAL_LOCALE
* @draft ICU 2.8 (retain)
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public final ULocale getLocale(ULocale.Type type) {
return type == ULocale.ACTUAL_LOCALE ?

29
icu4j/src/com/ibm/icu/text/NumberFormat.java
View file

@ -275,7 +275,7 @@ public abstract class NumberFormat extends UFormat {
* <strong><font face=helvetica color=red>NEW</font></strong>
* Convenience method to format a CurrencyAmount.
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public final String format(CurrencyAmount currAmt) {
return format(currAmt, new StringBuffer(),
@ -336,7 +336,7 @@ public abstract class NumberFormat extends UFormat {
* Format a CurrencyAmount.
* @see java.text.Format#format(Object, StringBuffer, FieldPosition)
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public StringBuffer format(CurrencyAmount currAmt,
StringBuffer toAppendTo,
@ -466,7 +466,7 @@ public abstract class NumberFormat extends UFormat {
* factory methods: getNumberInstance, getCurrencyInstance or getPercentInstance.
* Exactly which one is locale-dependent.
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static NumberFormat getInstance(ULocale inLocale) {
return getInstance(inLocale, NUMBERSTYLE);
@ -491,7 +491,7 @@ public abstract class NumberFormat extends UFormat {
/**
* Returns a general-purpose number format for the specified locale.
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static NumberFormat getNumberInstance(ULocale inLocale) {
return getInstance(inLocale, NUMBERSTYLE);
@ -541,7 +541,7 @@ public abstract class NumberFormat extends UFormat {
* @param inLocale the locale for which a number format is needed
* @return a number format for integer values
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static NumberFormat getIntegerInstance(ULocale inLocale) {
return getInstance(inLocale, INTEGERSTYLE);
@ -569,7 +569,7 @@ public abstract class NumberFormat extends UFormat {
* Returns a currency format for the specified locale.
* @return a number format for currency
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static NumberFormat getCurrencyInstance(ULocale inLocale) {
return getInstance(inLocale, CURRENCYSTYLE);
@ -597,7 +597,7 @@ public abstract class NumberFormat extends UFormat {
* Returns a percentage format for the specified locale.
* @return a number format for percents
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static NumberFormat getPercentInstance(ULocale inLocale) {
return getInstance(inLocale, PERCENTSTYLE);
@ -628,7 +628,7 @@ public abstract class NumberFormat extends UFormat {
* Returns a scientific format for the specified locale.
* @return a scientific number format
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static NumberFormat getScientificInstance(ULocale inLocale) {
return getInstance(inLocale, SCIENTIFICSTYLE);
@ -711,7 +711,7 @@ public abstract class NumberFormat extends UFormat {
* @param formatType the type of format
* @return the NumberFormat, or null.
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public NumberFormat createFormat(ULocale loc, int formatType) {
return createFormat(loc.toLocale(), formatType);
@ -766,7 +766,7 @@ public abstract class NumberFormat extends UFormat {
/**
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public SimpleNumberFormatFactory(ULocale locale) {
this(locale, true);
@ -774,7 +774,7 @@ public abstract class NumberFormat extends UFormat {
/**
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public SimpleNumberFormatFactory(ULocale locale, boolean visible) {
localeNames = Collections.singleton(locale.getBaseName());
@ -845,7 +845,7 @@ public abstract class NumberFormat extends UFormat {
* Get the list of Locales for which NumberFormats are available.
* @return the available locales
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static ULocale[] getAvailableULocales() {
if (shim == null) {
@ -1182,8 +1182,7 @@ public abstract class NumberFormat extends UFormat {
* @param forLocale the locale of the data.
* @param choice the pattern format.
* @return the pattern
* @stable ICU 2.2
* @deprecated subclassers should override getPattern(ULocale, int) instead of this method.
* @deprecated ICU 3.4 subclassers should override getPattern(ULocale, int) instead of this method.
*/
protected static String getPattern(Locale forLocale, int choice) {
return getPattern(ULocale.forLocale(forLocale), choice);
@ -1195,7 +1194,7 @@ public abstract class NumberFormat extends UFormat {
* @param choice the pattern format.
* @return the pattern
* @draft ICU 3.2
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
protected static String getPattern(ULocale forLocale, int choice) {

67
icu4j/src/com/ibm/icu/text/RuleBasedBreakIterator.java
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2005 International Business Machines Corporation and *
* Copyright (C) 2005-2006 International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -149,28 +149,28 @@ public class RuleBasedBreakIterator extends BreakIterator {
* Tag value for "words" that do not fit into any of other categories.
* Includes spaces and most punctuation.
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_NONE = 0;
/**
* Upper bound for tags for uncategorized words.
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_NONE_LIMIT = 100;
/**
* Tag value for words that appear to be numbers, lower limit.
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_NUMBER = 100;
/**
* Tag value for words that appear to be numbers, upper limit.
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_NUMBER_LIMIT = 200;
@ -178,42 +178,42 @@ public class RuleBasedBreakIterator extends BreakIterator {
* Tag value for words that contain letters, excluding
* hiragana, katakana or ideographic characters, lower limit.
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_LETTER = 200;
/**
* Tag value for words containing letters, upper limit
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_LETTER_LIMIT = 300;
/**
* Tag value for words containing kana characters, lower limit
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_KANA = 300;
/**
* Tag value for words containing kana characters, upper limit
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_KANA_LIMIT = 400;
/**
* Tag value for words containing ideographic characters, lower limit
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_IDEO = 400;
/**
* Tag value for words containing ideographic characters, upper limit
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public static final int WORD_IDEO_LIMIT = 500;
@ -705,7 +705,7 @@ private void makeRuleStatusValid() {
* returned break position.
*
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public int getRuleStatus() {
@ -746,7 +746,7 @@ public int getRuleStatus() {
* is the total number of status values that were available,
* not the reduced number that were actually returned.
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This is a draft API and might change in a future release of ICU.
*/
public int getRuleStatusVec(int[] fillInArray) {
makeRuleStatusValid();
@ -1333,19 +1333,32 @@ public int getRuleStatusVec(int[] fillInArray) {
//-------------------------------------------------------------------------------
//
// isDictionaryChar Return true if the category lookup for this char
// indicates that it is in the set of dictionary lookup
// chars.
//
// This function is intended for use by dictionary based
// break iterators.
//
//-------------------------------------------------------------------------------
boolean isDictionaryChar(int c) {
short category = (short) fRData.fTrie.getCodePointValue(c);
return (category & 0x4000) != 0;
}
//-------------------------------------------------------------------------------
//
// isDictionaryChar Return true if the category lookup for this char
// indicates that it is in the set of dictionary lookup
// chars.
//
// This function is intended for use by dictionary based
// break iterators.
//
//-------------------------------------------------------------------------------
boolean isDictionaryChar(int c) {
short category = (short) fRData.fTrie.getCodePointValue(c);
return (category & 0x4000) != 0;
}
}

2
icu4j/src/com/ibm/icu/text/RuleBasedCollator.java
View file

@ -856,7 +856,7 @@ public final class RuleBasedCollator extends Collator
* @param addPrefixes add the prefix contextual elements to contractions
* @throws Exception
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public void
getContractionsAndExpansions(UnicodeSet contractions, UnicodeSet expansions,

8
icu4j/src/com/ibm/icu/util/VersionInfo.java
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -98,14 +98,14 @@ public final class VersionInfo
/**
* Unicode 4.0.1 version
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static final VersionInfo UNICODE_4_0_1;
/**
* Unicode 4.1 version
* @draft ICU 3.4
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static final VersionInfo UNICODE_4_1;
@ -119,7 +119,7 @@ public final class VersionInfo
* Data version string for ICU's internal data
* @internal
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
* @provisional This API might change or be removed in a future release.
*/
public static final String ICU_DATA_VERSION = "35b";