From 9a8a9bf08572366b6dca587f4ad85a53996922a9 Mon Sep 17 00:00:00 2001 From: daney Date: Tue, 4 Mar 2008 21:46:05 +0000 Subject: * 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 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132872 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/Currency.java | 422 ---------------------------------------- 1 file changed, 422 deletions(-) delete mode 100644 libjava/java/util/Currency.java (limited to 'libjava/java/util/Currency.java') diff --git a/libjava/java/util/Currency.java b/libjava/java/util/Currency.java deleted file mode 100644 index 66888fa666b..00000000000 --- a/libjava/java/util/Currency.java +++ /dev/null @@ -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 getInstance() 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 Currency 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 Currency object - * for a particular 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 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 String 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 Locale instance. - * @return a new Currency 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 Currency 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; - } - } - - /** - *

- * 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. - *

- *

- * 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 getSymbol() would - * return this value, rather than the standard '$'. - *

- *

- * In cases where there is no such symbol for a particular currency, - * the ISO 4217 currency code is returned. - *

- * - * @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 String 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); - } - -} -- cgit v1.2.1