makemake.tcl (properties_map): Don't exclude gnu/java/locale.
* 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
This commit is contained in:
David Daney
David Daney
@@ -1,5 +1,6 @@
|
||||
/* Collator.java -- Perform locale dependent String comparisons.
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2007 Free Software Foundation, Inc.
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2007,
|
||||
2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -38,6 +39,8 @@ exception statement from your version. */
|
||||
|
||||
package java.text;
|
||||
|
||||
import gnu.java.locale.LocaleHelper;
|
||||
|
||||
import java.text.spi.CollatorProvider;
|
||||
|
||||
import java.util.Comparator;
|
||||
@@ -243,10 +246,7 @@ public abstract class Collator implements Comparator<Object>, Cloneable
|
||||
*/
|
||||
public static synchronized Locale[] getAvailableLocales ()
|
||||
{
|
||||
// FIXME
|
||||
Locale[] l = new Locale[1];
|
||||
l[0] = Locale.US;
|
||||
return l;
|
||||
return LocaleHelper.getCollatorLocales();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -342,8 +342,7 @@ public abstract class Collator implements Comparator<Object>, Cloneable
|
||||
throw (InternalError)new InternalError().initCause(x);
|
||||
}
|
||||
}
|
||||
// FIXME
|
||||
return getInstance(Locale.US);
|
||||
return getInstance(LocaleHelper.getFallbackLocale(loc));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -23,6 +23,8 @@ extern "Java"
|
||||
class java::text::DateFormatSymbols : public ::java::lang::Object
|
||||
{
|
||||
|
||||
static JArray< ::java::lang::String * > * getStringArray(::java::util::ResourceBundle *, ::java::lang::String *);
|
||||
JArray< JArray< ::java::lang::String * > * > * getZoneStrings(::java::util::ResourceBundle *, ::java::util::Locale *);
|
||||
JArray< ::java::lang::String * > * formatsForKey(::java::util::ResourceBundle *, ::java::lang::String *);
|
||||
public:
|
||||
DateFormatSymbols(::java::util::Locale *);
|
||||
|
||||
@@ -1,597 +0,0 @@
|
||||
/* DateFormatSymbols.java -- Format over a range of numbers
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006 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.DateFormatSymbolsProvider;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.MissingResourceException;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.ServiceLoader;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import java.util.spi.TimeZoneNameProvider;
|
||||
|
||||
/**
|
||||
* This class acts as container for locale specific date/time formatting
|
||||
* information such as the days of the week and the months of the year.
|
||||
* @author Per Bothner (bothner@cygnus.com)
|
||||
*
|
||||
* @date October 24, 1998.
|
||||
*/
|
||||
/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3.
|
||||
* Status: Believed complete and correct.
|
||||
*/
|
||||
public class DateFormatSymbols implements java.io.Serializable, Cloneable
|
||||
{
|
||||
String[] ampms;
|
||||
String[] eras;
|
||||
private String localPatternChars;
|
||||
String[] months;
|
||||
String[] shortMonths;
|
||||
String[] shortWeekdays;
|
||||
String[] weekdays;
|
||||
|
||||
/**
|
||||
* The timezone strings supplied by the runtime.
|
||||
*/
|
||||
private String[][] runtimeZoneStrings;
|
||||
|
||||
/**
|
||||
* Custom timezone strings supplied by {@link #setZoneStrings()}.
|
||||
*/
|
||||
private String[][] zoneStrings;
|
||||
|
||||
private static final long serialVersionUID = -5987973545549424702L;
|
||||
|
||||
// The order of these prefixes must be the same as in DateFormat
|
||||
private static final String[] formatPrefixes =
|
||||
{
|
||||
"full", "long", "medium", "short"
|
||||
};
|
||||
|
||||
// These are each arrays with a value for SHORT, MEDIUM, LONG, FULL,
|
||||
// and DEFAULT (constants defined in java.text.DateFormat). While
|
||||
// not part of the official spec, we need a way to get at locale-specific
|
||||
// default formatting patterns. They are declared package scope so
|
||||
// as to be easily accessible where needed (DateFormat, SimpleDateFormat).
|
||||
transient String[] dateFormats;
|
||||
transient String[] timeFormats;
|
||||
|
||||
private String[] formatsForKey(ResourceBundle res, String key)
|
||||
{
|
||||
String[] values = new String [formatPrefixes.length];
|
||||
for (int i = 0; i < formatPrefixes.length; i++)
|
||||
{
|
||||
values[i] = res.getString(formatPrefixes[i]+key);
|
||||
}
|
||||
return values;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method initializes a new instance of <code>DateFormatSymbols</code>
|
||||
* by loading the date format information for the specified locale.
|
||||
* This constructor only obtains instances using the runtime's resources;
|
||||
* to also include {@link java.text.spi.DateFormatSymbolsProvider} instances,
|
||||
* call {@link #getInstance(java.util.Locale)} instead.
|
||||
*
|
||||
* @param locale The locale for which date formatting symbols should
|
||||
* be loaded.
|
||||
* @throws MissingResourceException if the resources for the specified
|
||||
* locale could not be found or loaded.
|
||||
* @see #getInstance(java.util.Locale)
|
||||
*/
|
||||
public DateFormatSymbols (Locale locale)
|
||||
throws MissingResourceException
|
||||
{
|
||||
ResourceBundle res
|
||||
= ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", locale,
|
||||
ClassLoader.getSystemClassLoader());
|
||||
|
||||
ampms = res.getStringArray ("ampms");
|
||||
eras = res.getStringArray ("eras");
|
||||
localPatternChars = res.getString ("localPatternChars");
|
||||
months = res.getStringArray ("months");
|
||||
shortMonths = res.getStringArray ("shortMonths");
|
||||
shortWeekdays = res.getStringArray ("shortWeekdays");
|
||||
weekdays = res.getStringArray ("weekdays");
|
||||
zoneStrings = (String[][]) res.getObject ("zoneStrings");
|
||||
|
||||
dateFormats = formatsForKey(res, "DateFormat");
|
||||
timeFormats = formatsForKey(res, "TimeFormat");
|
||||
}
|
||||
|
||||
/**
|
||||
* This method loads the format symbol information for the default
|
||||
* locale. This constructor only obtains instances using the runtime's resources;
|
||||
* to also include {@link java.text.spi.DateFormatSymbolsProvider} instances,
|
||||
* call {@link #getInstance()} instead.
|
||||
*
|
||||
* @throws MissingResourceException if the resources for the default
|
||||
* locale could not be found or loaded.
|
||||
* @see #getInstance()
|
||||
*/
|
||||
public DateFormatSymbols()
|
||||
throws MissingResourceException
|
||||
{
|
||||
this (Locale.getDefault());
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the list of strings used for displaying AM or PM.
|
||||
* This is a two element <code>String</code> array indexed by
|
||||
* <code>Calendar.AM</code> and <code>Calendar.PM</code>
|
||||
*
|
||||
* @return The list of AM/PM display strings.
|
||||
*/
|
||||
public String[] getAmPmStrings()
|
||||
{
|
||||
return ampms;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the list of strings used for displaying eras
|
||||
* (e.g., "BC" and "AD"). This is a two element <code>String</code>
|
||||
* array indexed by <code>Calendar.BC</code> and <code>Calendar.AD</code>.
|
||||
*
|
||||
* @return The list of era disply strings.
|
||||
*/
|
||||
public String[] getEras()
|
||||
{
|
||||
return eras;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the pattern character information for this
|
||||
* object. This is an 18 character string that contains the characters
|
||||
* that are used in creating the date formatting strings in
|
||||
* <code>SimpleDateFormat</code>. The following are the character
|
||||
* positions in the string and which format character they correspond
|
||||
* to (the character in parentheses is the default value in the US English
|
||||
* locale):
|
||||
* <p>
|
||||
* <ul>
|
||||
* <li>0 - era (G)</li>
|
||||
* <li>1 - year (y)</li>
|
||||
* <li>2 - month (M)</li>
|
||||
* <li>3 - day of month (d)</li>
|
||||
* <li>4 - hour out of 12, from 1-12 (h)</li>
|
||||
* <li>5 - hour out of 24, from 0-23 (H)</li>
|
||||
* <li>6 - minute (m)</li>
|
||||
* <li>7 - second (s)</li>
|
||||
* <li>8 - millisecond (S)</li>
|
||||
* <li>9 - date of week (E)</li>
|
||||
* <li>10 - date of year (D)</li>
|
||||
* <li>11 - day of week in month, eg. "4th Thur in Nov" (F)</li>
|
||||
* <li>12 - week in year (w)</li>
|
||||
* <li>13 - week in month (W)</li>
|
||||
* <li>14 - am/pm (a)</li>
|
||||
* <li>15 - hour out of 24, from 1-24 (k)</li>
|
||||
* <li>16 - hour out of 12, from 0-11 (K)</li>
|
||||
* <li>17 - time zone (z)</li>
|
||||
* </ul>
|
||||
*
|
||||
* @return The format patter characters
|
||||
*/
|
||||
public String getLocalPatternChars()
|
||||
{
|
||||
return localPatternChars;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the list of strings used for displaying month
|
||||
* names (e.g., "January" and "February"). This is a thirteen element
|
||||
* string array indexed by <code>Calendar.JANUARY</code> through
|
||||
* <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
||||
* elements because some calendars have thriteen months.
|
||||
*
|
||||
* @return The list of month display strings.
|
||||
*/
|
||||
public String[] getMonths ()
|
||||
{
|
||||
return months;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the list of strings used for displaying abbreviated
|
||||
* month names (e.g., "Jan" and "Feb"). This is a thirteen element
|
||||
* <code>String</code> array indexed by <code>Calendar.JANUARY</code>
|
||||
* through <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
||||
* elements because some calendars have thirteen months.
|
||||
*
|
||||
* @return The list of abbreviated month display strings.
|
||||
*/
|
||||
public String[] getShortMonths ()
|
||||
{
|
||||
return shortMonths;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the list of strings used for displaying abbreviated
|
||||
* weekday names (e.g., "Sun" and "Mon"). This is an eight element
|
||||
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
||||
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
||||
* of this array is ignored.
|
||||
*
|
||||
* @return This list of abbreviated weekday display strings.
|
||||
*/
|
||||
public String[] getShortWeekdays ()
|
||||
{
|
||||
return shortWeekdays;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the list of strings used for displaying weekday
|
||||
* names (e.g., "Sunday" and "Monday"). This is an eight element
|
||||
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
||||
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
||||
* of this array is ignored.
|
||||
*
|
||||
* @return This list of weekday display strings.
|
||||
*/
|
||||
public String[] getWeekdays ()
|
||||
{
|
||||
return weekdays;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns this list of localized timezone display strings.
|
||||
* This is a two dimensional <code>String</code> array where each row in
|
||||
* the array contains five values:
|
||||
* <P>
|
||||
* <ul>
|
||||
* <li>0 - The non-localized time zone id string.</li>
|
||||
* <li>1 - The long name of the time zone (standard time).</li>
|
||||
* <li>2 - The short name of the time zone (standard time).</li>
|
||||
* <li>3 - The long name of the time zone (daylight savings time).</li>
|
||||
* <li>4 - the short name of the time zone (daylight savings time).</li>
|
||||
* </ul>
|
||||
*
|
||||
* @return The list of time zone display strings.
|
||||
*/
|
||||
public String[] [] getZoneStrings ()
|
||||
{
|
||||
return zoneStrings;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of strings used to display AM/PM values to
|
||||
* the specified list.
|
||||
* This is a two element <code>String</code> array indexed by
|
||||
* <code>Calendar.AM</code> and <code>Calendar.PM</code>
|
||||
*
|
||||
* @param value The new list of AM/PM display strings.
|
||||
*/
|
||||
public void setAmPmStrings (String[] value)
|
||||
{
|
||||
ampms = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of strings used to display time eras to
|
||||
* to the specified list.
|
||||
* This is a two element <code>String</code>
|
||||
* array indexed by <code>Calendar.BC</code> and <code>Calendar.AD</code>.
|
||||
*
|
||||
* @param labels The new list of era display strings.
|
||||
*/
|
||||
public void setEras (String[] labels)
|
||||
{
|
||||
eras = labels;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of characters used to specific date/time
|
||||
* formatting strings.
|
||||
* This is an 18 character string that contains the characters
|
||||
* that are used in creating the date formatting strings in
|
||||
* <code>SimpleDateFormat</code>. The following are the character
|
||||
* positions in the string and which format character they correspond
|
||||
* to (the character in parentheses is the default value in the US English
|
||||
* locale):
|
||||
* <p>
|
||||
* <ul>
|
||||
* <li>0 - era (G)</li>
|
||||
* <li>1 - year (y)</li>
|
||||
* <li>2 - month (M)</li>
|
||||
* <li>3 - day of month (d)</li>
|
||||
* <li>4 - hour out of 12, from 1-12 (h)</li>
|
||||
* <li>5 - hour out of 24, from 0-23 (H)</li>
|
||||
* <li>6 - minute (m)</li>
|
||||
* <li>7 - second (s)</li>
|
||||
* <li>8 - millisecond (S)</li>
|
||||
* <li>9 - date of week (E)</li>
|
||||
* <li>10 - date of year (D)</li>
|
||||
* <li>11 - day of week in month, eg. "4th Thur in Nov" (F)</li>
|
||||
* <li>12 - week in year (w)</li>
|
||||
* <li>13 - week in month (W)</li>
|
||||
* <li>14 - am/pm (a)</li>
|
||||
* <li>15 - hour out of 24, from 1-24 (k)</li>
|
||||
* <li>16 - hour out of 12, from 0-11 (K)</li>
|
||||
* <li>17 - time zone (z)</li>
|
||||
* </ul>
|
||||
*
|
||||
* @param chars The new format pattern characters
|
||||
*/
|
||||
public void setLocalPatternChars (String chars)
|
||||
{
|
||||
localPatternChars = chars;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of strings used to display month names.
|
||||
* This is a thirteen element
|
||||
* string array indexed by <code>Calendar.JANUARY</code> through
|
||||
* <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
||||
* elements because some calendars have thriteen months.
|
||||
*
|
||||
* @param labels The list of month display strings.
|
||||
*/
|
||||
public void setMonths (String[] labels)
|
||||
{
|
||||
months = labels;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of strings used to display abbreviated month
|
||||
* names.
|
||||
* This is a thirteen element
|
||||
* <code>String</code> array indexed by <code>Calendar.JANUARY</code>
|
||||
* through <code>Calendar.UNDECEMBER</code>. Note that there are thirteen
|
||||
* elements because some calendars have thirteen months.
|
||||
*
|
||||
* @param labels The new list of abbreviated month display strings.
|
||||
*/
|
||||
public void setShortMonths (String[] labels)
|
||||
{
|
||||
shortMonths = labels;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of strings used to display abbreviated
|
||||
* weekday names.
|
||||
* This is an eight element
|
||||
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
||||
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
||||
* of this array is ignored.
|
||||
*
|
||||
* @param labels This list of abbreviated weekday display strings.
|
||||
*/
|
||||
public void setShortWeekdays (String[] labels)
|
||||
{
|
||||
shortWeekdays = labels;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of strings used to display weekday names.
|
||||
* This is an eight element
|
||||
* <code>String</code> array indexed by <code>Calendar.SUNDAY</code>
|
||||
* through <code>Calendar.SATURDAY</code>. Note that the first element
|
||||
* of this array is ignored.
|
||||
*
|
||||
* @param labels This list of weekday display strings.
|
||||
*/
|
||||
public void setWeekdays (String[] labels)
|
||||
{
|
||||
weekdays = labels;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the list of display strings for time zones.
|
||||
* This is a two dimensional <code>String</code> array where each row in
|
||||
* the array contains five values:
|
||||
* <P>
|
||||
* <ul>
|
||||
* <li>0 - The non-localized time zone id string.</li>
|
||||
* <li>1 - The long name of the time zone (standard time).</li>
|
||||
* <li>2 - The short name of the time zone (standard time).</li>
|
||||
* <li>3 - The long name of the time zone (daylight savings time).</li>
|
||||
* <li>4 - the short name of the time zone (daylight savings time).</li>
|
||||
* </ul>
|
||||
*
|
||||
* @params zones The list of time zone display strings.
|
||||
*/
|
||||
public void setZoneStrings (String[][] zones)
|
||||
{
|
||||
zoneStrings = zones;
|
||||
}
|
||||
|
||||
/* Does a "deep" equality test - recurses into arrays. */
|
||||
private static boolean equals (Object x, Object y)
|
||||
{
|
||||
if (x == y)
|
||||
return true;
|
||||
if (x == null || y == null)
|
||||
return false;
|
||||
if (! (x instanceof Object[]) || ! (y instanceof Object[]))
|
||||
return x.equals(y);
|
||||
Object[] xa = (Object[]) x;
|
||||
Object[] ya = (Object[]) y;
|
||||
if (xa.length != ya.length)
|
||||
return false;
|
||||
for (int i = xa.length; --i >= 0; )
|
||||
{
|
||||
if (! equals(xa[i], ya[i]))
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private static int hashCode (Object x)
|
||||
{
|
||||
if (x == null)
|
||||
return 0;
|
||||
if (! (x instanceof Object[]))
|
||||
return x.hashCode();
|
||||
Object[] xa = (Object[]) x;
|
||||
int hash = 0;
|
||||
for (int i = 0; i < xa.length; i++)
|
||||
hash = 37 * hashCode(xa[i]);
|
||||
return hash;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method tests a specified object for equality against this object.
|
||||
* This will be true if and only if the specified object:
|
||||
* <p>
|
||||
* <ul>
|
||||
* <li> Is not <code>null</code>.</li>
|
||||
* <li> Is an instance of <code>DateFormatSymbols</code>.</li>
|
||||
* <li> Contains identical formatting symbols to this object.</li>
|
||||
* </ul>
|
||||
*
|
||||
* @param obj The <code>Object</code> to test for equality against.
|
||||
*
|
||||
* @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 DateFormatSymbols))
|
||||
return false;
|
||||
DateFormatSymbols other = (DateFormatSymbols) obj;
|
||||
return (equals(ampms, other.ampms)
|
||||
&& equals(eras, other.eras)
|
||||
&& equals(localPatternChars, other.localPatternChars)
|
||||
&& equals(months, other.months)
|
||||
&& equals(shortMonths, other.shortMonths)
|
||||
&& equals(shortWeekdays, other.shortWeekdays)
|
||||
&& equals(weekdays, other.weekdays)
|
||||
&& equals(zoneStrings, other.zoneStrings));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a new copy of this object.
|
||||
*
|
||||
* @return A copy of this object
|
||||
*/
|
||||
public Object clone ()
|
||||
{
|
||||
try
|
||||
{
|
||||
return super.clone ();
|
||||
}
|
||||
catch (CloneNotSupportedException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns a hash value for this object.
|
||||
*
|
||||
* @return A hash value for this object.
|
||||
*/
|
||||
public int hashCode ()
|
||||
{
|
||||
return (hashCode(ampms)
|
||||
^ hashCode(eras)
|
||||
^ hashCode(localPatternChars)
|
||||
^ hashCode(months)
|
||||
^ hashCode(shortMonths)
|
||||
^ hashCode(shortWeekdays)
|
||||
^ hashCode(weekdays)
|
||||
^ hashCode(zoneStrings));
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a {@link DateFormatSymbols} instance for the
|
||||
* default locale obtained from either the runtime itself
|
||||
* or one of the installed
|
||||
* {@link java.text.spi.DateFormatSymbolsProvider} instances.
|
||||
* This is equivalent to calling
|
||||
* <code>getInstance(Locale.getDefault())</code>.
|
||||
*
|
||||
* @return a {@link DateFormatSymbols} instance for the default
|
||||
* locale.
|
||||
* @since 1.6
|
||||
*/
|
||||
public static final DateFormatSymbols getInstance()
|
||||
{
|
||||
return getInstance(Locale.getDefault());
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a {@link DateFormatSymbols} instance for the
|
||||
* specified locale obtained from either the runtime itself
|
||||
* or one of the installed
|
||||
* {@link java.text.spi.DateFormatSymbolsProvider} instances.
|
||||
*
|
||||
* @param locale the locale for which an instance should be
|
||||
* returned.
|
||||
* @return a {@link DateFormatSymbols} instance for the specified
|
||||
* locale.
|
||||
* @throws NullPointerException if <code>locale</code> is
|
||||
* <code>null</code>.
|
||||
* @since 1.6
|
||||
*/
|
||||
public static final DateFormatSymbols getInstance(Locale locale)
|
||||
{
|
||||
try
|
||||
{
|
||||
DateFormatSymbols syms = new DateFormatSymbols(locale);
|
||||
return syms;
|
||||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
/* This means runtime support for the locale
|
||||
* is not available, so we check providers. */
|
||||
}
|
||||
for (DateFormatSymbolsProvider p :
|
||||
ServiceLoader.load(DateFormatSymbolsProvider.class))
|
||||
{
|
||||
for (Locale loc : p.getAvailableLocales())
|
||||
{
|
||||
if (loc.equals(locale))
|
||||
{
|
||||
DateFormatSymbols syms = p.getInstance(locale);
|
||||
if (syms != null)
|
||||
return syms;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return getInstance(LocaleHelper.getFallbackLocale(locale));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -22,49 +22,49 @@ class java::text::DecimalFormatSymbols : public ::java::lang::Object
|
||||
{
|
||||
|
||||
public:
|
||||
::java::lang::Object * clone();
|
||||
virtual ::java::lang::Object * clone();
|
||||
DecimalFormatSymbols();
|
||||
private:
|
||||
::java::lang::String * safeGetString(::java::util::ResourceBundle *, ::java::lang::String *, ::java::lang::String *);
|
||||
jchar safeGetChar(::java::util::ResourceBundle *, ::java::lang::String *, jchar);
|
||||
public:
|
||||
DecimalFormatSymbols(::java::util::Locale *);
|
||||
jboolean equals(::java::lang::Object *);
|
||||
::java::util::Currency * getCurrency();
|
||||
::java::lang::String * getCurrencySymbol();
|
||||
jchar getDecimalSeparator();
|
||||
jchar getDigit();
|
||||
virtual jboolean equals(::java::lang::Object *);
|
||||
virtual ::java::util::Currency * getCurrency();
|
||||
virtual ::java::lang::String * getCurrencySymbol();
|
||||
virtual jchar getDecimalSeparator();
|
||||
virtual jchar getDigit();
|
||||
public: // actually package-private
|
||||
jchar getExponential();
|
||||
virtual jchar getExponential();
|
||||
public:
|
||||
jchar getGroupingSeparator();
|
||||
::java::lang::String * getInfinity();
|
||||
::java::lang::String * getInternationalCurrencySymbol();
|
||||
jchar getMinusSign();
|
||||
jchar getMonetaryDecimalSeparator();
|
||||
::java::lang::String * getNaN();
|
||||
jchar getPatternSeparator();
|
||||
jchar getPercent();
|
||||
jchar getPerMill();
|
||||
jchar getZeroDigit();
|
||||
jint hashCode();
|
||||
void setCurrency(::java::util::Currency *);
|
||||
void setCurrencySymbol(::java::lang::String *);
|
||||
void setDecimalSeparator(jchar);
|
||||
void setDigit(jchar);
|
||||
virtual jchar getGroupingSeparator();
|
||||
virtual ::java::lang::String * getInfinity();
|
||||
virtual ::java::lang::String * getInternationalCurrencySymbol();
|
||||
virtual jchar getMinusSign();
|
||||
virtual jchar getMonetaryDecimalSeparator();
|
||||
virtual ::java::lang::String * getNaN();
|
||||
virtual jchar getPatternSeparator();
|
||||
virtual jchar getPercent();
|
||||
virtual jchar getPerMill();
|
||||
virtual jchar getZeroDigit();
|
||||
virtual jint hashCode();
|
||||
virtual void setCurrency(::java::util::Currency *);
|
||||
virtual void setCurrencySymbol(::java::lang::String *);
|
||||
virtual void setDecimalSeparator(jchar);
|
||||
virtual void setDigit(jchar);
|
||||
public: // actually package-private
|
||||
void setExponential(jchar);
|
||||
virtual void setExponential(jchar);
|
||||
public:
|
||||
void setGroupingSeparator(jchar);
|
||||
void setInfinity(::java::lang::String *);
|
||||
void setInternationalCurrencySymbol(::java::lang::String *);
|
||||
void setMinusSign(jchar);
|
||||
void setMonetaryDecimalSeparator(jchar);
|
||||
void setNaN(::java::lang::String *);
|
||||
void setPatternSeparator(jchar);
|
||||
void setPercent(jchar);
|
||||
void setPerMill(jchar);
|
||||
void setZeroDigit(jchar);
|
||||
virtual void setGroupingSeparator(jchar);
|
||||
virtual void setInfinity(::java::lang::String *);
|
||||
virtual void setInternationalCurrencySymbol(::java::lang::String *);
|
||||
virtual void setMinusSign(jchar);
|
||||
virtual void setMonetaryDecimalSeparator(jchar);
|
||||
virtual void setNaN(::java::lang::String *);
|
||||
virtual void setPatternSeparator(jchar);
|
||||
virtual void setPercent(jchar);
|
||||
virtual void setPerMill(jchar);
|
||||
virtual void setZeroDigit(jchar);
|
||||
private:
|
||||
void readObject(::java::io::ObjectInputStream *);
|
||||
public:
|
||||
|
||||
@@ -1,742 +0,0 @@
|
||||
/* DecimalFormatSymbols.java -- Format symbols used by DecimalFormat
|
||||
Copyright (C) 1999, 2000, 2001, 2004, 2007 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.io.IOException;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.io.Serializable;
|
||||
|
||||
import java.text.spi.DecimalFormatSymbolsProvider;
|
||||
|
||||
import java.util.Currency;
|
||||
import java.util.Locale;
|
||||
import java.util.MissingResourceException;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.ServiceLoader;
|
||||
|
||||
/**
|
||||
* This class is a container for the symbols used by
|
||||
* <code>DecimalFormat</code> to format numbers and currency. These are
|
||||
* normally handled automatically, but an application can override
|
||||
* values as desired using this class.
|
||||
*
|
||||
* @author Tom Tromey (tromey@cygnus.com)
|
||||
* @author Aaron M. Renn (arenn@urbanophile.com)
|
||||
* @date February 24, 1999
|
||||
*/
|
||||
/* Written using "Java Class Libraries", 2nd edition, plus online
|
||||
* API docs for JDK 1.2 from http://www.javasoft.com.
|
||||
* Status: Believed complete and correct to 1.2.
|
||||
*/
|
||||
public final class DecimalFormatSymbols implements Cloneable, Serializable
|
||||
{
|
||||
public Object clone ()
|
||||
{
|
||||
try
|
||||
{
|
||||
return super.clone ();
|
||||
}
|
||||
catch(CloneNotSupportedException e)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This method initializes a new instance of
|
||||
* <code>DecimalFormatSymbols</code> for the default locale.
|
||||
* This constructor only obtains instances using the runtime's resources;
|
||||
* to also include {@link java.text.spi.DateFormatSymbolsProvider} instances,
|
||||
* call {@link #getInstance()} instead.
|
||||
*
|
||||
* @see #getInstance()
|
||||
*/
|
||||
public DecimalFormatSymbols ()
|
||||
{
|
||||
this (Locale.getDefault());
|
||||
}
|
||||
|
||||
private String safeGetString(ResourceBundle bundle,
|
||||
String name, String def)
|
||||
{
|
||||
if (bundle != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
return bundle.getString(name);
|
||||
}
|
||||
catch (MissingResourceException x)
|
||||
{
|
||||
}
|
||||
}
|
||||
return def;
|
||||
}
|
||||
|
||||
private char safeGetChar(ResourceBundle bundle,
|
||||
String name, char def)
|
||||
{
|
||||
String r = null;
|
||||
if (bundle != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
r = bundle.getString(name);
|
||||
}
|
||||
catch (MissingResourceException x)
|
||||
{
|
||||
}
|
||||
}
|
||||
if (r == null || r.length() < 1)
|
||||
return def;
|
||||
return r.charAt(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method initializes a new instance of
|
||||
* <code>DecimalFormatSymbols</code> for the specified locale.
|
||||
* <strong>Note</strong>: if the locale does not have an associated
|
||||
* <code>Currency</code> instance, the currency symbol and
|
||||
* international currency symbol will be set to the strings "?"
|
||||
* and "XXX" respectively. This generally happens with language
|
||||
* locales (those with no specified country), such as
|
||||
* <code>Locale.ENGLISH</code>. This constructor only obtains
|
||||
* instances using the runtime's resources; to also include
|
||||
* {@link java.text.spi.DecimalFormatSymbolsProvider} instances,
|
||||
* call {@link #getInstance(java.util.Locale)} instead.
|
||||
*
|
||||
* @param loc The local to load symbols for.
|
||||
* @throws NullPointerException if the locale is null.
|
||||
* @see #getInstance(java.util.Locale)
|
||||
*/
|
||||
public DecimalFormatSymbols (Locale loc)
|
||||
{
|
||||
ResourceBundle res;
|
||||
try
|
||||
{
|
||||
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
||||
loc, ClassLoader.getSystemClassLoader());
|
||||
}
|
||||
catch (MissingResourceException x)
|
||||
{
|
||||
res = null;
|
||||
}
|
||||
currency = Currency.getInstance("XXX");
|
||||
currencySymbol = "?";
|
||||
intlCurrencySymbol = "XXX";
|
||||
try
|
||||
{
|
||||
Currency localeCurrency = Currency.getInstance(loc);
|
||||
if (localeCurrency != null)
|
||||
{
|
||||
setCurrency(localeCurrency);
|
||||
}
|
||||
}
|
||||
catch(IllegalArgumentException exception)
|
||||
{
|
||||
/* Locale has an invalid currency */
|
||||
}
|
||||
decimalSeparator = safeGetChar (res, "decimalSeparator", '.');
|
||||
digit = safeGetChar (res, "digit", '#');
|
||||
exponential = safeGetChar (res, "exponential", 'E');
|
||||
groupingSeparator = safeGetChar (res, "groupingSeparator", ',');
|
||||
infinity = safeGetString (res, "infinity", "\u221e");
|
||||
try
|
||||
{
|
||||
monetarySeparator = safeGetChar (res, "monetarySeparator", '.');
|
||||
}
|
||||
catch (MissingResourceException x)
|
||||
{
|
||||
monetarySeparator = decimalSeparator;
|
||||
}
|
||||
minusSign = safeGetChar (res, "minusSign", '-');
|
||||
NaN = safeGetString (res, "NaN", "\ufffd");
|
||||
patternSeparator = safeGetChar (res, "patternSeparator", ';');
|
||||
percent = safeGetChar (res, "percent", '%');
|
||||
perMill = safeGetChar (res, "perMill", '\u2030');
|
||||
zeroDigit = safeGetChar (res, "zeroDigit", '0');
|
||||
locale = loc;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method this this object for equality against the specified object.
|
||||
* This will be true if and only if the following criteria are met with
|
||||
* regard to the specified object:
|
||||
* <p>
|
||||
* <ul>
|
||||
* <li>It is not <code>null</code>.</li>
|
||||
* <li>It is an instance of <code>DecimalFormatSymbols</code>.</li>
|
||||
* <li>All of its symbols are identical to the symbols in this object.</li>
|
||||
* </ul>
|
||||
*
|
||||
* @return <code>true</code> if the specified object is equal to this
|
||||
* object, <code>false</code> otherwise.
|
||||
*/
|
||||
public boolean equals (Object obj)
|
||||
{
|
||||
if (! (obj instanceof DecimalFormatSymbols))
|
||||
return false;
|
||||
DecimalFormatSymbols dfs = (DecimalFormatSymbols) obj;
|
||||
return (currencySymbol.equals(dfs.currencySymbol)
|
||||
&& decimalSeparator == dfs.decimalSeparator
|
||||
&& digit == dfs.digit
|
||||
&& exponential == dfs.exponential
|
||||
&& groupingSeparator == dfs.groupingSeparator
|
||||
&& infinity.equals(dfs.infinity)
|
||||
&& intlCurrencySymbol.equals(dfs.intlCurrencySymbol)
|
||||
&& minusSign == dfs.minusSign
|
||||
&& monetarySeparator == dfs.monetarySeparator
|
||||
&& NaN.equals(dfs.NaN)
|
||||
&& patternSeparator == dfs.patternSeparator
|
||||
&& percent == dfs.percent
|
||||
&& perMill == dfs.perMill
|
||||
&& zeroDigit == dfs.zeroDigit);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the currency corresponding to the currency symbol stored
|
||||
* in the instance of <code>DecimalFormatSymbols</code>.
|
||||
*
|
||||
* @return An instance of <code>Currency</code> which matches
|
||||
* the currency used, or null if there is no corresponding
|
||||
* instance.
|
||||
*/
|
||||
public Currency getCurrency ()
|
||||
{
|
||||
return currency;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the currency symbol in local format. For example,
|
||||
* "$" for Canadian dollars.
|
||||
*
|
||||
* @return The currency symbol in local format.
|
||||
*/
|
||||
public String getCurrencySymbol ()
|
||||
{
|
||||
return currencySymbol;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used as the decimal point.
|
||||
*
|
||||
* @return The character used as the decimal point.
|
||||
*/
|
||||
public char getDecimalSeparator ()
|
||||
{
|
||||
return decimalSeparator;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used to represent a digit in a
|
||||
* format pattern string.
|
||||
*
|
||||
* @return The character used to represent a digit in a format
|
||||
* pattern string.
|
||||
*/
|
||||
public char getDigit ()
|
||||
{
|
||||
return digit;
|
||||
}
|
||||
|
||||
// This is our own extension.
|
||||
char getExponential ()
|
||||
{
|
||||
return exponential;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used to separate groups of digits. For
|
||||
* example, the United States uses a comma (,) to separate thousands in
|
||||
* a number.
|
||||
*
|
||||
* @return The character used to separate groups of digits.
|
||||
*/
|
||||
public char getGroupingSeparator ()
|
||||
{
|
||||
return groupingSeparator;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used to represent infinity.
|
||||
*
|
||||
* @return The character used to represent infinity.
|
||||
*/
|
||||
public String getInfinity ()
|
||||
{
|
||||
return infinity;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the currency symbol in international format. For
|
||||
* example, "C$" for Canadian dollars.
|
||||
*
|
||||
* @return The currency symbol in international format.
|
||||
*/
|
||||
public String getInternationalCurrencySymbol ()
|
||||
{
|
||||
return intlCurrencySymbol;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used to represent the minus sign.
|
||||
*
|
||||
* @return The character used to represent the minus sign.
|
||||
*/
|
||||
public char getMinusSign ()
|
||||
{
|
||||
return minusSign;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used to represent the decimal
|
||||
* point for currency values.
|
||||
*
|
||||
* @return The decimal point character used in currency values.
|
||||
*/
|
||||
public char getMonetaryDecimalSeparator ()
|
||||
{
|
||||
return monetarySeparator;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the string used to represent the NaN (not a number)
|
||||
* value.
|
||||
*
|
||||
* @return The string used to represent NaN
|
||||
*/
|
||||
public String getNaN ()
|
||||
{
|
||||
return NaN;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used to separate positive and negative
|
||||
* subpatterns in a format pattern.
|
||||
*
|
||||
* @return The character used to separate positive and negative subpatterns
|
||||
* in a format pattern.
|
||||
*/
|
||||
public char getPatternSeparator ()
|
||||
{
|
||||
return patternSeparator;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used as the percent sign.
|
||||
*
|
||||
* @return The character used as the percent sign.
|
||||
*/
|
||||
public char getPercent ()
|
||||
{
|
||||
return percent;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used as the per mille character.
|
||||
*
|
||||
* @return The per mille character.
|
||||
*/
|
||||
public char getPerMill ()
|
||||
{
|
||||
return perMill;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the character used to represent the digit zero.
|
||||
*
|
||||
* @return The character used to represent the digit zero.
|
||||
*/
|
||||
public char getZeroDigit ()
|
||||
{
|
||||
return zeroDigit;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns a hash value for this object.
|
||||
*
|
||||
* @return A hash value for this object.
|
||||
*/
|
||||
public int hashCode ()
|
||||
{
|
||||
// Compute based on zero digit, grouping separator, and decimal
|
||||
// separator -- JCL book. This probably isn't a very good hash
|
||||
// code.
|
||||
return zeroDigit << 16 + groupingSeparator << 8 + decimalSeparator;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the currency symbol and ISO 4217 currency
|
||||
* code to the values obtained from the supplied currency.
|
||||
*
|
||||
* @param currency the currency from which to obtain the values.
|
||||
* @throws NullPointerException if the currency is null.
|
||||
*/
|
||||
public void setCurrency (Currency currency)
|
||||
{
|
||||
setCurrencySymbol (currency.getSymbol());
|
||||
this.currency = currency;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the currency symbol to the specified value.
|
||||
*
|
||||
* @param currency The new currency symbol
|
||||
*/
|
||||
public void setCurrencySymbol (String currency)
|
||||
{
|
||||
currencySymbol = currency;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the decimal point character to the specified value.
|
||||
*
|
||||
* @param decimalSep The new decimal point character
|
||||
*/
|
||||
public void setDecimalSeparator (char decimalSep)
|
||||
{
|
||||
decimalSeparator = decimalSep;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used to represents a digit in a format
|
||||
* string to the specified value.
|
||||
*
|
||||
* @param digit The character used to represent a digit in a format pattern.
|
||||
*/
|
||||
public void setDigit (char digit)
|
||||
{
|
||||
this.digit = digit;
|
||||
}
|
||||
|
||||
// This is our own extension.
|
||||
void setExponential (char exp)
|
||||
{
|
||||
exponential = exp;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used to separate groups of digits.
|
||||
*
|
||||
* @param groupSep The character used to separate groups of digits.
|
||||
*/
|
||||
public void setGroupingSeparator (char groupSep)
|
||||
{
|
||||
groupingSeparator = groupSep;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the string used to represents infinity.
|
||||
*
|
||||
* @param infinity The string used to represent infinity.
|
||||
*/
|
||||
public void setInfinity (String infinity)
|
||||
{
|
||||
this.infinity = infinity;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the international currency symbol to the
|
||||
* specified value. If a valid <code>Currency</code> instance
|
||||
* exists for the international currency code, then this is
|
||||
* used for the currency attribute, and the currency symbol
|
||||
* is set to the corresponding value from this instance.
|
||||
* Otherwise, the currency attribute is set to null and the
|
||||
* symbol is left unmodified.
|
||||
*
|
||||
* @param currencyCode The new international currency symbol.
|
||||
*/
|
||||
public void setInternationalCurrencySymbol (String currencyCode)
|
||||
{
|
||||
intlCurrencySymbol = currencyCode;
|
||||
try
|
||||
{
|
||||
currency = Currency.getInstance(currencyCode);
|
||||
}
|
||||
catch (IllegalArgumentException exception)
|
||||
{
|
||||
currency = null;
|
||||
}
|
||||
if (currency != null)
|
||||
{
|
||||
setCurrencySymbol(currency.getSymbol(locale));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used to represent the minus sign.
|
||||
*
|
||||
* @param minusSign The character used to represent the minus sign.
|
||||
*/
|
||||
public void setMinusSign (char minusSign)
|
||||
{
|
||||
this.minusSign = minusSign;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used for the decimal point in currency
|
||||
* values.
|
||||
*
|
||||
* @param decimalSep The decimal point character used in currency values.
|
||||
*/
|
||||
public void setMonetaryDecimalSeparator (char decimalSep)
|
||||
{
|
||||
monetarySeparator = decimalSep;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the string used to represent the NaN (not a
|
||||
* number) value.
|
||||
*
|
||||
* @param nan The string used to represent NaN
|
||||
*/
|
||||
public void setNaN (String nan)
|
||||
{
|
||||
NaN = nan;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used to separate positive and negative
|
||||
* subpatterns in a format pattern.
|
||||
*
|
||||
* @param patternSep The character used to separate positive and
|
||||
* negative subpatterns in a format pattern.
|
||||
*/
|
||||
public void setPatternSeparator (char patternSep)
|
||||
{
|
||||
patternSeparator = patternSep;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used as the percent sign.
|
||||
*
|
||||
* @param percent The character used as the percent sign.
|
||||
*/
|
||||
public void setPercent (char percent)
|
||||
{
|
||||
this.percent = percent;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used as the per mille character.
|
||||
*
|
||||
* @param perMill The per mille character.
|
||||
*/
|
||||
public void setPerMill (char perMill)
|
||||
{
|
||||
this.perMill = perMill;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method sets the character used to represent the digit zero.
|
||||
*
|
||||
* @param zeroDigit The character used to represent the digit zero.
|
||||
*/
|
||||
public void setZeroDigit (char zeroDigit)
|
||||
{
|
||||
this.zeroDigit = zeroDigit;
|
||||
}
|
||||
|
||||
/**
|
||||
* @serial A string used for the local currency
|
||||
*/
|
||||
private String currencySymbol;
|
||||
/**
|
||||
* @serial The <code>char</code> used to separate decimals in a number.
|
||||
*/
|
||||
private char decimalSeparator;
|
||||
/**
|
||||
* @serial This is the <code>char</code> used to represent a digit in
|
||||
* a format specification.
|
||||
*/
|
||||
private char digit;
|
||||
/**
|
||||
* @serial This is the <code>char</code> used to represent the exponent
|
||||
* separator in exponential notation.
|
||||
*/
|
||||
private char exponential;
|
||||
/**
|
||||
* @serial This separates groups of thousands in numbers.
|
||||
*/
|
||||
private char groupingSeparator;
|
||||
/**
|
||||
* @serial This string represents infinity.
|
||||
*/
|
||||
private String infinity;
|
||||
/**
|
||||
* @serial This string represents the local currency in an international
|
||||
* context, eg, "C$" for Canadian dollars.
|
||||
*/
|
||||
private String intlCurrencySymbol;
|
||||
/**
|
||||
* @serial This is the character used to represent the minus sign.
|
||||
*/
|
||||
private char minusSign;
|
||||
/**
|
||||
* @serial This character is used to separate decimals when formatting
|
||||
* currency values.
|
||||
*/
|
||||
private char monetarySeparator;
|
||||
/**
|
||||
* @serial This string is used the represent the Java NaN value for
|
||||
* "not a number".
|
||||
*/
|
||||
private String NaN;
|
||||
/**
|
||||
* @serial This is the character used to separate positive and negative
|
||||
* subpatterns in a format pattern.
|
||||
*/
|
||||
private char patternSeparator;
|
||||
/**
|
||||
* @serial This is the percent symbols
|
||||
*/
|
||||
private char percent;
|
||||
/**
|
||||
* @serial This character is used for the mille percent sign.
|
||||
*/
|
||||
private char perMill;
|
||||
/**
|
||||
* @serial This value represents the type of object being de-serialized.
|
||||
* 0 indicates a pre-Java 1.1.6 version, 1 indicates 1.1.6 or later.
|
||||
* 0 indicates a pre-Java 1.1.6 version, 1 indicates 1.1.6 or later,
|
||||
* 2 indicates 1.4 or later
|
||||
*/
|
||||
private int serialVersionOnStream = 2;
|
||||
/**
|
||||
* @serial This is the character used to represent 0.
|
||||
*/
|
||||
private char zeroDigit;
|
||||
|
||||
/**
|
||||
* @serial The locale of these currency symbols.
|
||||
*/
|
||||
private Locale locale;
|
||||
|
||||
/**
|
||||
* The currency used for the symbols in this instance.
|
||||
* This is stored temporarily for efficiency reasons,
|
||||
* as well as to ensure that the correct instance
|
||||
* is restored from the currency code.
|
||||
*
|
||||
* @serial Ignored.
|
||||
*/
|
||||
private transient Currency currency;
|
||||
|
||||
private static final long serialVersionUID = 5772796243397350300L;
|
||||
|
||||
private void readObject(ObjectInputStream stream)
|
||||
throws IOException, ClassNotFoundException
|
||||
{
|
||||
stream.defaultReadObject();
|
||||
if (serialVersionOnStream < 1)
|
||||
{
|
||||
monetarySeparator = decimalSeparator;
|
||||
exponential = 'E';
|
||||
}
|
||||
if (serialVersionOnStream < 2)
|
||||
locale = Locale.getDefault();
|
||||
|
||||
serialVersionOnStream = 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a {@link DecimalFormatSymbols} instance for the
|
||||
* default locale obtained from either the runtime itself
|
||||
* or one of the installed
|
||||
* {@link java.text.spi.DecimalFormatSymbolsProvider} instances.
|
||||
* This is equivalent to calling
|
||||
* <code>getInstance(Locale.getDefault())</code>.
|
||||
*
|
||||
* @return a {@link DecimalFormatSymbols} instance for the default
|
||||
* locale.
|
||||
* @since 1.6
|
||||
*/
|
||||
public static final DecimalFormatSymbols getInstance()
|
||||
{
|
||||
return getInstance(Locale.getDefault());
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a {@link DecimalFormatSymbols} instance for the
|
||||
* specified locale obtained from either the runtime itself
|
||||
* or one of the installed
|
||||
* {@link java.text.spi.DecimalFormatSymbolsProvider} instances.
|
||||
*
|
||||
* @param locale the locale for which an instance should be
|
||||
* returned.
|
||||
* @return a {@link DecimalFormatSymbols} instance for the specified
|
||||
* locale.
|
||||
* @throws NullPointerException if <code>locale</code> is
|
||||
* <code>null</code>.
|
||||
* @since 1.6
|
||||
*/
|
||||
public static final DecimalFormatSymbols getInstance(Locale locale)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!locale.equals(Locale.ROOT))
|
||||
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
||||
locale,
|
||||
ClassLoader.getSystemClassLoader());
|
||||
return new DecimalFormatSymbols(locale);
|
||||
}
|
||||
catch (MissingResourceException x)
|
||||
{
|
||||
/* This means runtime support for the locale
|
||||
* is not available, so we check providers. */
|
||||
}
|
||||
for (DecimalFormatSymbolsProvider p :
|
||||
ServiceLoader.load(DecimalFormatSymbolsProvider.class))
|
||||
{
|
||||
for (Locale loc : p.getAvailableLocales())
|
||||
{
|
||||
if (loc.equals(locale))
|
||||
{
|
||||
DecimalFormatSymbols syms = p.getInstance(locale);
|
||||
if (syms != null)
|
||||
return syms;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return getInstance(LocaleHelper.getFallbackLocale(locale));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -128,6 +128,7 @@ public: // actually protected
|
||||
jboolean areFieldsSet;
|
||||
private:
|
||||
::java::util::TimeZone * zone;
|
||||
static ::java::lang::String * calendarClassName;
|
||||
jboolean lenient;
|
||||
jint firstDayOfWeek;
|
||||
jint minimalDaysInFirstWeek;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -27,11 +27,10 @@ private:
|
||||
public: // actually package-private
|
||||
static const jlong serialVersionUID = -158308464356906721LL;
|
||||
private:
|
||||
::java::util::Locale * __attribute__((aligned(__alignof__( ::java::lang::Object)))) locale;
|
||||
::java::util::ResourceBundle * res;
|
||||
static ::java::util::Properties * properties;
|
||||
::java::lang::String * currencyCode;
|
||||
::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) currencyCode;
|
||||
jint fractionDigits;
|
||||
static ::java::util::Map * countryMap;
|
||||
static ::java::util::Map * cache;
|
||||
public:
|
||||
static ::java::lang::Class class$;
|
||||
|
||||
@@ -1,422 +0,0 @@
|
||||
/* Currency.java -- Representation of a currency
|
||||
Copyright (C) 2003, 2004, 2005 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.util;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectStreamException;
|
||||
import java.io.Serializable;
|
||||
import java.text.NumberFormat;
|
||||
|
||||
/**
|
||||
* Representation of a currency for a particular locale. Each currency
|
||||
* is identified by its ISO 4217 code, and only one instance of this
|
||||
* class exists per currency. As a result, instances are created
|
||||
* via the <code>getInstance()</code> methods rather than by using
|
||||
* a constructor.
|
||||
*
|
||||
* @see java.util.Locale
|
||||
* @author Guilhem Lavaux (guilhem.lavaux@free.fr)
|
||||
* @author Dalibor Topic (robilad@kaffe.org)
|
||||
* @author Bryce McKinlay (mckinlay@redhat.com)
|
||||
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
* @since 1.4
|
||||
*/
|
||||
public final class Currency
|
||||
implements Serializable
|
||||
{
|
||||
/**
|
||||
* For compatability with Sun's JDK
|
||||
*/
|
||||
static final long serialVersionUID = -158308464356906721L;
|
||||
|
||||
/**
|
||||
* The locale associated with this currency.
|
||||
*
|
||||
* @see #Currency(java.util.Locale)
|
||||
* @see #getInstance(java.util.Locale)
|
||||
* @see #getSymbol(java.util.Locale)
|
||||
* @serial ignored.
|
||||
*/
|
||||
private transient Locale locale;
|
||||
|
||||
/**
|
||||
* The resource bundle which maps the currency to
|
||||
* a ISO 4217 currency code.
|
||||
*
|
||||
* @see #getCurrencyCode()
|
||||
* @serial ignored.
|
||||
*/
|
||||
private transient ResourceBundle res;
|
||||
|
||||
/**
|
||||
* The set of properties which map a currency to
|
||||
* the currency information such as the ISO 4217
|
||||
* currency code and the number of decimal points.
|
||||
*
|
||||
* @see #getCurrencyCode()
|
||||
* @serial ignored.
|
||||
*/
|
||||
private static transient Properties properties;
|
||||
|
||||
/**
|
||||
* The ISO 4217 currency code associated with this
|
||||
* particular instance.
|
||||
*
|
||||
* @see #getCurrencyCode()
|
||||
* @serial the ISO 4217 currency code
|
||||
*/
|
||||
private String currencyCode;
|
||||
|
||||
/**
|
||||
* The number of fraction digits associated with this
|
||||
* particular instance.
|
||||
*
|
||||
* @see #getDefaultFractionDigits()
|
||||
* @serial the number of fraction digits
|
||||
*/
|
||||
private transient int fractionDigits;
|
||||
|
||||
/**
|
||||
* A cache of <code>Currency</code> instances to
|
||||
* ensure the singleton nature of this class. The key
|
||||
* is the locale of the currency.
|
||||
*
|
||||
* @see #getInstance(java.util.Locale)
|
||||
* @see #readResolve()
|
||||
* @serial ignored.
|
||||
*/
|
||||
private static transient Map cache;
|
||||
|
||||
/**
|
||||
* Instantiates the cache.
|
||||
*/
|
||||
static
|
||||
{
|
||||
cache = new HashMap();
|
||||
/* Create the properties object */
|
||||
properties = new Properties();
|
||||
/* Try and load the properties from our iso4217.properties resource */
|
||||
try
|
||||
{
|
||||
properties.load(Currency.class.getResourceAsStream("iso4217.properties"));
|
||||
}
|
||||
catch (IOException exception)
|
||||
{
|
||||
System.out.println("Failed to load currency resource: " + exception);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Default constructor for deserialization
|
||||
*/
|
||||
private Currency ()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor to create a <code>Currency</code> object
|
||||
* for a particular <code>Locale</code>.
|
||||
* All components of the given locale, other than the
|
||||
* country code, are ignored. The results of calling this
|
||||
* method may vary over time, as the currency associated with
|
||||
* a particular country changes. For countries without
|
||||
* a given currency (e.g. Antarctica), the result is null.
|
||||
*
|
||||
* @param loc the locale for the new currency.
|
||||
*/
|
||||
private Currency (Locale loc)
|
||||
{
|
||||
String countryCode;
|
||||
String fractionDigitsKey;
|
||||
|
||||
/* Retrieve the country code from the locale */
|
||||
countryCode = loc.getCountry();
|
||||
|
||||
/* If there is no country code, return */
|
||||
if (countryCode.equals(""))
|
||||
{
|
||||
throw new
|
||||
IllegalArgumentException("Invalid (empty) country code for locale:"
|
||||
+ loc);
|
||||
}
|
||||
|
||||
this.locale = loc;
|
||||
this.res = ResourceBundle.getBundle ("gnu.java.locale.LocaleInformation",
|
||||
locale, ClassLoader.getSystemClassLoader());
|
||||
|
||||
/* Retrieve the ISO4217 currency code */
|
||||
try
|
||||
{
|
||||
currencyCode = res.getString ("intlCurrencySymbol");
|
||||
}
|
||||
catch (Exception _)
|
||||
{
|
||||
currencyCode = null;
|
||||
}
|
||||
|
||||
/* Construct the key for the fraction digits */
|
||||
fractionDigitsKey = countryCode + ".fractionDigits";
|
||||
|
||||
/* Retrieve the fraction digits */
|
||||
fractionDigits = Integer.parseInt(properties.getProperty(fractionDigitsKey));
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor for the "XXX" special case. This allows
|
||||
* a Currency to be constructed from an assumed good
|
||||
* currency code.
|
||||
*
|
||||
* @param code the code to use.
|
||||
*/
|
||||
private Currency(String code)
|
||||
{
|
||||
currencyCode = code;
|
||||
fractionDigits = -1; /* Pseudo currency */
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the ISO4217 currency code of this currency.
|
||||
*
|
||||
* @return a <code>String</code> containing currency code.
|
||||
*/
|
||||
public String getCurrencyCode ()
|
||||
{
|
||||
return currencyCode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of digits which occur after the decimal point
|
||||
* for this particular currency. For example, currencies such
|
||||
* as the U.S. dollar, the Euro and the Great British pound have two
|
||||
* digits following the decimal point to indicate the value which exists
|
||||
* in the associated lower-valued coinage (cents in the case of the first
|
||||
* two, pennies in the latter). Some currencies such as the Japanese
|
||||
* Yen have no digits after the decimal point. In the case of pseudo
|
||||
* currencies, such as IMF Special Drawing Rights, -1 is returned.
|
||||
*
|
||||
* @return the number of digits after the decimal separator for this currency.
|
||||
*/
|
||||
public int getDefaultFractionDigits ()
|
||||
{
|
||||
return fractionDigits;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds a new currency instance for this locale.
|
||||
* All components of the given locale, other than the
|
||||
* country code, are ignored. The results of calling this
|
||||
* method may vary over time, as the currency associated with
|
||||
* a particular country changes. For countries without
|
||||
* a given currency (e.g. Antarctica), the result is null.
|
||||
*
|
||||
* @param locale a <code>Locale</code> instance.
|
||||
* @return a new <code>Currency</code> instance.
|
||||
* @throws NullPointerException if the locale or its
|
||||
* country code is null.
|
||||
* @throws IllegalArgumentException if the country of
|
||||
* the given locale is not a supported ISO3166 code.
|
||||
*/
|
||||
public static Currency getInstance (Locale locale)
|
||||
{
|
||||
/**
|
||||
* The new instance must be the only available instance
|
||||
* for the currency it supports. We ensure this happens,
|
||||
* while maintaining a suitable performance level, by
|
||||
* creating the appropriate object on the first call to
|
||||
* this method, and returning the cached instance on
|
||||
* later calls.
|
||||
*/
|
||||
Currency newCurrency;
|
||||
|
||||
/* Attempt to get the currency from the cache */
|
||||
newCurrency = (Currency) cache.get(locale);
|
||||
if (newCurrency == null)
|
||||
{
|
||||
/* Create the currency for this locale */
|
||||
newCurrency = new Currency (locale);
|
||||
/* Cache it */
|
||||
cache.put(locale, newCurrency);
|
||||
}
|
||||
/* Return the instance */
|
||||
return newCurrency;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the currency corresponding to the specified currency code.
|
||||
*
|
||||
* @param currencyCode a string representing a currency code.
|
||||
* @return a new <code>Currency</code> instance.
|
||||
* @throws NullPointerException if currencyCode is null.
|
||||
* @throws IllegalArgumentException if the supplied currency code
|
||||
* is not a supported ISO 4217 code.
|
||||
*/
|
||||
public static Currency getInstance (String currencyCode)
|
||||
{
|
||||
Locale[] allLocales = Locale.getAvailableLocales ();
|
||||
|
||||
/* Nasty special case to allow an erroneous currency... blame Sun */
|
||||
if (currencyCode.equals("XXX"))
|
||||
return new Currency("XXX");
|
||||
|
||||
for (int i = 0;i < allLocales.length; i++)
|
||||
{
|
||||
Currency testCurrency = getInstance (allLocales[i]);
|
||||
|
||||
if (testCurrency.getCurrencyCode() != null &&
|
||||
testCurrency.getCurrencyCode().equals(currencyCode))
|
||||
return testCurrency;
|
||||
}
|
||||
/*
|
||||
* If we get this far, the code is not supported by any of
|
||||
* our locales.
|
||||
*/
|
||||
throw new IllegalArgumentException("The currency code, " + currencyCode +
|
||||
", is not supported.");
|
||||
}
|
||||
|
||||
/**
|
||||
* This method returns the symbol which precedes or follows a
|
||||
* value in this particular currency. In cases where there is no
|
||||
* such symbol for the currency, the ISO 4217 currency
|
||||
* code is returned.
|
||||
*
|
||||
* @return the currency symbol, or the ISO 4217 currency code if
|
||||
* one doesn't exist.
|
||||
*/
|
||||
public String getSymbol()
|
||||
{
|
||||
try
|
||||
{
|
||||
/* What does this return if there is no mapping? */
|
||||
return res.getString ("currencySymbol");
|
||||
}
|
||||
catch (Exception _)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* This method returns the symbol which precedes or follows a
|
||||
* value in this particular currency. The returned value is
|
||||
* the symbol used to denote the currency in the specified locale.
|
||||
* </p>
|
||||
* <p>
|
||||
* For example, a supplied locale may specify a different symbol
|
||||
* for the currency, due to conflicts with its own currency.
|
||||
* This would be the case with the American currency, the dollar.
|
||||
* Locales that also use a dollar-based currency (e.g. Canada, Australia)
|
||||
* need to differentiate the American dollar using 'US$' rather than '$'.
|
||||
* So, supplying one of these locales to <code>getSymbol()</code> would
|
||||
* return this value, rather than the standard '$'.
|
||||
* </p>
|
||||
* <p>
|
||||
* In cases where there is no such symbol for a particular currency,
|
||||
* the ISO 4217 currency code is returned.
|
||||
* </p>
|
||||
*
|
||||
* @param locale the locale to express the symbol in.
|
||||
* @return the currency symbol, or the ISO 4217 currency code if
|
||||
* one doesn't exist.
|
||||
* @throws NullPointerException if the locale is null.
|
||||
*/
|
||||
public String getSymbol(Locale locale)
|
||||
{
|
||||
// TODO. The behaviour is unclear if locale != this.locale.
|
||||
// First we need to implement fully LocaleInformation*.java
|
||||
|
||||
/*
|
||||
* FIXME: My reading of how this method works has this implementation
|
||||
* as wrong. It should return a value relating to how the specified
|
||||
* locale handles the symbol for this currency. This implementation
|
||||
* seems to just do a variation of getInstance(locale).
|
||||
*/
|
||||
try
|
||||
{
|
||||
ResourceBundle localeResource =
|
||||
ResourceBundle.getBundle ("gnu.java.locale.LocaleInformation",
|
||||
locale, Currency.class.getClassLoader());
|
||||
|
||||
if (localeResource.equals(res))
|
||||
return localeResource.getString ("currencySymbol");
|
||||
else
|
||||
return localeResource.getString ("intlCurrencySymbol");
|
||||
}
|
||||
catch (Exception e1)
|
||||
{
|
||||
try
|
||||
{
|
||||
return res.getString ("intlCurrencySymbol");
|
||||
}
|
||||
catch (Exception e2)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the international ISO4217 currency code of this currency.
|
||||
*
|
||||
* @return a <code>String</code> containing the ISO4217 currency code.
|
||||
*/
|
||||
public String toString()
|
||||
{
|
||||
return getCurrencyCode();
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolves the deserialized object to the singleton instance for its
|
||||
* particular currency. The currency code of the deserialized instance
|
||||
* is used to return the correct instance.
|
||||
*
|
||||
* @return the singleton instance for the currency specified by the
|
||||
* currency code of the deserialized object. This replaces
|
||||
* the deserialized object as the returned object from
|
||||
* deserialization.
|
||||
* @throws ObjectStreamException if a problem occurs with deserializing
|
||||
* the object.
|
||||
*/
|
||||
private Object readResolve()
|
||||
throws ObjectStreamException
|
||||
{
|
||||
return getInstance(currencyCode);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user