52abc810fe
* scripts/makemake.tcl (properties_map): Don't exclude gnu/java/locale. * gnu/java/lang/MainThread.java (Klocale, Kcalendar): Remove. * java/text/Collator.java: Organize imports. (getAvailableLocales): Merge from classpath. (getInstance): Same. * sources.am: Regenerate. * Makefile.in: Regenerate. * classpath/lib/java/text/DecimalFormatSymbols.class, classpath/lib/java/text/DateFormatSymbols.class, classpath/lib/java/util/Currency.class, classpath/lib/java/util/Calendar.class, classpath/lib/gnu/java/lang/MainThread.class, classpath/lib/java/text/Collator.class, gnu/java/lang/MainThread.h, java/text/DateFormatSymbols.h, java/text/DecimalFormatSymbols.h, java/util/Calendar.h, java/util/Currency.h: Regenerate. * classpath/lib/gnu/java/locale/LocaleInformation_en_PH.class, classpath/lib/gnu/java/locale/LocaleInformation_es_AR.class, classpath/lib/gnu/java/locale/LocaleInformation_en_BW.class, classpath/lib/gnu/java/locale/LocaleInformation_de_BE.class, classpath/lib/gnu/java/locale/LocaleInformation_te_IN.class, classpath/lib/gnu/java/locale/LocaleInformation_en.class, classpath/lib/gnu/java/locale/LocaleInformation_iw_IL.class, classpath/lib/gnu/java/locale/LocaleInformation_fr_LU.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_AE.class, classpath/lib/gnu/java/locale/LocaleInformation_sk_SK.class, classpath/lib/gnu/java/locale/LocaleInformation_fr_CA.class, classpath/lib/gnu/java/locale/LocaleInformation_es_MX.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_EG.class, classpath/lib/gnu/java/locale/LocaleInformation_lt_LT.class, classpath/lib/gnu/java/locale/LocaleInformation_en_ZW.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_QA.class, classpath/lib/gnu/java/locale/LocaleInformation_gv_GB.class, classpath/lib/gnu/java/locale/LocaleInformation_yi_US.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_SD.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_IQ.class, classpath/lib/gnu/java/locale/Calendar_de.class, classpath/lib/gnu/java/locale/LocaleInformation_es_HN.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_YE.class, classpath/lib/gnu/java/locale/LocaleInformation_de_CH.class, classpath/lib/gnu/java/locale/LocaleInformation_es_PR.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_BH.class, classpath/lib/gnu/java/locale/LocaleInformation_mi_NZ.class, classpath/lib/gnu/java/locale/Calendar_nl.class, classpath/lib/gnu/java/locale/LocaleInformation_fr_BE.class, classpath/lib/gnu/java/locale/LocaleInformation_es_EC.class, classpath/lib/gnu/java/locale/LocaleInformation_mt_MT.class, classpath/lib/gnu/java/locale/LocaleInformation_en_HK.class, classpath/lib/gnu/java/locale/LocaleInformation_es_CL.class, classpath/lib/gnu/java/locale/LocaleInformation_kw_GB.class, classpath/lib/gnu/java/locale/LocaleInformation_mk_MK.class, classpath/lib/gnu/java/locale/LocaleInformation_es_ES.class, classpath/lib/gnu/java/locale/LocaleInformation_cs_CZ.class, classpath/lib/gnu/java/locale/LocaleInformation_nl_NL.class, classpath/lib/gnu/java/locale/LocaleInformation_en_CA.class, classpath/lib/gnu/java/locale/LocaleInformation_bs_BA.class, classpath/lib/gnu/java/locale/LocaleInformation_ru_UA.class, classpath/lib/gnu/java/locale/LocaleInformation_es_US.class, classpath/lib/gnu/java/locale/LocaleInformation_fr_CH.class, classpath/lib/gnu/java/locale/LocaleInformation_ja_JP.class, classpath/lib/gnu/java/locale/LocaleInformation_it_CH.class, classpath/lib/gnu/java/locale/LocaleInformation_es_PA.class, classpath/lib/gnu/java/locale/LocaleInformation_kl_GL.class, classpath/lib/gnu/java/locale/LocaleInformation_de.class, classpath/lib/gnu/java/locale/LocaleInformation_el_GR.class, classpath/lib/gnu/java/locale/LocaleInformation_en_IN.class, classpath/lib/gnu/java/locale/LocaleInformation_es_DO.class, classpath/lib/gnu/java/locale/LocaleInformation_tr_TR.class, classpath/lib/gnu/java/locale/LocaleInformation_es_PE.class, classpath/lib/gnu/java/locale/LocaleInformation_zh_TW.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_OM.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_KW.class, classpath/lib/gnu/java/locale/LocaleInformation_ga_IE.class, classpath/lib/gnu/java/locale/LocaleInformation_hu_HU.class, classpath/lib/gnu/java/locale/LocaleInformation_nl.class, classpath/lib/gnu/java/locale/LocaleInformation_ca_ES.class, classpath/lib/gnu/java/locale/LocaleInformation_zh_SG.class, classpath/lib/gnu/java/locale/LocaleInformation_de_AT.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_LB.class, classpath/lib/gnu/java/locale/LocaleInformation_es_PY.class, classpath/lib/gnu/java/locale/LocaleInformation_nl_BE.class, classpath/lib/gnu/java/locale/LocaleInformation_af_ZA.class, classpath/lib/gnu/java/locale/LocaleInformation_he_IL.class, classpath/lib/gnu/java/locale/LocaleInformation_ro_RO.class, classpath/lib/gnu/java/locale/LocaleInformation_vi_VN.class, classpath/lib/gnu/java/locale/LocaleInformation_cy_GB.class, classpath/lib/gnu/java/locale/LocaleInformation_hi_IN.class, classpath/lib/gnu/java/locale/LocaleInformation_es_CO.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_JO.class, classpath/lib/gnu/java/locale/LocaleInformation_br_FR.class, classpath/lib/gnu/java/locale/LocaleInformation_ta_IN.class, classpath/lib/gnu/java/locale/LocaleInformation_en_ZA.class, classpath/lib/gnu/java/locale/LocaleInformation_fr_FR.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_DZ.class, classpath/lib/gnu/java/locale/LocaleInformation_eu_ES.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_TN.class, classpath/lib/gnu/java/locale/LocaleInformation_tl_PH.class, classpath/lib/gnu/java/locale/LocaleInformation_pl_PL.class, classpath/lib/gnu/java/locale/LocaleInformation_sv_FI.class, classpath/lib/gnu/java/locale/LocaleInformation_id_ID.class, classpath/lib/gnu/java/locale/LocaleInformation_en_GB.class, classpath/lib/gnu/java/locale/LocaleInformation_uz_UZ.class, classpath/lib/gnu/java/locale/LocaleInformation_fi_FI.class, classpath/lib/gnu/java/locale/LocaleInformation_en_IE.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_MA.class, classpath/lib/gnu/java/locale/LocaleInformation_be_BY.class, classpath/lib/gnu/java/locale/LocaleInformation_bn_IN.class, classpath/lib/gnu/java/locale/LocaleInformation_pt_PT.class, classpath/lib/gnu/java/locale/LocaleInformation_es_BO.class, classpath/lib/gnu/java/locale/LocaleInformation_en_AU.class, classpath/lib/gnu/java/locale/LocaleInformation_es_NI.class, classpath/lib/gnu/java/locale/LocaleInformation_zh_CN.class, classpath/lib/gnu/java/locale/LocaleInformation_es_VE.class, classpath/lib/gnu/java/locale/LocaleInformation_ka_GE.class, classpath/lib/gnu/java/locale/LocaleInformation_it_IT.class, classpath/lib/gnu/java/locale/LocaleInformation_en_US.class, classpath/lib/gnu/java/locale/LocaleInformation_sl_SI.class, classpath/lib/gnu/java/locale/LocaleInformation_en_DK.class, classpath/lib/gnu/java/locale/LocaleInformation.class, classpath/lib/gnu/java/locale/LocaleInformation_es_CR.class, classpath/lib/gnu/java/locale/LocaleInformation_ru_RU.class, classpath/lib/gnu/java/locale/LocaleInformation_sq_AL.class, classpath/lib/gnu/java/locale/LocaleInformation_de_DE.class, classpath/lib/gnu/java/locale/LocaleInformation_es_GT.class, classpath/lib/gnu/java/locale/LocaleInformation_sr_YU.class, classpath/lib/gnu/java/locale/LocaleInformation_da_DK.class, classpath/lib/gnu/java/locale/LocaleInformation_gd_GB.class, classpath/lib/gnu/java/locale/LocaleInformation_hr_HR.class, classpath/lib/gnu/java/locale/LocaleInformation_zh_HK.class, classpath/lib/gnu/java/locale/LocaleInformation_uk_UA.class, classpath/lib/gnu/java/locale/LocaleInformation_ko_KR.class, classpath/lib/gnu/java/locale/Calendar_en.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_LY.class, classpath/lib/gnu/java/locale/LocaleInformation_pt_BR.class, classpath/lib/gnu/java/locale/LocaleInformation_nn_NO.class, classpath/lib/gnu/java/locale/LocaleInformation_en_NZ.class, classpath/lib/gnu/java/locale/LocaleInformation_es_SV.class, classpath/lib/gnu/java/locale/LocaleInformation_ur_PK.class, classpath/lib/gnu/java/locale/LocaleInformation_et_EE.class, classpath/lib/gnu/java/locale/LocaleInformation_lv_LV.class, classpath/lib/gnu/java/locale/LocaleInformation_es_UY.class, classpath/lib/gnu/java/locale/LocaleInformation_oc_FR.class, classpath/lib/gnu/java/locale/LocaleInformation_fo_FO.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_IN.class, classpath/lib/gnu/java/locale/LocaleInformation_de_LU.class, classpath/lib/gnu/java/locale/LocaleInformation_gl_ES.class, classpath/lib/gnu/java/locale/LocaleInformation_en_SG.class, classpath/lib/gnu/java/locale/LocaleInformation_se_NO.class, classpath/lib/gnu/java/locale/LocaleInformation_mr_IN.class, classpath/lib/gnu/java/locale/LocaleInformation_tg_TJ.class, classpath/lib/gnu/java/locale/LocaleInformation_no_NO.class, classpath/lib/gnu/java/locale/LocaleInformation_ar_SY.class, classpath/lib/gnu/java/locale/LocaleInformation_sv_SE.class, classpath/lib/gnu/java/locale/LocaleInformation_fa_IR.class, classpath/lib/gnu/java/locale/Calendar.class, gnu/java/locale/LocaleInformation_fr_CA.java, gnu/java/locale/LocaleInformation_sk_SK.java, gnu/java/locale/LocaleInformation_ar_BH.java, gnu/java/locale/LocaleInformation_ko_KR.h, gnu/java/locale/LocaleInformation_bs_BA.h, gnu/java/locale/LocaleInformation_nn_NO.h, gnu/java/locale/LocaleInformation_en_NZ.h, gnu/java/locale/LocaleInformation_en_ZW.java, gnu/java/locale/LocaleInformation_es_US.h, gnu/java/locale/LocaleInformation_es_SV.h, gnu/java/locale/LocaleInformation_de_LU.java, gnu/java/locale/LocaleInformation_fo_FO.java, gnu/java/locale/LocaleInformation_oc_FR.java, gnu/java/locale/LocaleInformation_it_CH.h, gnu/java/locale/LocaleInformation_de.h, gnu/java/locale/LocaleInformation_el_GR.h, gnu/java/locale/LocaleInformation_tr_TR.h, gnu/java/locale/LocaleInformation_ka_GE.java, gnu/java/locale/LocaleInformation_nn_NO.java, gnu/java/locale/LocaleInformation_se_NO.h, gnu/java/locale/LocaleInformation_ga_IE.h, gnu/java/locale/LocaleInformation_ru_UA.java, gnu/java/locale/LocaleInformation_fa_IR.java, gnu/java/locale/LocaleInformation_ja_JP.java, gnu/java/locale/LocaleInformation_sv_SE.h, gnu/java/locale/LocaleInformation_bn_IN.java, gnu/java/locale/LocaleInformation_af_ZA.h, gnu/java/locale/LocaleInformation_es_PE.java, gnu/java/locale/LocaleInformation_hi_IN.h, gnu/java/locale/LocaleInformation_en_ZA.java, gnu/java/locale/LocaleInformation_es_CO.h, gnu/java/locale/LocaleInformation_es_AR.h, gnu/java/locale/LocaleInformation_en_PH.h, gnu/java/locale/LocaleInformation_ta_IN.h, gnu/java/locale/LocaleInformation_en_ZA.h, gnu/java/locale/LocaleInformation_nl_NL.java, gnu/java/locale/LocaleInformation_ar_KW.java, gnu/java/locale/LocaleInformation_fr_FR.h, gnu/java/locale/LocaleInformation_ar_LY.java, gnu/java/locale/LocaleInformation_uz_UZ.java, gnu/java/locale/LocaleInformation_tl_PH.h, gnu/java/locale/LocaleInformation_fi_FI.java, gnu/java/locale/LocaleInformation_pl_PL.h, gnu/java/locale/LocaleInformation_sv_FI.h, gnu/java/locale/LocaleInformation_es_MX.h, gnu/java/locale/LocaleInformation_uz_UZ.h, gnu/java/locale/LocaleInformation_fi_FI.h, gnu/java/locale/LocaleInformation_ar_SD.java, gnu/java/locale/LocaleInformation_ar_QA.h, gnu/java/locale/LocaleInformation_kw_GB.java, gnu/java/locale/LocaleInformation_ar_YE.h, gnu/java/locale/LocaleInformation_es_PR.java, gnu/java/locale/LocaleInformation_zh_SG.java, gnu/java/locale/LocaleInformation_ca_ES.java, gnu/java/locale/LocaleInformation_ka_GE.h, gnu/java/locale/LocaleInformation_ar_BH.h, gnu/java/locale/LocaleInformation_fr_CH.java, gnu/java/locale/Calendar_nl.h, gnu/java/locale/LocaleInformation_en_DK.h, gnu/java/locale/LocaleInformation.h, gnu/java/locale/LocaleInformation_ar_JO.java, gnu/java/locale/LocaleInformation_br_FR.java, gnu/java/locale/LocaleInformation_ru_RU.java, gnu/java/locale/LocaleInformation_de_BE.java, gnu/java/locale/LocaleInformation_ru_RU.h, gnu/java/locale/LocaleInformation_de_DE.h, gnu/java/locale/LocaleInformation_hr_HR.h, gnu/java/locale/LocaleInformation_gd_GB.h, gnu/java/locale/LocaleInformation_nl.java, gnu/java/locale/LocaleInformation_en_GB.java, gnu/java/locale/LocaleInformation_uk_UA.h, gnu/java/locale/LocaleInformation_ar_LY.h, gnu/java/locale/LocaleInformation_ru_UA.h, gnu/java/locale/LocaleInformation_es_UY.java, gnu/java/locale/LocaleInformation_fr_CH.h, gnu/java/locale/LocaleInformation_lv_LV.h, gnu/java/locale/LocaleInformation_de.java, gnu/java/locale/LocaleInformation_el_GR.java, gnu/java/locale/LocaleInformation_es_CR.java, gnu/java/locale/LocaleInformation_ar_IN.h, gnu/java/locale/LocaleInformation_es_DO.h, gnu/java/locale/LocaleInformation_es_PE.h, gnu/java/locale/LocaleInformation_ar_OM.h, gnu/java/locale/LocaleInformation_zh_HK.java, gnu/java/locale/LocaleInformation_mr_IN.java, gnu/java/locale/LocaleInformation_no_NO.h, gnu/java/locale/LocaleInformation_es_EC.java, gnu/java/locale/LocaleInformation_ro_RO.java, gnu/java/locale/LocaleInformation_he_IL.java, gnu/java/locale/Calendar.java, gnu/java/locale/LocaleInformation_ar_LB.h, gnu/java/locale/LocaleInformation_fa_IR.h, gnu/java/locale/LocaleInformation_es_CO.java, gnu/java/locale/LocaleInformation_cy_GB.h, gnu/java/locale/LocaleInformation_en_SG.java, gnu/java/locale/LocaleInformation_mk_MK.java, gnu/java/locale/LocaleInformation_es_ES.java, gnu/java/locale/LocaleInformation_eu_ES.java, gnu/java/locale/LocaleInformation_en_BW.h, gnu/java/locale/LocaleInformation_es_VE.java, gnu/java/locale/LocaleInformation_zh_CN.java, gnu/java/locale/LocaleInformation_hr_HR.java, gnu/java/locale/LocaleInformation_gd_GB.java, gnu/java/locale/LocaleInformation_se_NO.java, gnu/java/locale/LocaleInformation_te_IN.h, gnu/java/locale/LocaleInformation_en.h, gnu/java/locale/LocaleInformation_ar_TN.h, gnu/java/locale/Calendar_nl.java, gnu/java/locale/LocaleInformation_es_US.java, gnu/java/locale/LocaleInformation_nl_BE.java, gnu/java/locale/LocaleInformation_es_PY.java, gnu/java/locale/LocaleInformation_sk_SK.h, gnu/java/locale/LocaleInformation_fr_CA.h, gnu/java/locale/LocaleInformation_be_BY.java, gnu/java/locale/LocaleInformation_lv_LV.java, gnu/java/locale/LocaleInformation_lt_LT.h, gnu/java/locale/LocaleInformation_gv_GB.java, gnu/java/locale/LocaleInformation_ar_MA.h, gnu/java/locale/LocaleInformation_en_IE.h, gnu/java/locale/LocaleInformation_es_CL.java, gnu/java/locale/LocaleInformation_bn_IN.h, gnu/java/locale/Calendar_de.java, gnu/java/locale/LocaleInformation_yi_US.h, gnu/java/locale/LocaleInformation_ar_DZ.java, gnu/java/locale/LocaleInformation_es_GT.java, gnu/java/locale/Calendar_de.h, gnu/java/locale/LocaleInformation_es_NI.h, gnu/java/locale/LocaleInformation_en_CA.java, gnu/java/locale/LocaleInformation_zh_CN.h, gnu/java/locale/LocaleInformation_es_VE.h, gnu/java/locale/LocaleInformation_de_CH.h, gnu/java/locale/LocaleInformation_en_NZ.java, gnu/java/locale/LocaleInformation_mi_NZ.java, gnu/java/locale/LocaleInformation_en_US.h, gnu/java/locale/LocaleInformation_sl_SI.h, gnu/java/locale/LocaleInformation_et_EE.java, gnu/java/locale/LocaleInformation_mi_NZ.h, gnu/java/locale/LocaleInformation_ar_QA.java, gnu/java/locale/LocaleInformation_en_HK.java, gnu/java/locale/LocaleInformation_ar_IQ.java, gnu/java/locale/LocaleInformation_ar_OM.java, gnu/java/locale/LocaleInformation_fr_FR.java, gnu/java/locale/LocaleInformation_es_CR.h, gnu/java/locale/LocaleInformation_en.java, gnu/java/locale/LocaleInformation_es_GT.h, gnu/java/locale/LocaleInformation_ur_PK.java, gnu/java/locale/LocaleInformation_pt_PT.java, gnu/java/locale/LocaleInformation_et_EE.h, gnu/java/locale/LocaleInformation_ar_IN.java, gnu/java/locale/LocaleInformation_es_AR.java, gnu/java/locale/LocaleInformation_en_PH.java, gnu/java/locale/LocaleInformation_en_IN.h, gnu/java/locale/LocaleInformation_kl_GL.h, gnu/java/locale/LocaleInformation_gl_ES.h, gnu/java/locale/LocaleInformation_sq_AL.java, gnu/java/locale/LocaleInformation_en_SG.h, gnu/java/locale/LocaleInformation_de_CH.java, gnu/java/locale/LocaleInformation_ga_IE.java, gnu/java/locale/LocaleInformation_no_NO.java, gnu/java/locale/LocaleInformation_de_AT.java, gnu/java/locale/LocaleInformation_tg_TJ.h, gnu/java/locale/LocaleInformation_hu_HU.h, gnu/java/locale/LocaleInformation_es_SV.java, gnu/java/locale/LocaleInformation_zh_SG.h, gnu/java/locale/LocaleInformation_ca_ES.h, gnu/java/locale/LocaleInformation_de_AT.h, gnu/java/locale/LocaleInformation_ar_SY.h, gnu/java/locale/LocaleInformation_he_IL.h, gnu/java/locale/LocaleInformation_ro_RO.h, gnu/java/locale/LocaleInformation_zh_TW.java, gnu/java/locale/LocaleInformation_es_NI.java, gnu/java/locale/LocaleInformation_ar_JO.h, gnu/java/locale/LocaleInformation_br_FR.h, gnu/java/locale/Calendar_en.java, gnu/java/locale/LocaleInformation_eu_ES.h, gnu/java/locale/LocaleInformation_pt_BR.java, gnu/java/locale/LocaleInformation_tg_TJ.java, gnu/java/locale/LocaleInformation_iw_IL.h, gnu/java/locale/LocaleInformation_ar_AE.h, gnu/java/locale/LocaleInformation_fr_LU.h, gnu/java/locale/LocaleInformation_id_ID.h, gnu/java/locale/LocaleInformation_sv_SE.java, gnu/java/locale/LocaleInformation_en_GB.h, gnu/java/locale/LocaleInformation_ar_EG.h, gnu/java/locale/LocaleInformation_cy_GB.java, gnu/java/locale/LocaleInformation_be_BY.h, gnu/java/locale/LocaleInformation_yi_US.java, gnu/java/locale/LocaleInformation_tr_TR.java, gnu/java/locale/LocaleInformation_pt_PT.h, gnu/java/locale/LocaleInformation_ar_IQ.h, gnu/java/locale/LocaleInformation_cs_CZ.java, gnu/java/locale/LocaleInformation_ar_TN.java, gnu/java/locale/LocaleInformation_ko_KR.java, gnu/java/locale/LocaleInformation_ar_AE.java, gnu/java/locale/LocaleInformation_fr_LU.java, gnu/java/locale/LocaleInformation_it_IT.h, gnu/java/locale/LocaleInformation_mt_MT.java, gnu/java/locale/LocaleInformation_fr_BE.h, gnu/java/locale/LocaleInformation_es_DO.java, gnu/java/locale/LocaleInformation_ta_IN.java, gnu/java/locale/LocaleInformation_es_CL.h, gnu/java/locale/LocaleInformation_te_IN.java, gnu/java/locale/LocaleInformation_ar_YE.java, gnu/java/locale/LocaleInformation_kw_GB.h, gnu/java/locale/LocaleInformation_uk_UA.java, gnu/java/locale/LocaleInformation_cs_CZ.h, gnu/java/locale/LocaleInformation_da_DK.h, gnu/java/locale/LocaleInformation_en_CA.h, gnu/java/locale/Calendar_en.h, gnu/java/locale/LocaleInformation_pt_BR.h, gnu/java/locale/LocaleInformation_ar_SY.java, gnu/java/locale/LocaleInformation_lt_LT.java, gnu/java/locale/LocaleInformation_vi_VN.java, gnu/java/locale/LocaleInformation_ur_PK.h, gnu/java/locale/LocaleInformation_en_IN.java, gnu/java/locale/LocaleInformation_kl_GL.java, gnu/java/locale/LocaleInformation_ja_JP.h, gnu/java/locale/LocaleInformation_es_UY.h, gnu/java/locale/LocaleInformation_es_PA.h, gnu/java/locale/LocaleInformation_de_LU.h, gnu/java/locale/LocaleInformation_fo_FO.h, gnu/java/locale/LocaleInformation_oc_FR.h, gnu/java/locale/LocaleInformation_zh_TW.h, gnu/java/locale/LocaleInformation_hu_HU.java, gnu/java/locale/LocaleInformation_ar_KW.h, gnu/java/locale/LocaleInformation_mr_IN.h, gnu/java/locale/LocaleInformation_ar_EG.java, gnu/java/locale/LocaleInformation_nl.h, gnu/java/locale/LocaleInformation_af_ZA.java, gnu/java/locale/LocaleInformation_es_PY.h, gnu/java/locale/LocaleInformation_nl_BE.h, gnu/java/locale/LocaleInformation_vi_VN.h, gnu/java/locale/LocaleInformation_es_PA.java, gnu/java/locale/Calendar.h, gnu/java/locale/LocaleInformation_da_DK.java, gnu/java/locale/LocaleInformation_de_BE.h, gnu/java/locale/LocaleInformation_ar_DZ.h, gnu/java/locale/LocaleInformation_bs_BA.java, gnu/java/locale/LocaleInformation_id_ID.java, gnu/java/locale/LocaleInformation_en_US.java, gnu/java/locale/LocaleInformation_sl_SI.java, gnu/java/locale/LocaleInformation_fr_BE.java, gnu/java/locale/LocaleInformation_ar_LB.java, gnu/java/locale/LocaleInformation_it_CH.java, gnu/java/locale/LocaleInformation_en_ZW.h, gnu/java/locale/LocaleInformation_gv_GB.h, gnu/java/locale/LocaleInformation_es_HN.java, gnu/java/locale/LocaleInformation_es_BO.h, gnu/java/locale/LocaleInformation_en_AU.h, gnu/java/locale/LocaleInformation_ar_SD.h, gnu/java/locale/LocaleInformation_sr_YU.java, gnu/java/locale/LocaleInformation_es_HN.h, gnu/java/locale/LocaleInformation_iw_IL.java, gnu/java/locale/LocaleInformation_it_IT.java, gnu/java/locale/LocaleInformation_es_MX.java, gnu/java/locale/LocaleInformation_es_PR.h, gnu/java/locale/LocaleInformation_ar_MA.java, gnu/java/locale/LocaleInformation_en_IE.java, gnu/java/locale/LocaleInformation.java, gnu/java/locale/LocaleInformation_en_DK.java, gnu/java/locale/LocaleInformation_es_EC.h, gnu/java/locale/LocaleInformation_mt_MT.h, gnu/java/locale/LocaleInformation_hi_IN.java, gnu/java/locale/LocaleInformation_en_AU.java, gnu/java/locale/LocaleInformation_es_BO.java, gnu/java/locale/LocaleInformation_gl_ES.java, gnu/java/locale/LocaleInformation_en_BW.java, gnu/java/locale/LocaleInformation_en_HK.h, gnu/java/locale/LocaleInformation_de_DE.java, gnu/java/locale/LocaleInformation_mk_MK.h, gnu/java/locale/LocaleInformation_es_ES.h, gnu/java/locale/LocaleInformation_sq_AL.h, gnu/java/locale/LocaleInformation_sv_FI.java, gnu/java/locale/LocaleInformation_pl_PL.java, gnu/java/locale/LocaleInformation_tl_PH.java, gnu/java/locale/LocaleInformation_sr_YU.h, gnu/java/locale/LocaleInformation_nl_NL.h, gnu/java/locale/LocaleInformation_zh_HK.h, java/text/DateFormatSymbols.java, java/text/DecimalFormatSymbols.java, java/util/Currency.java, java/util/Calendar.java: Remove From-SVN: r132872
420 lines
14 KiB
Java
420 lines
14 KiB
Java
/* Collator.java -- Perform locale dependent String comparisons.
|
|
Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2007,
|
|
2008 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.text;
|
|
|
|
import gnu.java.locale.LocaleHelper;
|
|
|
|
import java.text.spi.CollatorProvider;
|
|
|
|
import java.util.Comparator;
|
|
import java.util.Locale;
|
|
import java.util.MissingResourceException;
|
|
import java.util.ResourceBundle;
|
|
import java.util.ServiceLoader;
|
|
|
|
/**
|
|
* This class is the abstract superclass of classes which perform
|
|
* locale dependent <code>String</code> comparisons. A caller requests
|
|
* an instance of <code>Collator</code> for a particular locale using
|
|
* the <code>getInstance()</code> static method in this class. That method
|
|
* will return a locale specific subclass of <code>Collator</code> which
|
|
* can be used to perform <code>String</code> comparisons for that locale.
|
|
* If a subclass of <code>Collator</code> cannot be located for a particular
|
|
* locale, a default instance for the current locale will be returned.
|
|
*
|
|
* In addition to setting the correct locale, there are two additional
|
|
* settings that can be adjusted to affect <code>String</code> comparisons:
|
|
* strength and decomposition. The strength value determines the level
|
|
* of signficance of character differences required for them to sort
|
|
* differently. (For example, whether or not capital letters are considered
|
|
* different from lower case letters). The decomposition value affects how
|
|
* variants of the same character are treated for sorting purposes. (For
|
|
* example, whether or not an accent is signficant or not). These settings
|
|
* are described in detail in the documentation for the methods and values
|
|
* that are related to them.
|
|
*
|
|
* @author Tom Tromey (tromey@cygnus.com)
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
* @date March 18, 1999
|
|
*/
|
|
public abstract class Collator implements Comparator<Object>, Cloneable
|
|
{
|
|
/**
|
|
* This constant is a strength value which indicates that only primary
|
|
* differences between characters will be considered signficant. As an
|
|
* example, two completely different English letters such as 'a' and 'b'
|
|
* are considered to have a primary difference.
|
|
*/
|
|
public static final int PRIMARY = 0;
|
|
|
|
/**
|
|
* This constant is a strength value which indicates that only secondary
|
|
* or primary differences between characters will be considered
|
|
* significant. An example of a secondary difference between characters
|
|
* are instances of the same letter with different accented forms.
|
|
*/
|
|
public static final int SECONDARY = 1;
|
|
|
|
/**
|
|
* This constant is a strength value which indicates that tertiary,
|
|
* secondary, and primary differences will be considered during sorting.
|
|
* An example of a tertiary difference is capitalization of a given letter.
|
|
* This is the default value for the strength setting.
|
|
*/
|
|
public static final int TERTIARY = 2;
|
|
|
|
/**
|
|
* This constant is a strength value which indicates that any difference
|
|
* at all between character values are considered significant.
|
|
*/
|
|
public static final int IDENTICAL = 3;
|
|
|
|
/**
|
|
* This constant indicates that accented characters won't be decomposed
|
|
* when performing comparisons. This will yield the fastest results, but
|
|
* will only work correctly in call cases for languages which do not
|
|
* use accents such as English.
|
|
*/
|
|
public static final int NO_DECOMPOSITION = 0;
|
|
|
|
/**
|
|
* This constant indicates that only characters which are canonical variants
|
|
* in Unicode 2.0 will be decomposed prior to performing comparisons. This
|
|
* will cause accented languages to be sorted correctly. This is the
|
|
* default decomposition value.
|
|
*/
|
|
public static final int CANONICAL_DECOMPOSITION = 1;
|
|
|
|
/**
|
|
* This constant indicates that both canonical variants and compatibility
|
|
* variants in Unicode 2.0 will be decomposed prior to performing
|
|
* comparisons. This is the slowest mode, but is required to get the
|
|
* correct sorting for certain languages with certain special formats.
|
|
*/
|
|
public static final int FULL_DECOMPOSITION = 2;
|
|
|
|
/**
|
|
* This method initializes a new instance of <code>Collator</code> to have
|
|
* the default strength (TERTIARY) and decomposition
|
|
* (CANONICAL_DECOMPOSITION) settings. This constructor is protected and
|
|
* is for use by subclasses only. Non-subclass callers should use the
|
|
* static <code>getInstance()</code> methods of this class to instantiate
|
|
* <code>Collation</code> objects for the desired locale.
|
|
*/
|
|
protected Collator ()
|
|
{
|
|
strength = TERTIARY;
|
|
decmp = CANONICAL_DECOMPOSITION;
|
|
}
|
|
|
|
/**
|
|
* This method compares the two <code>String</code>'s and returns an
|
|
* integer indicating whether or not the first argument is less than,
|
|
* equal to, or greater than the second argument. The comparison is
|
|
* performed according to the rules of the locale for this
|
|
* <code>Collator</code> and the strength and decomposition rules in
|
|
* effect.
|
|
*
|
|
* @param source The first object to compare
|
|
* @param target The second object to compare
|
|
*
|
|
* @return A negative integer if str1 < str2, 0 if str1 == str2, or
|
|
* a positive integer if str1 > str2.
|
|
*/
|
|
public abstract int compare (String source, String target);
|
|
|
|
/**
|
|
* This method compares the two <code>Object</code>'s and returns an
|
|
* integer indicating whether or not the first argument is less than,
|
|
* equal to, or greater than the second argument. These two objects
|
|
* must be <code>String</code>'s or an exception will be thrown.
|
|
*
|
|
* @param o1 The first object to compare
|
|
* @param o2 The second object to compare
|
|
*
|
|
* @return A negative integer if obj1 < obj2, 0 if obj1 == obj2, or
|
|
* a positive integer if obj1 > obj2.
|
|
*
|
|
* @exception ClassCastException If the arguments are not instances
|
|
* of <code>String</code>.
|
|
*/
|
|
public int compare (Object o1, Object o2)
|
|
{
|
|
return compare ((String) o1, (String) o2);
|
|
}
|
|
|
|
/**
|
|
* This method tests the specified object for equality against this
|
|
* object. This will be true if and only if the following conditions are
|
|
* met:
|
|
* <ul>
|
|
* <li>The specified object is not <code>null</code>.</li>
|
|
* <li>The specified object is an instance of <code>Collator</code>.</li>
|
|
* <li>The specified object has the same strength and decomposition
|
|
* settings as this object.</li>
|
|
* </ul>
|
|
*
|
|
* @param obj The <code>Object</code> to test for equality against
|
|
* this object.
|
|
*
|
|
* @return <code>true</code> if the specified object is equal to
|
|
* this one, <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals (Object obj)
|
|
{
|
|
if (! (obj instanceof Collator))
|
|
return false;
|
|
Collator c = (Collator) obj;
|
|
return decmp == c.decmp && strength == c.strength;
|
|
}
|
|
|
|
/**
|
|
* This method tests whether the specified <code>String</code>'s are equal
|
|
* according to the collation rules for the locale of this object and
|
|
* the current strength and decomposition settings.
|
|
*
|
|
* @param source The first <code>String</code> to compare
|
|
* @param target The second <code>String</code> to compare
|
|
*
|
|
* @return <code>true</code> if the two strings are equal,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals (String source, String target)
|
|
{
|
|
return compare (source, target) == 0;
|
|
}
|
|
|
|
/**
|
|
* This method returns a copy of this <code>Collator</code> object.
|
|
*
|
|
* @return A duplicate of this object.
|
|
*/
|
|
public Object clone ()
|
|
{
|
|
try
|
|
{
|
|
return super.clone ();
|
|
}
|
|
catch (CloneNotSupportedException _)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* This method returns an array of <code>Locale</code> objects which is
|
|
* the list of locales for which <code>Collator</code> objects exist.
|
|
*
|
|
* @return The list of locales for which <code>Collator</code>'s exist.
|
|
*/
|
|
public static synchronized Locale[] getAvailableLocales ()
|
|
{
|
|
return LocaleHelper.getCollatorLocales();
|
|
}
|
|
|
|
/**
|
|
* This method transforms the specified <code>String</code> into a
|
|
* <code>CollationKey</code> for faster comparisons. This is useful when
|
|
* comparisons against a string might be performed multiple times, such
|
|
* as during a sort operation.
|
|
*
|
|
* @param source The <code>String</code> to convert.
|
|
*
|
|
* @return A <code>CollationKey</code> for the specified <code>String</code>.
|
|
*/
|
|
public abstract CollationKey getCollationKey (String source);
|
|
|
|
/**
|
|
* This method returns the current decomposition setting for this
|
|
* object. This * will be one of NO_DECOMPOSITION,
|
|
* CANONICAL_DECOMPOSITION, or * FULL_DECOMPOSITION. See the
|
|
* documentation for those constants for an * explanation of this
|
|
* setting.
|
|
*
|
|
* @return The current decomposition setting.
|
|
*/
|
|
public synchronized int getDecomposition ()
|
|
{
|
|
return decmp;
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>Collator</code> for the
|
|
* default locale.
|
|
*
|
|
* @return A <code>Collator</code> for the default locale.
|
|
*/
|
|
public static Collator getInstance ()
|
|
{
|
|
return getInstance (Locale.getDefault());
|
|
}
|
|
|
|
/**
|
|
* This method returns an instance of <code>Collator</code> for the
|
|
* specified locale. If no <code>Collator</code> exists for the desired
|
|
* locale, the fallback procedure described in
|
|
* {@link java.util.spi.LocaleServiceProvider} is invoked.
|
|
*
|
|
* @param loc The desired locale to load a <code>Collator</code> for.
|
|
*
|
|
* @return A <code>Collator</code> for the requested locale
|
|
*/
|
|
public static Collator getInstance (Locale loc)
|
|
{
|
|
String pattern;
|
|
try
|
|
{
|
|
ResourceBundle res =
|
|
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
|
loc, ClassLoader.getSystemClassLoader());
|
|
return new RuleBasedCollator(res.getString("collation_rules"));
|
|
}
|
|
catch (MissingResourceException x)
|
|
{
|
|
/* This means runtime support for the locale
|
|
* is not available, so we check providers. */
|
|
}
|
|
catch (ParseException x)
|
|
{
|
|
throw (InternalError)new InternalError().initCause(x);
|
|
}
|
|
for (CollatorProvider p : ServiceLoader.load(CollatorProvider.class))
|
|
{
|
|
for (Locale l : p.getAvailableLocales())
|
|
{
|
|
if (l.equals(loc))
|
|
{
|
|
Collator c = p.getInstance(loc);
|
|
if (c != null)
|
|
return c;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (loc.equals(Locale.ROOT))
|
|
{
|
|
try
|
|
{
|
|
return new RuleBasedCollator("<0<1<2<3<4<5<6<7<8<9<A,a<b,B<c," +
|
|
"C<d,D<e,E<f,F<g,G<h,H<i,I<j,J<k,K" +
|
|
"<l,L<m,M<n,N<o,O<p,P<q,Q<r,R<s,S<t,"+
|
|
"T<u,U<v,V<w,W<x,X<y,Y<z,Z");
|
|
}
|
|
catch (ParseException x)
|
|
{
|
|
throw (InternalError)new InternalError().initCause(x);
|
|
}
|
|
}
|
|
return getInstance(LocaleHelper.getFallbackLocale(loc));
|
|
}
|
|
|
|
/**
|
|
* This method returns the current strength setting for this object. This
|
|
* will be one of PRIMARY, SECONDARY, TERTIARY, or IDENTICAL. See the
|
|
* documentation for those constants for an explanation of this setting.
|
|
*
|
|
* @return The current strength setting.
|
|
*/
|
|
public synchronized int getStrength ()
|
|
{
|
|
return strength;
|
|
}
|
|
|
|
/**
|
|
* This method returns a hash code value for this object.
|
|
*
|
|
* @return A hash value for this object.
|
|
*/
|
|
public abstract int hashCode ();
|
|
|
|
/**
|
|
* This method sets the decomposition setting for this object to the
|
|
* specified value. This must be one of NO_DECOMPOSITION,
|
|
* CANONICAL_DECOMPOSITION, or FULL_DECOMPOSITION. Otherwise an
|
|
* exception will be thrown. See the documentation for those
|
|
* contants for an explanation of this setting.
|
|
*
|
|
* @param mode The new decomposition setting.
|
|
*
|
|
* @exception IllegalArgumentException If the requested
|
|
* decomposition setting is not valid.
|
|
*/
|
|
public synchronized void setDecomposition (int mode)
|
|
{
|
|
if (mode != NO_DECOMPOSITION
|
|
&& mode != CANONICAL_DECOMPOSITION
|
|
&& mode != FULL_DECOMPOSITION)
|
|
throw new IllegalArgumentException ();
|
|
decmp = mode;
|
|
}
|
|
|
|
/**
|
|
* This method sets the strength setting for this object to the specified
|
|
* value. This must be one of PRIMARY, SECONDARY, TERTIARY, or IDENTICAL.
|
|
* Otherwise an exception is thrown. See the documentation for these
|
|
* constants for an explanation of this setting.
|
|
*
|
|
* @param strength The new strength setting.
|
|
*
|
|
* @exception IllegalArgumentException If the requested strength
|
|
* setting value is not valid.
|
|
*/
|
|
public synchronized void setStrength (int strength)
|
|
{
|
|
if (strength != PRIMARY && strength != SECONDARY
|
|
&& strength != TERTIARY && strength != IDENTICAL)
|
|
throw new IllegalArgumentException ();
|
|
this.strength = strength;
|
|
}
|
|
|
|
// Decompose a single character and append results to the buffer.
|
|
native final void decomposeCharacter (char c, StringBuffer buf);
|
|
|
|
/**
|
|
* This is the current collation decomposition setting.
|
|
*/
|
|
int decmp;
|
|
|
|
/**
|
|
* This is the current collation strength setting.
|
|
*/
|
|
int strength;
|
|
}
|