8148346: Reduce number of packages in jdk.localedata module

Reviewed-by: okutsu, alanb

jdk/make/gendata/GendataBreakIterator.gmk

@@ -1,4 +1,4 @@
-#
+
 # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -36,10 +36,11 @@
 TEXT_SRCDIR := $(JDK_TOPDIR)/src/java.base/share/classes \
     $(JDK_TOPDIR)/src/jdk.localedata/share/classes
 TEXT_PKG := sun/text/resources
+TEXT_PKG_LD := $(TEXT_PKG)/ext
 TEXT_SOURCES := $(TEXT_PKG)/BreakIteratorRules.java \
     $(TEXT_PKG)/BreakIteratorInfo.java \
-    $(TEXT_PKG)/th/BreakIteratorRules_th.java \
+    $(TEXT_PKG_LD)/BreakIteratorRules_th.java \
-    $(TEXT_PKG)/th/BreakIteratorInfo_th.java
+    $(TEXT_PKG_LD)/BreakIteratorInfo_th.java
 
 # Generate BreakIteratorData
 BREAK_ITERATOR_CLASSES := $(BUILDTOOLS_OUTPUTDIR)/break_iterator_classes
@@ -62,8 +63,8 @@ BIFILES := $(BASE_DATA_PKG_DIR)/CharacterBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/WordBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/LineBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/SentenceBreakIteratorData
-BIFILES_TH := $(LD_DATA_PKG_DIR)/th/WordBreakIteratorData_th \
+BIFILES_TH := $(LD_DATA_PKG_DIR)/WordBreakIteratorData_th \
-    $(LD_DATA_PKG_DIR)/th/LineBreakIteratorData_th
+    $(LD_DATA_PKG_DIR)/LineBreakIteratorData_th
 
 $(BIFILES): $(BASE_DATA_PKG_DIR)/_the.bifiles
 $(BASE_DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
@@ -80,7 +81,6 @@ $(BIFILES_TH): $(LD_DATA_PKG_DIR)/_the.bifiles_th
 $(LD_DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
 $(LD_DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
 	$(call LogInfo, Generating BreakIteratorData_th)
-	$(call MakeDir, $(@D)/th)
 	$(RM) $(BIFILES_TH)
 	$(TOOL_GENERATEBREAKITERATORDATA) \
 	    -o $(@D) \

jdk/make/src/classes/build/tools/cldrconverter/CLDRConverter.java

@@ -504,12 +504,22 @@ public class CLDRConverter {
      * Examine if the id includes the country (territory) code. If it does, it returns
      * the country code.
      * Otherwise, it returns null. eg. when the id is "zh_Hans_SG", it return "SG".
-     * For now, it does not return US M.49 code, e.g., '001', as those three digit numbers cannot
+     * It does NOT return UN M.49 code, e.g., '001', as those three digit numbers cannot
      * be translated into package names.
      */
     static String getCountryCode(String id) {
-        String ctry = Locale.forLanguageTag(id.replaceAll("_", "-")).getCountry();
+        String rgn = getRegionCode(id);
-        return ctry.length() == 2 ? ctry : null;
+        return rgn.length() == 2 ? rgn: null;
+    }
+
+    /**
+     * Examine if the id includes the region code. If it does, it returns
+     * the region code.
+     * Otherwise, it returns null. eg. when the id is "zh_Hans_SG", it return "SG".
+     * It DOES return UN M.49 code, e.g., '001', as well as ISO 3166 two letter country codes.
+     */
+    static String getRegionCode(String id) {
+        return Locale.forLanguageTag(id.replaceAll("_", "-")).getCountry();
     }
 
     private static class KeyComparator implements Comparator<String> {

jdk/make/src/classes/build/tools/cldrconverter/ResourceBundleGenerator.java

@@ -72,24 +72,20 @@ class ResourceBundleGenerator implements BundleGenerator {
     public void generateBundle(String packageName, String baseName, String localeID, boolean useJava,
                                Map<String, ?> map, BundleType type) throws IOException {
         String suffix = useJava ? ".java" : ".properties";
-        String lang = CLDRConverter.getLanguageCode(localeID);
-        String ctry = CLDRConverter.getCountryCode(localeID);
         String dirName = CLDRConverter.DESTINATION_DIR + File.separator + "sun" + File.separator
                 + packageName + File.separator + "resources" + File.separator + "cldr";
-        if (lang.length() > 0) {
+        packageName = packageName + ".resources.cldr";
-            if (CLDRConverter.isBaseModule ^ isBaseLocale(localeID)) {
+
-                return;
+        if (CLDRConverter.isBaseModule ^ isBaseLocale(localeID)) {
-            }
+            return;
-            dirName = dirName + File.separator + lang +
-                      (ctry != null && ctry.length() > 0 ? File.separator + ctry : "");
-            packageName = packageName + ".resources.cldr." + lang +
-                      (ctry != null && ctry.length() > 0 ? "." + ctry : "");
-        } else {
-            if (!CLDRConverter.isBaseModule) {
-                return;
-            }
-            packageName = packageName + ".resources.cldr";
         }
+
+        // Assume that non-base resources go into jdk.localedata
+        if (!CLDRConverter.isBaseModule) {
+            dirName = dirName + File.separator + "ext";
+            packageName = packageName + ".ext";
+        }
+
         File dir = new File(dirName);
         if (!dir.exists()) {
             dir.mkdirs();
@@ -338,7 +334,7 @@ class ResourceBundleGenerator implements BundleGenerator {
         Locale locale = LOCALE_BUILDER
                             .clear()
                             .setLanguage(CLDRConverter.getLanguageCode(localeID))
-                            .setRegion(CLDRConverter.getCountryCode(localeID))
+                            .setRegion(CLDRConverter.getRegionCode(localeID))
                             .build();
         return CLDRConverter.BASE_LOCALES.contains(locale);
     }

jdk/make/src/classes/build/tools/generatebreakiteratordata/BreakIteratorRBControl.java

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.generatebreakiteratordata;
-
-import java.util.Arrays;
-import java.util.ResourceBundle;
-import java.util.List;
-import java.util.Locale;
-
-class BreakIteratorRBControl extends ResourceBundle.Control {
-    static final BreakIteratorRBControl INSTANCE = new BreakIteratorRBControl();
-
-    private static final String RESOURCES = ".resources.";
-
-    private BreakIteratorRBControl() {
-    }
-
-    @Override
-    public Locale getFallbackLocale(String baseName, Locale locale) {
-        // No fallback
-        return null;
-    }
-
-    @Override
-    public List<Locale> getCandidateLocales(String baseName, Locale locale) {
-        // No parents lookup
-        return Arrays.asList(locale);
-    }
-
-    /**
-     * Changes baseName to its per-language package name and
-     * calls the super class implementation.
-     */
-    @Override
-    public String toBundleName(String baseName, Locale locale) {
-        String newBaseName = baseName;
-        String lang = locale.getLanguage();
-        if (lang.length() > 0) {
-            int index = baseName.indexOf(RESOURCES);
-            if (index > 0) {
-                index += RESOURCES.length();
-                newBaseName = baseName.substring(0, index) + lang + "."
-                                  + baseName.substring(index);
-            }
-        }
-        return super.toBundleName(newBaseName, locale);
-    }
-}

jdk/make/src/classes/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java

@@ -45,11 +45,6 @@ public class GenerateBreakIteratorData {
      */
     private static String unicodeData = "UnicodeData.txt";
 
-    /**
-     * Rules file
-     */
-    private static String rules = "sun.text.resources.BreakIteratorRules";
-
     /**
      * Locale data
      */
@@ -78,14 +73,14 @@ public class GenerateBreakIteratorData {
         String[] classNames;
         ResourceBundle rules, info;
 
-        info =  ResourceBundle.getBundle("sun.text.resources.BreakIteratorInfo",
+        String pkgName = "sun.text.resources" + (language.length() > 0 ? ".ext" : "");
-                                         new Locale(language, country, valiant),
+
-                                         BreakIteratorRBControl.INSTANCE);
+        info =  ResourceBundle.getBundle(pkgName + ".BreakIteratorInfo",
+                                         new Locale(language, country, valiant));
         classNames = info.getStringArray("BreakIteratorClasses");
 
-        rules = ResourceBundle.getBundle("sun.text.resources.BreakIteratorRules",
+        rules = ResourceBundle.getBundle(pkgName + ".BreakIteratorRules",
-                                         new Locale(language, country, valiant),
+                                         new Locale(language, country, valiant));
-                                         BreakIteratorRBControl.INSTANCE);
 
         if (info.containsKey("CharacterData")) {
             generateDataFile(info.getString("CharacterData"),

jdk/src/java.base/share/classes/sun/text/resources/FormatData_en.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en;
+package sun.text.resources;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/java.base/share/classes/sun/text/resources/FormatData_en_US.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en.US;
+package sun.text.resources;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/java.base/share/classes/sun/text/resources/JavaTimeSupplementary_en.java

@@ -65,7 +65,7 @@
 
 //  Note: this file has been generated by a tool.
 
-package sun.text.resources.en;
+package sun.text.resources;
 
 import sun.util.resources.OpenListResourceBundle;
 

jdk/src/java.base/share/classes/sun/util/resources/LocaleData.java

@@ -251,19 +251,20 @@ public class LocaleData {
         private static final String DOTCLDR      = ".cldr";
 
         /**
-         * Changes baseName to its per-language/country package name and
+         * Changes baseName to its module dependent package name and
          * calls the super class implementation. For example,
          * if the baseName is "sun.text.resources.FormatData" and locale is ja_JP,
-         * the baseName is changed to "sun.text.resources.ja.JP.FormatData". If
+         * the baseName is changed to "sun.text.resources.ext.FormatData". If
          * baseName contains "cldr", such as "sun.text.resources.cldr.FormatData",
-         * the name is changed to "sun.text.resources.cldr.ja.JP.FormatData".
+         * the name is changed to "sun.text.resources.cldr.ext.FormatData".
          */
         @Override
         public String toBundleName(String baseName, Locale locale) {
             String newBaseName = baseName;
             String lang = locale.getLanguage();
             String ctry = locale.getCountry();
-            if (lang.length() > 0) {
+            if (lang.length() > 0 &&
+                (lang != "en" || (ctry.length() > 0 && ctry != "US"))) {
                 if (baseName.startsWith(JRE.getUtilResourcesPackage())
                         || baseName.startsWith(JRE.getTextResourcesPackage())) {
                     // Assume the lengths are the same.
@@ -273,9 +274,8 @@ public class LocaleData {
                     if (baseName.indexOf(DOTCLDR, index) > 0) {
                         index += DOTCLDR.length();
                     }
-                    ctry = (ctry.length() == 2) ? ("." + ctry) : "";
+                    newBaseName = baseName.substring(0, index + 1) + "ext" +
-                    newBaseName = baseName.substring(0, index + 1) + lang + ctry
+                                      baseName.substring(index);
-                                      + baseName.substring(index);
                 }
             }
             return super.toBundleName(newBaseName, locale);

jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames_en.java

@@ -39,7 +39,7 @@
  *
  */
 
-package sun.util.resources.en;
+package sun.util.resources;
 
 import sun.util.resources.TimeZoneNamesBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorInfo_th.java

@@ -42,7 +42,7 @@
  * will not be liable for any third party claims against you.
  */
 
-package sun.text.resources.th;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 
@@ -61,12 +61,12 @@ public class BreakIteratorInfo_th extends ListResourceBundle {
             },
 
             // Data filename for each break-iterator
-            {"WordData", "th/WordBreakIteratorData_th"},
+            {"WordData", "WordBreakIteratorData_th"},
-            {"LineData", "th/LineBreakIteratorData_th"},
+            {"LineData", "LineBreakIteratorData_th"},
 
             // Dictionary filename for each dictionary-based break-iterator
-            {"WordDictionary", "th/thai_dict"},
+            {"WordDictionary", "thai_dict"},
-            {"LineDictionary", "th/thai_dict"},
+            {"LineDictionary", "thai_dict"},
         };
     }
 }

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/BreakIteratorRules_th.java

@@ -36,7 +36,7 @@
  * are used on runtime instead.
  */
 
-package sun.text.resources.th;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 import java.util.MissingResourceException;

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ar.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.ar;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_be.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.be;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_bg.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.bg;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ca.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.ca;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_cs.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.cs;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_da.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.da;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_el.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.el;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_es.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.es;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_et.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.et;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fi.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.fi;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_fr.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.fr;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hi.java

@@ -32,7 +32,7 @@
  *
  */
 
-package sun.text.resources.hi;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hr.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.hr;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_hu.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.hu;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_is.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.is;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_iw.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.iw;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ja.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.ja;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ko.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.ko;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lt.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.lt;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_lv.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.lv;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_mk.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.mk;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_no.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.no;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_pl.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.pl;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ro.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.ro;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_ru.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.ru;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sk.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.sk;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sl.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.sl;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sq.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.sq;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.sr;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sr_Latn.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.sr;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_sv.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.sv;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_th.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.th;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_tr.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.tr;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_uk.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.uk;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_vi.java

@@ -43,7 +43,7 @@
  * http://oss.software.ibm.com/cvs/icu/icu/source/data/locales/vi.txt?rev=1.38
  */
 
-package sun.text.resources.vi;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.zh;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_HK.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.zh.HK;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/CollationData_zh_TW.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.zh.TW;
+package sun.text.resources.ext;
 
 import java.util.ListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.ar;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_JO.java

@@ -40,7 +40,7 @@
  *
  */
 
-package sun.text.resources.ar.JO;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_LB.java

@@ -40,7 +40,7 @@
  *
  */
 
-package sun.text.resources.ar.LB;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ar_SY.java

@@ -40,7 +40,7 @@
  *
  */
 
-package sun.text.resources.ar.SY;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.be;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_be_BY.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.be.BY;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.bg;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_bg_BG.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.bg.BG;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.ca;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_ca_ES.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.ca.ES;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.cs;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_cs_CZ.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.cs.CZ;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.da;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_da_DK.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.da.DK;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.de;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_AT.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.de.AT;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_CH.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.de.CH;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_DE.java

@@ -41,7 +41,7 @@
  *
  */
 
-package sun.text.resources.de.DE;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_de_LU.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.de.LU;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el.java

@@ -77,7 +77,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.el;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_CY.java

@@ -59,7 +59,7 @@
  * authorization of the copyright holder.
  */
 
-package sun.text.resources.el.CY;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_el_GR.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.el.GR;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_AU.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en.AU;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_CA.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en.CA;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_GB.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en.GB;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IE.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en.IE;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_IN.java

@@ -29,7 +29,7 @@
  *
  */
 
-package sun.text.resources.en.IN;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_MT.java

@@ -59,7 +59,7 @@
  * authorization of the copyright holder.
  */
 
-package sun.text.resources.en.MT;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_NZ.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en.NZ;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_PH.java

@@ -59,7 +59,7 @@
  * authorization of the copyright holder.
  */
 
-package sun.text.resources.en.PH;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_SG.java

@@ -59,7 +59,7 @@
  * authorization of the copyright holder.
  */
 
-package sun.text.resources.en.SG;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_en_ZA.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.en.ZA;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es.java

@@ -74,7 +74,7 @@
  * of the copyright holder.
  */
 
-package sun.text.resources.es;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_AR.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.AR;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_BO.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.BO;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CL.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.CL;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CO.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.CO;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_CR.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.CR;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_DO.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.DO;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_EC.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.EC;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_ES.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.ES;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_GT.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.GT;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_HN.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.HN;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_MX.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.MX;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_NI.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.NI;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PA.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.PA;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;
 

jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/FormatData_es_PE.java

@@ -38,7 +38,7 @@
  *
  */
 
-package sun.text.resources.es.PE;
+package sun.text.resources.ext;
 
 import sun.util.resources.ParallelListResourceBundle;