changeset 36116:b386aa77e834

8150434: Remove redundant "jdk_localedata" from the CLDR locale data meta info class name Reviewed-by: mchung
author naoto
date Tue, 23 Feb 2016 10:51:37 -0800
parents 0676e37a0b9c
children f3e1df22686a
files jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java jdk/src/jdk.localedata/share/classes/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java	Tue Feb 23 17:41:00 2016 +0000
+++ b/jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java	Tue Feb 23 10:51:37 2016 -0800
@@ -248,10 +248,7 @@
             dir.mkdirs();
         }
         String className =
-            (CLDRConverter.isBaseModule ? "CLDRBaseLocaleDataMetaInfo" :
-                "CLDRLocaleDataMetaInfo_" +
-                CLDRConverter.DESTINATION_DIR.substring(CLDRConverter.DESTINATION_DIR.lastIndexOf('/')+1)
-                    .replaceAll("\\.", "_"));
+            (CLDRConverter.isBaseModule ? "CLDRBaseLocaleDataMetaInfo" : "CLDRLocaleDataMetaInfo");
         File file = new File(dir, className + ".java");
         if (!file.exists()) {
             file.createNewFile();
--- a/jdk/src/jdk.localedata/share/classes/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo	Tue Feb 23 17:41:00 2016 +0000
+++ b/jdk/src/jdk.localedata/share/classes/META-INF/services/sun.util.locale.provider.LocaleDataMetaInfo	Tue Feb 23 10:51:37 2016 -0800
@@ -1,2 +1,2 @@
 sun.util.resources.provider.NonBaseLocaleDataMetaInfo
-sun.util.resources.cldr.provider.CLDRLocaleDataMetaInfo_jdk_localedata
+sun.util.resources.cldr.provider.CLDRLocaleDataMetaInfo