Print this page
rev 5696 : 6336885: RFE: Locale Data Deployment Enhancements
4609153: Provide locale data for Indic locales
5104387: Support for gl_ES locale (galician language)
6337471: desktop/system locale preferences support
7056139: (cal) SPI support for locale-dependent Calendar parameters
7058206: Provide CalendarData SPI for week params and display field value names
7073852: Support multiple scripts for digits and decimal symbols per locale
7079560: [Fmt-Da] Context dependent month names support in SimpleDateFormat
7171324: getAvailableLocales() of locale sensitive services should return the actual availability of locales
7151414: (cal) Support calendar type identification
7168528: LocaleServiceProvider needs to be aware of Locale extensions
7171372: (cal) locale's default Calendar should be created if unknown calendar is specified
Summary: JEP 127: Improve Locale Data Packaging and Adopt Unicode CLDR Data (part 1 w/o packaging changes. by Naoto Sato and Masayoshi Okutsu)
| Split |
Close |
| Expand all |
| Collapse all |
--- old/src/share/classes/java/text/Collator.java
+++ new/src/share/classes/java/text/Collator.java
1 1 /*
2 - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
2 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation. Oracle designates this
8 8 * particular file as subject to the "Classpath" exception as provided
9 9 * by Oracle in the LICENSE file that accompanied this code.
10 10 *
11 11 * This code is distributed in the hope that it will be useful, but WITHOUT
12 12 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 13 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 14 * version 2 for more details (a copy is included in the LICENSE file that
15 15 * accompanied this code).
16 16 *
17 17 * You should have received a copy of the GNU General Public License version
18 18 * 2 along with this work; if not, write to the Free Software Foundation,
19 19 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20 20 *
21 21 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 22 * or visit www.oracle.com if you need additional information or have any
23 23 * questions.
24 24 */
25 25
26 26 /*
27 27 * (C) Copyright Taligent, Inc. 1996-1998 - All Rights Reserved
28 28 * (C) Copyright IBM Corp. 1996-1998 - All Rights Reserved
29 29 *
30 30 * The original version of this source code and documentation is copyrighted
|
↓ open down ↓ |
18 lines elided |
↑ open up ↑ |
31 31 * and owned by Taligent, Inc., a wholly-owned subsidiary of IBM. These
32 32 * materials are provided under terms of a License Agreement between Taligent
33 33 * and Sun. This technology is protected by multiple US and International
34 34 * patents. This notice and attribution to Taligent may not be removed.
35 35 * Taligent is a registered trademark of Taligent, Inc.
36 36 *
37 37 */
38 38
39 39 package java.text;
40 40
41 +import java.lang.ref.SoftReference;
41 42 import java.text.spi.CollatorProvider;
42 43 import java.util.Locale;
43 -import java.util.MissingResourceException;
44 44 import java.util.ResourceBundle;
45 -import java.util.spi.LocaleServiceProvider;
46 -import sun.misc.SoftCache;
47 -import sun.util.resources.LocaleData;
48 -import sun.util.LocaleServiceProviderPool;
45 +import java.util.concurrent.ConcurrentHashMap;
46 +import java.util.concurrent.ConcurrentMap;
47 +import sun.util.locale.provider.LocaleProviderAdapter;
48 +import sun.util.locale.provider.LocaleServiceProviderPool;
49 49
50 50
51 51 /**
52 52 * The <code>Collator</code> class performs locale-sensitive
53 53 * <code>String</code> comparison. You use this class to build
54 54 * searching and sorting routines for natural language text.
55 55 *
56 56 * <p>
57 57 * <code>Collator</code> is an abstract base class. Subclasses
58 58 * implement specific collation strategies. One subclass,
59 59 * <code>RuleBasedCollator</code>, is currently provided with
60 60 * the Java Platform and is applicable to a wide set of languages. Other
61 61 * subclasses may be created to handle more specialized needs.
62 62 *
63 63 * <p>
64 64 * Like other locale-sensitive classes, you can use the static
65 65 * factory method, <code>getInstance</code>, to obtain the appropriate
66 66 * <code>Collator</code> object for a given locale. You will only need
67 67 * to look at the subclasses of <code>Collator</code> if you need
68 68 * to understand the details of a particular collation strategy or
69 69 * if you need to modify that strategy.
70 70 *
71 71 * <p>
72 72 * The following example shows how to compare two strings using
73 73 * the <code>Collator</code> for the default locale.
74 74 * <blockquote>
75 75 * <pre>
76 76 * // Compare two strings in the default locale
77 77 * Collator myCollator = Collator.getInstance();
78 78 * if( myCollator.compare("abc", "ABC") < 0 )
79 79 * System.out.println("abc is less than ABC");
80 80 * else
81 81 * System.out.println("abc is greater than or equal to ABC");
82 82 * </pre>
83 83 * </blockquote>
84 84 *
85 85 * <p>
86 86 * You can set a <code>Collator</code>'s <em>strength</em> property
87 87 * to determine the level of difference considered significant in
88 88 * comparisons. Four strengths are provided: <code>PRIMARY</code>,
89 89 * <code>SECONDARY</code>, <code>TERTIARY</code>, and <code>IDENTICAL</code>.
90 90 * The exact assignment of strengths to language features is
91 91 * locale dependant. For example, in Czech, "e" and "f" are considered
92 92 * primary differences, while "e" and "ě" are secondary differences,
93 93 * "e" and "E" are tertiary differences and "e" and "e" are identical.
94 94 * The following shows how both case and accents could be ignored for
95 95 * US English.
96 96 * <blockquote>
97 97 * <pre>
98 98 * //Get the Collator for US English and set its strength to PRIMARY
99 99 * Collator usCollator = Collator.getInstance(Locale.US);
100 100 * usCollator.setStrength(Collator.PRIMARY);
101 101 * if( usCollator.compare("abc", "ABC") == 0 ) {
102 102 * System.out.println("Strings are equivalent");
103 103 * }
104 104 * </pre>
105 105 * </blockquote>
106 106 * <p>
107 107 * For comparing <code>String</code>s exactly once, the <code>compare</code>
108 108 * method provides the best performance. When sorting a list of
109 109 * <code>String</code>s however, it is generally necessary to compare each
110 110 * <code>String</code> multiple times. In this case, <code>CollationKey</code>s
111 111 * provide better performance. The <code>CollationKey</code> class converts
112 112 * a <code>String</code> to a series of bits that can be compared bitwise
113 113 * against other <code>CollationKey</code>s. A <code>CollationKey</code> is
114 114 * created by a <code>Collator</code> object for a given <code>String</code>.
115 115 * <br>
116 116 * <strong>Note:</strong> <code>CollationKey</code>s from different
117 117 * <code>Collator</code>s can not be compared. See the class description
118 118 * for {@link CollationKey}
119 119 * for an example using <code>CollationKey</code>s.
120 120 *
121 121 * @see RuleBasedCollator
122 122 * @see CollationKey
123 123 * @see CollationElementIterator
124 124 * @see Locale
125 125 * @author Helena Shih, Laura Werner, Richard Gillam
126 126 */
127 127
128 128 public abstract class Collator
129 129 implements java.util.Comparator<Object>, Cloneable
130 130 {
131 131 /**
132 132 * Collator strength value. When set, only PRIMARY differences are
133 133 * considered significant during comparison. The assignment of strengths
134 134 * to language features is locale dependant. A common example is for
135 135 * different base letters ("a" vs "b") to be considered a PRIMARY difference.
136 136 * @see java.text.Collator#setStrength
137 137 * @see java.text.Collator#getStrength
138 138 */
139 139 public final static int PRIMARY = 0;
140 140 /**
141 141 * Collator strength value. When set, only SECONDARY and above differences are
142 142 * considered significant during comparison. The assignment of strengths
143 143 * to language features is locale dependant. A common example is for
144 144 * different accented forms of the same base letter ("a" vs "\u00E4") to be
145 145 * considered a SECONDARY difference.
146 146 * @see java.text.Collator#setStrength
147 147 * @see java.text.Collator#getStrength
148 148 */
149 149 public final static int SECONDARY = 1;
150 150 /**
151 151 * Collator strength value. When set, only TERTIARY and above differences are
152 152 * considered significant during comparison. The assignment of strengths
153 153 * to language features is locale dependant. A common example is for
154 154 * case differences ("a" vs "A") to be considered a TERTIARY difference.
155 155 * @see java.text.Collator#setStrength
156 156 * @see java.text.Collator#getStrength
157 157 */
158 158 public final static int TERTIARY = 2;
159 159
160 160 /**
161 161 * Collator strength value. When set, all differences are
162 162 * considered significant during comparison. The assignment of strengths
163 163 * to language features is locale dependant. A common example is for control
164 164 * characters ("\u0001" vs "\u0002") to be considered equal at the
165 165 * PRIMARY, SECONDARY, and TERTIARY levels but different at the IDENTICAL
166 166 * level. Additionally, differences between pre-composed accents such as
167 167 * "\u00C0" (A-grave) and combining accents such as "A\u0300"
168 168 * (A, combining-grave) will be considered significant at the IDENTICAL
169 169 * level if decomposition is set to NO_DECOMPOSITION.
170 170 */
171 171 public final static int IDENTICAL = 3;
172 172
173 173 /**
174 174 * Decomposition mode value. With NO_DECOMPOSITION
175 175 * set, accented characters will not be decomposed for collation. This
176 176 * is the default setting and provides the fastest collation but
177 177 * will only produce correct results for languages that do not use accents.
178 178 * @see java.text.Collator#getDecomposition
179 179 * @see java.text.Collator#setDecomposition
180 180 */
181 181 public final static int NO_DECOMPOSITION = 0;
182 182
183 183 /**
184 184 * Decomposition mode value. With CANONICAL_DECOMPOSITION
185 185 * set, characters that are canonical variants according to Unicode
186 186 * standard will be decomposed for collation. This should be used to get
187 187 * correct collation of accented characters.
188 188 * <p>
189 189 * CANONICAL_DECOMPOSITION corresponds to Normalization Form D as
190 190 * described in
191 191 * <a href="http://www.unicode.org/unicode/reports/tr15/tr15-23.html">Unicode
192 192 * Technical Report #15</a>.
193 193 * @see java.text.Collator#getDecomposition
194 194 * @see java.text.Collator#setDecomposition
195 195 */
196 196 public final static int CANONICAL_DECOMPOSITION = 1;
197 197
198 198 /**
199 199 * Decomposition mode value. With FULL_DECOMPOSITION
200 200 * set, both Unicode canonical variants and Unicode compatibility variants
201 201 * will be decomposed for collation. This causes not only accented
202 202 * characters to be collated, but also characters that have special formats
203 203 * to be collated with their norminal form. For example, the half-width and
204 204 * full-width ASCII and Katakana characters are then collated together.
205 205 * FULL_DECOMPOSITION is the most complete and therefore the slowest
206 206 * decomposition mode.
207 207 * <p>
208 208 * FULL_DECOMPOSITION corresponds to Normalization Form KD as
209 209 * described in
210 210 * <a href="http://www.unicode.org/unicode/reports/tr15/tr15-23.html">Unicode
211 211 * Technical Report #15</a>.
212 212 * @see java.text.Collator#getDecomposition
213 213 * @see java.text.Collator#setDecomposition
214 214 */
215 215 public final static int FULL_DECOMPOSITION = 2;
216 216
217 217 /**
218 218 * Gets the Collator for the current default locale.
219 219 * The default locale is determined by java.util.Locale.getDefault.
220 220 * @return the Collator for the default locale.(for example, en_US)
221 221 * @see java.util.Locale#getDefault
222 222 */
223 223 public static synchronized Collator getInstance() {
|
↓ open down ↓ |
165 lines elided |
↑ open up ↑ |
224 224 return getInstance(Locale.getDefault());
225 225 }
226 226
227 227 /**
228 228 * Gets the Collator for the desired locale.
229 229 * @param desiredLocale the desired locale.
230 230 * @return the Collator for the desired locale.
231 231 * @see java.util.Locale
232 232 * @see java.util.ResourceBundle
233 233 */
234 - public static synchronized
235 - Collator getInstance(Locale desiredLocale)
236 - {
237 - Collator result = (Collator) cache.get(desiredLocale);
238 - if (result != null) {
239 - return (Collator)result.clone(); // make the world safe
240 - }
241 -
242 - // Check whether a provider can provide an implementation that's closer
243 - // to the requested locale than what the Java runtime itself can provide.
244 - LocaleServiceProviderPool pool =
245 - LocaleServiceProviderPool.getPool(CollatorProvider.class);
246 - if (pool.hasProviders()) {
247 - Collator providersInstance = pool.getLocalizedObject(
248 - CollatorGetter.INSTANCE,
249 - desiredLocale,
250 - desiredLocale);
251 - if (providersInstance != null) {
252 - return providersInstance;
234 + public static Collator getInstance(Locale desiredLocale) {
235 + SoftReference<Collator> ref = cache.get(desiredLocale);
236 + Collator result = (ref != null) ? ref.get() : null;
237 + if (result == null) {
238 + LocaleProviderAdapter adapter;
239 + adapter = LocaleProviderAdapter.getAdapter(CollatorProvider.class,
240 + desiredLocale);
241 + CollatorProvider provider = adapter.getCollatorProvider();
242 + result = provider.getInstance(desiredLocale);
243 + if (result == null) {
244 + result = LocaleProviderAdapter.forJRE()
245 + .getCollatorProvider().getInstance(desiredLocale);
253 246 }
254 - }
255 -
256 - // Load the resource of the desired locale from resource
257 - // manager.
258 - String colString = "";
259 - try {
260 - ResourceBundle resource = LocaleData.getCollationData(desiredLocale);
261 -
262 - colString = resource.getString("Rule");
263 - } catch (MissingResourceException e) {
264 - // Use default values
265 - }
266 - try
267 - {
268 - result = new RuleBasedCollator( CollationRules.DEFAULTRULES +
269 - colString,
270 - CANONICAL_DECOMPOSITION );
271 - }
272 - catch(ParseException foo)
273 - {
274 - // predefined tables should contain correct grammar
275 - try {
276 - result = new RuleBasedCollator( CollationRules.DEFAULTRULES );
277 - } catch (ParseException bar) {
278 - // do nothing
247 + while (true) {
248 + if (ref != null) {
249 + // Remove the empty SoftReference if any
250 + cache.remove(desiredLocale, ref);
251 + }
252 + ref = cache.putIfAbsent(desiredLocale, new SoftReference<>(result));
253 + if (ref == null) {
254 + break;
255 + }
256 + Collator cachedColl = ref.get();
257 + if (cachedColl != null) {
258 + result = cachedColl;
259 + break;
260 + }
279 261 }
280 262 }
281 - // Now that RuleBasedCollator adds expansions for pre-composed characters
282 - // into their decomposed equivalents, the default collators don't need
283 - // to have decomposition turned on. Laura, 5/5/98, bug 4114077
284 - result.setDecomposition(NO_DECOMPOSITION);
285 -
286 - cache.put(desiredLocale,result);
287 - return (Collator)result.clone();
263 + return (Collator) result.clone(); // make the world safe
288 264 }
289 265
290 266 /**
291 267 * Compares the source string to the target string according to the
292 268 * collation rules for this Collator. Returns an integer less than,
293 269 * equal to or greater than zero depending on whether the source String is
294 270 * less than, equal to or greater than the target string. See the Collator
295 271 * class description for an example of use.
296 272 * <p>
297 273 * For a one time comparison, this method has the best performance. If a
298 274 * given String will be involved in multiple comparisons, CollationKey.compareTo
299 275 * has the best performance. See the Collator class description for an example
300 276 * using CollationKeys.
301 277 * @param source the source string.
302 278 * @param target the target string.
303 279 * @return Returns an integer value. Value is less than zero if source is less than
304 280 * target, value is zero if source and target are equal, value is greater than zero
305 281 * if source is greater than target.
306 282 * @see java.text.CollationKey
307 283 * @see java.text.Collator#getCollationKey
308 284 */
309 285 public abstract int compare(String source, String target);
310 286
311 287 /**
312 288 * Compares its two arguments for order. Returns a negative integer,
313 289 * zero, or a positive integer as the first argument is less than, equal
314 290 * to, or greater than the second.
315 291 * <p>
|
↓ open down ↓ |
18 lines elided |
↑ open up ↑ |
316 292 * This implementation merely returns
317 293 * <code> compare((String)o1, (String)o2) </code>.
318 294 *
319 295 * @return a negative integer, zero, or a positive integer as the
320 296 * first argument is less than, equal to, or greater than the
321 297 * second.
322 298 * @exception ClassCastException the arguments cannot be cast to Strings.
323 299 * @see java.util.Comparator
324 300 * @since 1.2
325 301 */
302 + @Override
326 303 public int compare(Object o1, Object o2) {
327 304 return compare((String)o1, (String)o2);
328 305 }
329 306
330 307 /**
331 308 * Transforms the String into a series of bits that can be compared bitwise
332 309 * to other CollationKeys. CollationKeys provide better performance than
333 310 * Collator.compare when Strings are involved in multiple comparisons.
334 311 * See the Collator class description for an example using CollationKeys.
335 312 * @param source the string to be transformed into a collation key.
336 313 * @return the CollationKey for the given String based on this Collator's collation
337 314 * rules. If the source String is null, a null CollationKey is returned.
338 315 * @see java.text.CollationKey
339 316 * @see java.text.Collator#compare
340 317 */
341 318 public abstract CollationKey getCollationKey(String source);
342 319
343 320 /**
344 321 * Convenience method for comparing the equality of two strings based on
345 322 * this Collator's collation rules.
346 323 * @param source the source string to be compared with.
347 324 * @param target the target string to be compared with.
348 325 * @return true if the strings are equal according to the collation
349 326 * rules. false, otherwise.
350 327 * @see java.text.Collator#compare
351 328 */
352 329 public boolean equals(String source, String target)
353 330 {
354 331 return (compare(source, target) == Collator.EQUAL);
355 332 }
356 333
357 334 /**
358 335 * Returns this Collator's strength property. The strength property determines
359 336 * the minimum level of difference considered significant during comparison.
360 337 * See the Collator class description for an example of use.
361 338 * @return this Collator's current strength property.
362 339 * @see java.text.Collator#setStrength
363 340 * @see java.text.Collator#PRIMARY
364 341 * @see java.text.Collator#SECONDARY
365 342 * @see java.text.Collator#TERTIARY
366 343 * @see java.text.Collator#IDENTICAL
367 344 */
368 345 public synchronized int getStrength()
369 346 {
370 347 return strength;
371 348 }
372 349
373 350 /**
374 351 * Sets this Collator's strength property. The strength property determines
375 352 * the minimum level of difference considered significant during comparison.
376 353 * See the Collator class description for an example of use.
377 354 * @param newStrength the new strength value.
378 355 * @see java.text.Collator#getStrength
379 356 * @see java.text.Collator#PRIMARY
|
↓ open down ↓ |
44 lines elided |
↑ open up ↑ |
380 357 * @see java.text.Collator#SECONDARY
381 358 * @see java.text.Collator#TERTIARY
382 359 * @see java.text.Collator#IDENTICAL
383 360 * @exception IllegalArgumentException If the new strength value is not one of
384 361 * PRIMARY, SECONDARY, TERTIARY or IDENTICAL.
385 362 */
386 363 public synchronized void setStrength(int newStrength) {
387 364 if ((newStrength != PRIMARY) &&
388 365 (newStrength != SECONDARY) &&
389 366 (newStrength != TERTIARY) &&
390 - (newStrength != IDENTICAL))
367 + (newStrength != IDENTICAL)) {
391 368 throw new IllegalArgumentException("Incorrect comparison level.");
369 + }
392 370 strength = newStrength;
393 371 }
394 372
395 373 /**
396 374 * Get the decomposition mode of this Collator. Decomposition mode
397 375 * determines how Unicode composed characters are handled. Adjusting
398 376 * decomposition mode allows the user to select between faster and more
399 377 * complete collation behavior.
400 378 * <p>The three values for decomposition mode are:
401 379 * <UL>
402 380 * <LI>NO_DECOMPOSITION,
403 381 * <LI>CANONICAL_DECOMPOSITION
404 382 * <LI>FULL_DECOMPOSITION.
405 383 * </UL>
406 384 * See the documentation for these three constants for a description
407 385 * of their meaning.
408 386 * @return the decomposition mode
409 387 * @see java.text.Collator#setDecomposition
410 388 * @see java.text.Collator#NO_DECOMPOSITION
411 389 * @see java.text.Collator#CANONICAL_DECOMPOSITION
412 390 * @see java.text.Collator#FULL_DECOMPOSITION
413 391 */
414 392 public synchronized int getDecomposition()
415 393 {
416 394 return decmp;
417 395 }
418 396 /**
419 397 * Set the decomposition mode of this Collator. See getDecomposition
420 398 * for a description of decomposition mode.
421 399 * @param decompositionMode the new decomposition mode.
|
↓ open down ↓ |
20 lines elided |
↑ open up ↑ |
422 400 * @see java.text.Collator#getDecomposition
423 401 * @see java.text.Collator#NO_DECOMPOSITION
424 402 * @see java.text.Collator#CANONICAL_DECOMPOSITION
425 403 * @see java.text.Collator#FULL_DECOMPOSITION
426 404 * @exception IllegalArgumentException If the given value is not a valid decomposition
427 405 * mode.
428 406 */
429 407 public synchronized void setDecomposition(int decompositionMode) {
430 408 if ((decompositionMode != NO_DECOMPOSITION) &&
431 409 (decompositionMode != CANONICAL_DECOMPOSITION) &&
432 - (decompositionMode != FULL_DECOMPOSITION))
410 + (decompositionMode != FULL_DECOMPOSITION)) {
433 411 throw new IllegalArgumentException("Wrong decomposition mode.");
412 + }
434 413 decmp = decompositionMode;
435 414 }
436 415
437 416 /**
438 417 * Returns an array of all locales for which the
439 418 * <code>getInstance</code> methods of this class can return
440 419 * localized instances.
441 420 * The returned array represents the union of locales supported
442 421 * by the Java runtime and by installed
443 422 * {@link java.text.spi.CollatorProvider CollatorProvider} implementations.
444 423 * It must contain at least a Locale instance equal to
445 424 * {@link java.util.Locale#US Locale.US}.
446 425 *
447 426 * @return An array of locales for which localized
448 427 * <code>Collator</code> instances are available.
|
↓ open down ↓ |
5 lines elided |
↑ open up ↑ |
449 428 */
450 429 public static synchronized Locale[] getAvailableLocales() {
451 430 LocaleServiceProviderPool pool =
452 431 LocaleServiceProviderPool.getPool(CollatorProvider.class);
453 432 return pool.getAvailableLocales();
454 433 }
455 434
456 435 /**
457 436 * Overrides Cloneable
458 437 */
438 + @Override
459 439 public Object clone()
460 440 {
461 441 try {
462 442 return (Collator)super.clone();
463 443 } catch (CloneNotSupportedException e) {
464 444 throw new InternalError(e);
465 445 }
466 446 }
467 447
468 448 /**
469 449 * Compares the equality of two Collators.
470 450 * @param that the Collator to be compared with this.
471 451 * @return true if this Collator is the same as that Collator;
472 452 * false otherwise.
473 453 */
454 + @Override
474 455 public boolean equals(Object that)
475 456 {
476 - if (this == that) return true;
477 - if (that == null) return false;
478 - if (getClass() != that.getClass()) return false;
457 + if (this == that) {
458 + return true;
459 + }
460 + if (that == null) {
461 + return false;
462 + }
463 + if (getClass() != that.getClass()) {
464 + return false;
465 + }
479 466 Collator other = (Collator) that;
480 467 return ((strength == other.strength) &&
481 468 (decmp == other.decmp));
482 469 }
483 470
484 471 /**
485 472 * Generates the hash code for this Collator.
486 473 */
474 + @Override
487 475 abstract public int hashCode();
488 476
489 477 /**
490 478 * Default constructor. This constructor is
491 479 * protected so subclasses can get access to it. Users typically create
492 480 * a Collator sub-class by calling the factory method getInstance.
493 481 * @see java.text.Collator#getInstance
494 482 */
495 483 protected Collator()
496 484 {
497 485 strength = TERTIARY;
498 486 decmp = CANONICAL_DECOMPOSITION;
499 487 }
500 488
501 489 private int strength = 0;
502 490 private int decmp = 0;
503 - private static SoftCache cache = new SoftCache();
491 + private static final ConcurrentMap<Locale, SoftReference<Collator>> cache
492 + = new ConcurrentHashMap<>();
504 493
505 494 //
506 495 // FIXME: These three constants should be removed.
507 496 //
508 497 /**
509 498 * LESS is returned if source string is compared to be less than target
510 499 * string in the compare() method.
511 500 * @see java.text.Collator#compare
512 501 */
513 502 final static int LESS = -1;
514 503 /**
515 504 * EQUAL is returned if source string is compared to be equal to target
|
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
516 505 * string in the compare() method.
517 506 * @see java.text.Collator#compare
518 507 */
519 508 final static int EQUAL = 0;
520 509 /**
521 510 * GREATER is returned if source string is compared to be greater than
522 511 * target string in the compare() method.
523 512 * @see java.text.Collator#compare
524 513 */
525 514 final static int GREATER = 1;
526 -
527 - /**
528 - * Obtains a Collator instance from a CollatorProvider
529 - * implementation.
530 - */
531 - private static class CollatorGetter
532 - implements LocaleServiceProviderPool.LocalizedObjectGetter<CollatorProvider, Collator> {
533 - private static final CollatorGetter INSTANCE = new CollatorGetter();
534 -
535 - public Collator getObject(CollatorProvider collatorProvider,
536 - Locale locale,
537 - String key,
538 - Object... params) {
539 - assert params.length == 1;
540 - Collator result = collatorProvider.getInstance(locale);
541 - if (result != null) {
542 - // put this Collator instance in the cache for two locales, one
543 - // is for the desired locale, and the other is for the actual
544 - // locale where the provider is found, which may be a fall back locale.
545 - cache.put((Locale)params[0], result);
546 - cache.put(locale, result);
547 - return (Collator)result.clone();
548 - }
549 -
550 - return null;
551 - }
552 - }
553 515 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX