public inbox for java-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH] Remove classpath overrides for Calender, Currency, locale  et al.
@ 2008-03-02  2:06 David Daney
  2008-03-02 15:51 ` David Daney
  0 siblings, 1 reply; 6+ messages in thread
From: David Daney @ 2008-03-02  2:06 UTC (permalink / raw)
  To: Java Patch List

[-- Attachment #1: Type: text/plain, Size: 24777 bytes --]

This patch removes the libgcj specific classes for:
java.util.Calender,
java.util.Currency,
java.text.DateFormatSymbols
java.text.DecimalFormatSymbols
gnu/java/locale/*
   text    data     bss     dec     hex filename
37530625        9505536  479536 47515697        2d50831
native-clean/x86_64-unknown-linux-gnu/libjava/.libs/libgcj.so.9.0.0
38097834        9258400  473008 47829242        2d9d0fa
native-trunk/x86_64-unknown-linux-gnu/libjava/.libs/libgcj.so.9.0.0

The growth in text does not quite make up for the savings in data and bss.

Embedding mauve in  libjava/testsuite/libjava.mauve does not seem to
work any more, so any needed adjustments there will have to be deferred
until we fix it.

Tested on x86-pc-linux-gnu with no regressions in libjava testsuite.

Tested in mauve java.util with no regressions:
 TEST RESULTS:
-21 of 206 tests failed.  121835 total calls to harness.check() failed.
+16 of 206 tests failed.  121821 total calls to harness.check() failed.

Tested in mauve java.text with:
TEST RESULTS:
-27 of 108 tests failed.  55 total calls to harness.check() failed.
+18 of 108 tests failed.  34 total calls to harness.check() failed.

Unfortunately  there were several regressions in mauve's java.text
testsuite, but I think the overall improvement merits the change:

+  FAIL: timed out.
+TEST FAILED: timeout java.text.RuleBasedCollator.VeryBasic


+  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
check was false
+  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
check was false
+TEST FAILED: 2 of 24 checks failed java.text.SimpleDateFormat.parse

OK to commit?

2008-03-01  David Daney  <ddaney@avtrex.com>

    * scripts/makemake.tcl (properties_map): Don't exclude
    gnu/java/locale.
    * gnu/java/lang/MainThread.java (Klocale, Kcalendar): Remove.
    * 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,
    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


[-- Attachment #2: libjava-resources.diff --]
[-- Type: text/x-patch, Size: 1213 bytes --]

Index: scripts/makemake.tcl
===================================================================
--- scripts/makemake.tcl	(revision 132735)
+++ scripts/makemake.tcl	(working copy)
@@ -139,8 +139,6 @@ makearray properties_map
 
 # logging.properties is installed and is editable.
 set properties_map(java/util/logging) _
-# We haven't merged locale resources yet.
-set properties_map(gnu/java/locale) _
 
 # We want to be able to load xerces if it is on the class path.  So,
 # we have to avoid compiling in the XML-related service files.
Index: gnu/java/lang/MainThread.java
===================================================================
--- gnu/java/lang/MainThread.java	(revision 132735)
+++ gnu/java/lang/MainThread.java	(working copy)
@@ -59,8 +59,6 @@ final class MainThread extends Thread
   static final Class Kfile     = gnu.java.net.protocol.file.Handler.class;
   static final Class Khttp     = gnu.java.net.protocol.http.Handler.class;
   static final Class Kjar      = gnu.java.net.protocol.jar.Handler.class;
-  static final Class Klocale   = gnu.java.locale.LocaleInformation.class;
-  static final Class Kcalendar = gnu.java.locale.Calendar.class;
 
   // Private data.
   private Class klass;

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Remove classpath overrides for Calender, Currency, locale   et al.
  2008-03-02  2:06 [PATCH] Remove classpath overrides for Calender, Currency, locale et al David Daney
@ 2008-03-02 15:51 ` David Daney
  2008-03-02 17:32   ` Andrew John Hughes
  2008-03-03 20:45   ` David Daney
  0 siblings, 2 replies; 6+ messages in thread
From: David Daney @ 2008-03-02 15:51 UTC (permalink / raw)
  To: David Daney; +Cc: Java Patch List

David Daney wrote:
> Unfortunately  there were several regressions in mauve's java.text
> testsuite, but I think the overall improvement merits the change:
>
> +  FAIL: timed out.
> +TEST FAILED: timeout java.text.RuleBasedCollator.VeryBasic
>
>
> +  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
> check was false
> +  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
> check was false
> +TEST FAILED: 2 of 24 checks failed java.text.SimpleDateFormat.parse
>
> OK to commit?
>
> 2008-03-01  David Daney  <ddaney@avtrex.com>
>
>     * scripts/makemake.tcl (properties_map): Don't exclude
>     gnu/java/locale.
>     * gnu/java/lang/MainThread.java (Klocale, Kcalendar): Remove.
>     * sources.am: Regenerate.
>     * Makefile.in: Regenerate.
>     * classpath/lib/java/text/DecimalFormatSymbols.class,
>     classpath/lib/java/text/DateFormatSymbols.class,
>     classpath/lib/java/util/Currency.class,
>   
.
.
.

There is a problem the the locals change and the Collator, I will
prepare a new patch.

David Daney

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Remove classpath overrides for Calender, Currency, locale et al.
  2008-03-02 15:51 ` David Daney
@ 2008-03-02 17:32   ` Andrew John Hughes
  2008-03-03 20:45   ` David Daney
  1 sibling, 0 replies; 6+ messages in thread
From: Andrew John Hughes @ 2008-03-02 17:32 UTC (permalink / raw)
  To: David Daney; +Cc: Java Patch List

On 02/03/2008, David Daney <ddaney@avtrex.com> wrote:
> David Daney wrote:
>  > Unfortunately  there were several regressions in mauve's java.text
>  > testsuite, but I think the overall improvement merits the change:
>  >
>  > +  FAIL: timed out.
>  > +TEST FAILED: timeout java.text.RuleBasedCollator.VeryBasic
>  >
>  >
>  > +  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
>  > check was false
>  > +  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
>  > check was false
>  > +TEST FAILED: 2 of 24 checks failed java.text.SimpleDateFormat.parse
>  >
>  > OK to commit?
>  >
>  > 2008-03-01  David Daney  <ddaney@avtrex.com>
>  >
>  >     * scripts/makemake.tcl (properties_map): Don't exclude
>  >     gnu/java/locale.
>  >     * gnu/java/lang/MainThread.java (Klocale, Kcalendar): Remove.
>  >     * sources.am: Regenerate.
>  >     * Makefile.in: Regenerate.
>  >     * classpath/lib/java/text/DecimalFormatSymbols.class,
>  >     classpath/lib/java/text/DateFormatSymbols.class,
>  >     classpath/lib/java/util/Currency.class,
>  >
>
> .
>  .
>  .
>
>  There is a problem the the locals change and the Collator, I will
>  prepare a new patch.
>
>
>  David Daney
>
>

+1

This will allow GCJ to work closer with Classpath on locales
hopefully.  It also should solve an issue where gjar running on a
Classpath VM can't be used to build gcj, because it starts picking up
the locale files from gcj's lib directory in preference to
Classpath's.  This issue does need to be solved on Classpath, but this
removes one obvious exploit of it.

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=32486
-- 
Andrew :-)

Document Freedom Day - March 26th
http://documentfreedom.org

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Remove classpath overrides for Calender, Currency, locale   et al.
  2008-03-02 15:51 ` David Daney
  2008-03-02 17:32   ` Andrew John Hughes
@ 2008-03-03 20:45   ` David Daney
  2008-03-04 21:06     ` Tom Tromey
  1 sibling, 1 reply; 6+ messages in thread
From: David Daney @ 2008-03-03 20:45 UTC (permalink / raw)
  To: David Daney; +Cc: Java Patch List

[-- Attachment #1: Type: text/plain, Size: 26073 bytes --]

David Daney wrote:
> David Daney wrote:
>   
>> 2008-03-01  David Daney  <ddaney@avtrex.com>
>>
>>     * scripts/makemake.tcl (properties_map): Don't exclude
>>     gnu/java/locale.
>>     * gnu/java/lang/MainThread.java (Klocale, Kcalendar): Remove.
>>     * sources.am: Regenerate.
>>     * Makefile.in: Regenerate.
>>     * classpath/lib/java/text/DecimalFormatSymbols.class,
>>     classpath/lib/java/text/DateFormatSymbols.class,
>>     classpath/lib/java/util/Currency.class,
>>   
>>     
> .
> .
> .
>
> There is a problem the the locals change and the Collator, I will
> prepare a new patch.
>   
Here is the new patch.  The only change from the previous version is
that I merged code from classpath into java.text.Collator.

Tested on x86-pc-linux-gnu with no FAILures in libjava testsuite.  A
full mauve test yields:
 TEST RESULTS:
-280 of 3149 tests failed.  123221 total calls to harness.check() failed.
+261 of 3149 tests failed.  123000 total calls to harness.check() failed.

The only regressions I saw are:
   pass:  line 132: parse pattern EEEE MMMM yyyy [1]
   pass:  line 132: parse pattern yyyy-MM-dd HH:mm z [1]
   pass:  line 132: parse pattern yyyy-MM-dd HH:mm z [2]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm z [3]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm z [4]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm z [5]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm z [6]
+  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
check was false
+  pass:  line 132: java.text.ParseException:  [2]
+  pass:  line 132: java.text.ParseException:  [3]
+  pass:  line 132: java.text.ParseException:  [4]
   pass:  line 132: parse pattern yyyy-MM-dd HH:mm Z [1]
   pass:  line 132: parse pattern yyyy-MM-dd HH:mm Z [2]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm Z [3]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm Z [4]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm Z [5]
-  pass:  line 132: parse pattern yyyy-MM-dd HH:mm Z [6]
+  FAIL:  line 136: java.text.ParseException:  [1] -- boolean passed to
check was false
+  pass:  line 132: java.text.ParseException:  [2]
+  pass:  line 132: java.text.ParseException:  [3]
+  pass:  line 132: java.text.ParseException:  [4]
   pass:  line 132: parse pattern EEE MMM [1]
   pass:  line 132: parse pattern EEE MMM [2]
   pass:  line 132: parse pattern EEEE MMMM [1]
@@ -829258,17 +829289,16 @@
   pass:  line 91: Bug 13058 [1]
   pass:  line 105: Null arguments [1]
   pass:  line 116: Null arguments [2]
-TEST PASSED (24 checks) java.text.SimpleDateFormat.parse
+TEST FAILED: 2 of 24 checks failed java.text.SimpleDateFormat.parse
 
I think we should commit this and then perhaps address the
java.text.ParseException in classpath.

OK to commit?
2008-03-03  David Daney  <ddaney@avtrex.com>

    * 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






[-- Attachment #2: libjava-resources.diff --]
[-- Type: text/x-patch, Size: 2754 bytes --]

Index: scripts/makemake.tcl
===================================================================
--- scripts/makemake.tcl	(revision 132735)
+++ scripts/makemake.tcl	(working copy)
@@ -139,8 +139,6 @@ makearray properties_map
 
 # logging.properties is installed and is editable.
 set properties_map(java/util/logging) _
-# We haven't merged locale resources yet.
-set properties_map(gnu/java/locale) _
 
 # We want to be able to load xerces if it is on the class path.  So,
 # we have to avoid compiling in the XML-related service files.
Index: gnu/java/lang/MainThread.java
===================================================================
--- gnu/java/lang/MainThread.java	(revision 132735)
+++ gnu/java/lang/MainThread.java	(working copy)
@@ -1,6 +1,6 @@
 /* gnu.java.lang.MainThread
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -59,8 +59,6 @@ final class MainThread extends Thread
   static final Class Kfile     = gnu.java.net.protocol.file.Handler.class;
   static final Class Khttp     = gnu.java.net.protocol.http.Handler.class;
   static final Class Kjar      = gnu.java.net.protocol.jar.Handler.class;
-  static final Class Klocale   = gnu.java.locale.LocaleInformation.class;
-  static final Class Kcalendar = gnu.java.locale.Calendar.class;
 
   // Private data.
   private Class klass;
Index: java/text/Collator.java
===================================================================
--- java/text/Collator.java	(revision 132735)
+++ java/text/Collator.java	(working copy)
@@ -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 implement
    */
   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 implement
 	    throw (InternalError)new InternalError().initCause(x);
 	  }
       }
-    // FIXME
-    return getInstance(Locale.US);
+    return getInstance(LocaleHelper.getFallbackLocale(loc));
   }
 
   /**

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Remove classpath overrides for Calender, Currency, locale   et al.
  2008-03-03 20:45   ` David Daney
@ 2008-03-04 21:06     ` Tom Tromey
  2008-03-04 21:49       ` David Daney
  0 siblings, 1 reply; 6+ messages in thread
From: Tom Tromey @ 2008-03-04 21:06 UTC (permalink / raw)
  To: David Daney; +Cc: Java Patch List

>>>>> "David" == David Daney <ddaney@avtrex.com> writes:

David> Here is the new patch.  The only change from the previous
David> version is that I merged code from classpath into
David> java.text.Collator.

This is ok.  Nice job.  I think you will probably hold the "biggest
deletion" record for GCC -- put that on your resume :-)

David> I think we should commit this and then perhaps address the
David> java.text.ParseException in classpath.

I agree.

I'm also curious about the class loader issue... in my abandoned
attempt to do this same thing I think I had to change things so that
the locale info was found via the system class loader...?

Tom

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Remove classpath overrides for Calender, Currency, locale    et al.
  2008-03-04 21:06     ` Tom Tromey
@ 2008-03-04 21:49       ` David Daney
  0 siblings, 0 replies; 6+ messages in thread
From: David Daney @ 2008-03-04 21:49 UTC (permalink / raw)
  To: Tom Tromey; +Cc: Java Patch List

Tom Tromey wrote:
>>>>>> "David" == David Daney <ddaney@avtrex.com> writes:
> 
> David> Here is the new patch.  The only change from the previous
> David> version is that I merged code from classpath into
> David> java.text.Collator.
> 
> This is ok.  Nice job.  I think you will probably hold the "biggest
> deletion" record for GCC -- put that on your resume :-)
> 

Thanks, Committed as r132872.

> 
> I'm also curious about the class loader issue... in my abandoned
> attempt to do this same thing I think I had to change things so that
> the locale info was found via the system class loader...?
> 

I assume that loading resources from classpath is now working.  We do it 
in several places with no problems.

David Daney

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-03-04 21:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-02  2:06 [PATCH] Remove classpath overrides for Calender, Currency, locale et al David Daney
2008-03-02 15:51 ` David Daney
2008-03-02 17:32   ` Andrew John Hughes
2008-03-03 20:45   ` David Daney
2008-03-04 21:06     ` Tom Tromey
2008-03-04 21:49       ` David Daney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).