make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
author rgoel
Mon, 30 Oct 2017 12:16:37 +0530
changeset 47473 5d798d729fec
parent 47216 71c04702a3d5
child 48251 57148c79bd75
permissions -rw-r--r--
8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR Reviewed-by: naoto
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     1
/*
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
     2
 * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     4
 *
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    10
 *
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    15
 * accompanied this code).
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    16
 *
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    20
 *
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    23
 * questions.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    24
 */
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    25
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    26
package build.tools.cldrconverter;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    27
32510
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
    28
import static build.tools.cldrconverter.Bundle.jreTimeZoneNames;
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
    29
import build.tools.cldrconverter.BundleGenerator.BundleType;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    30
import java.io.File;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    31
import java.nio.file.DirectoryStream;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    32
import java.nio.file.FileSystems;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    33
import java.nio.file.Files;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    34
import java.nio.file.Path;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    35
import java.util.*;
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    36
import java.util.ResourceBundle.Control;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    37
import java.util.logging.Level;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    38
import java.util.logging.Logger;
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
    39
import java.util.stream.Collectors;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    40
import javax.xml.parsers.SAXParser;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    41
import javax.xml.parsers.SAXParserFactory;
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
    42
import org.xml.sax.SAXNotRecognizedException;
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
    43
import org.xml.sax.SAXNotSupportedException;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    44
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    45
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    46
/**
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    47
 * Converts locale data from "Locale Data Markup Language" format to
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    48
 * JRE resource bundle format. LDML is the format used by the Common
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    49
 * Locale Data Repository maintained by the Unicode Consortium.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    50
 */
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    51
public class CLDRConverter {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    52
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    53
    static final String LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldml.dtd";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    54
    static final String SPPL_LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldmlSupplemental.dtd";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    55
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    56
    private static String CLDR_BASE = "../CLDR/21.0.1/";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    57
    static String LOCAL_LDML_DTD;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    58
    static String LOCAL_SPPL_LDML_DTD;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    59
    private static String SOURCE_FILE_DIR;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    60
    private static String SPPL_SOURCE_FILE;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    61
    private static String NUMBERING_SOURCE_FILE;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    62
    private static String METAZONES_SOURCE_FILE;
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
    63
    private static String LIKELYSUBTAGS_SOURCE_FILE;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    64
    static String DESTINATION_DIR = "build/gensrc";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    65
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    66
    static final String LOCALE_NAME_PREFIX = "locale.displayname.";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    67
    static final String CURRENCY_SYMBOL_PREFIX = "currency.symbol.";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    68
    static final String CURRENCY_NAME_PREFIX = "currency.displayname.";
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
    69
    static final String CALENDAR_NAME_PREFIX = "calendarname.";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    70
    static final String TIMEZONE_ID_PREFIX = "timezone.id.";
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
    71
    static final String ZONE_NAME_PREFIX = "timezone.displayname.";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    72
    static final String METAZONE_ID_PREFIX = "metazone.id.";
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    73
    static final String PARENT_LOCALE_PREFIX = "parentLocale.";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    74
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    75
    private static SupplementDataParseHandler handlerSuppl;
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
    76
    private static LikelySubtagsParseHandler handlerLikelySubtags;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    77
    static NumberingSystemsParseHandler handlerNumbering;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    78
    static MetaZonesParseHandler handlerMetaZones;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    79
    private static BundleGenerator bundleGenerator;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    80
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    81
    // java.base module related
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    82
    static boolean isBaseModule = false;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    83
    static final Set<Locale> BASE_LOCALES = new HashSet<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    84
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    85
    // "parentLocales" map
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    86
    private static final Map<String, SortedSet<String>> parentLocalesMap = new HashMap<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    87
    private static final ResourceBundle.Control defCon =
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    88
        ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    89
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    90
    static enum DraftType {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    91
        UNCONFIRMED,
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    92
        PROVISIONAL,
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    93
        CONTRIBUTED,
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    94
        APPROVED;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    95
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    96
        private static final Map<String, DraftType> map = new HashMap<>();
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    97
        static {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    98
            for (DraftType dt : values()) {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
    99
                map.put(dt.getKeyword(), dt);
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   100
            }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   101
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   102
        static private DraftType defaultType = CONTRIBUTED;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   103
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   104
        private final String keyword;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   105
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   106
        private DraftType() {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   107
            keyword = this.name().toLowerCase(Locale.ROOT);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   108
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   109
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   110
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   111
        static DraftType forKeyword(String keyword) {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   112
            return map.get(keyword);
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   113
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   114
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   115
        static DraftType getDefault() {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   116
            return defaultType;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   117
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   118
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   119
        static void setDefault(String keyword) {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   120
            defaultType = Objects.requireNonNull(forKeyword(keyword));
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   121
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   122
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   123
        String getKeyword() {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   124
            return keyword;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   125
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   126
    }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   127
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   128
    static boolean USE_UTF8 = false;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   129
    private static boolean verbose;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   130
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   131
    private CLDRConverter() {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   132
       // no instantiation
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   133
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   134
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   135
    @SuppressWarnings("AssignmentToForLoopParameter")
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   136
    public static void main(String[] args) throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   137
        if (args.length != 0) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   138
            String currentArg = null;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   139
            try {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   140
                for (int i = 0; i < args.length; i++) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   141
                    currentArg = args[i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   142
                    switch (currentArg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   143
                    case "-draft":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   144
                        String draftDataType = args[++i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   145
                        try {
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   146
                            DraftType.setDefault(draftDataType);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   147
                        } catch (NullPointerException e) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   148
                            severe("Error: incorrect draft value: %s%n", draftDataType);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   149
                            System.exit(1);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   150
                        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   151
                        info("Using the specified data type: %s%n", draftDataType);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   152
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   153
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   154
                    case "-base":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   155
                        // base directory for input files
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   156
                        CLDR_BASE = args[++i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   157
                        if (!CLDR_BASE.endsWith("/")) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   158
                            CLDR_BASE += "/";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   159
                        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   160
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   161
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   162
                    case "-baselocales":
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   163
                        // base locales
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   164
                        setupBaseLocales(args[++i]);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   165
                        break;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   166
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   167
                    case "-basemodule":
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   168
                        // indicates java.base module resource generation
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   169
                        isBaseModule = true;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   170
                        break;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   171
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   172
                    case "-o":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   173
                        // output directory
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   174
                        DESTINATION_DIR = args[++i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   175
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   176
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   177
                    case "-utf8":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   178
                        USE_UTF8 = true;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   179
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   180
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   181
                    case "-verbose":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   182
                        verbose = true;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   183
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   184
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   185
                    case "-help":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   186
                        usage();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   187
                        System.exit(0);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   188
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   189
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   190
                    default:
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   191
                        throw new RuntimeException();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   192
                    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   193
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   194
            } catch (RuntimeException e) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   195
                severe("unknown or imcomplete arg(s): " + currentArg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   196
                usage();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   197
                System.exit(1);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   198
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   199
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   200
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   201
        // Set up path names
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   202
        LOCAL_LDML_DTD = CLDR_BASE + "/dtd/ldml.dtd";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   203
        LOCAL_SPPL_LDML_DTD = CLDR_BASE + "/dtd/ldmlSupplemental.dtd";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   204
        SOURCE_FILE_DIR = CLDR_BASE + "/main";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   205
        SPPL_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalData.xml";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   206
        LIKELYSUBTAGS_SOURCE_FILE = CLDR_BASE + "/supplemental/likelySubtags.xml";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   207
        NUMBERING_SOURCE_FILE = CLDR_BASE + "/supplemental/numberingSystems.xml";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   208
        METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   209
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   210
        if (BASE_LOCALES.isEmpty()) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   211
            setupBaseLocales("en-US");
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   212
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   213
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   214
        bundleGenerator = new ResourceBundleGenerator();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   215
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   216
        // Parse data independent of locales
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   217
        parseSupplemental();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   218
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   219
        List<Bundle> bundles = readBundleList();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   220
        convertBundles(bundles);
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   221
        convertBundles(addedBundles);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   222
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   223
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   224
    private static void usage() {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   225
        errout("Usage: java CLDRConverter [options]%n"
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   226
                + "\t-help          output this usage message and exit%n"
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   227
                + "\t-verbose       output information%n"
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   228
                + "\t-draft [contributed | approved | provisional | unconfirmed]%n"
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   229
                + "\t\t       draft level for using data (default: contributed)%n"
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   230
                + "\t-base dir      base directory for CLDR input files%n"
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   231
                + "\t-basemodule    generates bundles that go into java.base module%n"
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   232
                + "\t-baselocales loc(,loc)*      locales that go into the base module%n"
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   233
                + "\t-o dir         output directory (default: ./build/gensrc)%n"
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   234
                + "\t-o dir         output directory (defaut: ./build/gensrc)%n"
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   235
                + "\t-utf8          use UTF-8 rather than \\uxxxx (for debug)%n");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   236
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   237
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   238
    static void info(String fmt, Object... args) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   239
        if (verbose) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   240
            System.out.printf(fmt, args);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   241
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   242
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   243
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   244
    static void info(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   245
        if (verbose) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   246
            System.out.println(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   247
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   248
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   249
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   250
    static void warning(String fmt, Object... args) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   251
        System.err.print("Warning: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   252
        System.err.printf(fmt, args);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   253
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   254
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   255
    static void warning(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   256
        System.err.print("Warning: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   257
        errout(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   258
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   259
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   260
    static void severe(String fmt, Object... args) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   261
        System.err.print("Error: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   262
        System.err.printf(fmt, args);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   263
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   264
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   265
    static void severe(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   266
        System.err.print("Error: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   267
        errout(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   268
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   269
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   270
    private static void errout(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   271
        if (msg.contains("%n")) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   272
            System.err.printf(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   273
        } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   274
            System.err.println(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   275
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   276
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   277
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   278
    /**
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   279
     * Configure the parser to allow access to DTDs on the file system.
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   280
     */
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   281
    private static void enableFileAccess(SAXParser parser) throws SAXNotSupportedException {
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   282
        try {
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   283
            parser.setProperty("http://javax.xml.XMLConstants/property/accessExternalDTD", "file");
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   284
        } catch (SAXNotRecognizedException ignore) {
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   285
            // property requires >= JAXP 1.5
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   286
        }
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   287
    }
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   288
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   289
    private static List<Bundle> readBundleList() throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   290
        List<Bundle> retList = new ArrayList<>();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   291
        Path path = FileSystems.getDefault().getPath(SOURCE_FILE_DIR);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   292
        try (DirectoryStream<Path> dirStr = Files.newDirectoryStream(path)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   293
            for (Path entry : dirStr) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   294
                String fileName = entry.getFileName().toString();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   295
                if (fileName.endsWith(".xml")) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   296
                    String id = fileName.substring(0, fileName.indexOf('.'));
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   297
                    Locale cldrLoc = Locale.forLanguageTag(toLanguageTag(id));
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   298
                    StringBuilder sb = getCandLocales(cldrLoc);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   299
                    if (sb.indexOf("root") == -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   300
                        sb.append("root");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   301
                    }
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   302
                    Bundle b = new Bundle(id, sb.toString(), null, null);
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   303
                    // Insert the bundle for root at the top so that it will get
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   304
                    // processed first.
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   305
                    if ("root".equals(id)) {
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   306
                        retList.add(0, b);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   307
                    } else {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   308
                        retList.add(b);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   309
                    }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   310
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   311
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   312
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   313
        return retList;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   314
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   315
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   316
    private static final Map<String, Map<String, Object>> cldrBundles = new HashMap<>();
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   317
    // this list will contain additional bundles to be generated for Region dependent Data.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   318
    private static List<Bundle> addedBundles = new ArrayList<>();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   319
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   320
    private static Map<String, SortedSet<String>> metaInfo = new HashMap<>();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   321
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   322
    static {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   323
        // For generating information on supported locales.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   324
        metaInfo.put("LocaleNames", new TreeSet<>());
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   325
        metaInfo.put("CurrencyNames", new TreeSet<>());
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   326
        metaInfo.put("TimeZoneNames", new TreeSet<>());
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   327
        metaInfo.put("CalendarData", new TreeSet<>());
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   328
        metaInfo.put("FormatData", new TreeSet<>());
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   329
        metaInfo.put("AvailableLocales", new TreeSet<>());
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   330
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   331
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   332
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   333
    private static Set<String> calendarDataFields = Set.of("firstDayOfWeek", "minimalDaysInFirstWeek");
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   334
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   335
    static Map<String, Object> getCLDRBundle(String id) throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   336
        Map<String, Object> bundle = cldrBundles.get(id);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   337
        if (bundle != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   338
            return bundle;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   339
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   340
        SAXParserFactory factory = SAXParserFactory.newInstance();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   341
        factory.setValidating(true);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   342
        SAXParser parser = factory.newSAXParser();
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   343
        enableFileAccess(parser);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   344
        LDMLParseHandler handler = new LDMLParseHandler(id);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   345
        File file = new File(SOURCE_FILE_DIR + File.separator + id + ".xml");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   346
        if (!file.exists()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   347
            // Skip if the file doesn't exist.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   348
            return Collections.emptyMap();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   349
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   350
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   351
        info("..... main directory .....");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   352
        info("Reading file " + file);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   353
        parser.parse(file, handler);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   354
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   355
        bundle = handler.getData();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   356
        cldrBundles.put(id, bundle);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   357
        String country = getCountryCode(id);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   358
        if (country != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   359
            bundle = handlerSuppl.getData(country);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   360
            if (bundle != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   361
                //merge two maps into one map
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   362
                Map<String, Object> temp = cldrBundles.remove(id);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   363
                bundle.putAll(temp);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   364
                cldrBundles.put(id, bundle);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   365
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   366
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   367
        return bundle;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   368
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   369
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   370
    // Parsers for data in "supplemental" directory
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   371
    //
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   372
    private static void parseSupplemental() throws Exception {
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   373
        // Parse SupplementalData file and store the information in the HashMap
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   374
        // Calendar information such as firstDay and minDay are stored in
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   375
        // supplementalData.xml as of CLDR1.4. Individual territory is listed
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   376
        // with its ISO 3166 country code while default is listed using UNM49
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   377
        // region and composition numerical code (001 for World.)
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   378
        //
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   379
        // SupplementalData file also provides the "parent" locales which
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   380
        // are othrwise not to be fallen back. Process them here as well.
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   381
        //
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   382
        info("..... Parsing supplementalData.xml .....");
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   383
        SAXParserFactory factorySuppl = SAXParserFactory.newInstance();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   384
        factorySuppl.setValidating(true);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   385
        SAXParser parserSuppl = factorySuppl.newSAXParser();
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   386
        enableFileAccess(parserSuppl);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   387
        handlerSuppl = new SupplementDataParseHandler();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   388
        File fileSupply = new File(SPPL_SOURCE_FILE);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   389
        parserSuppl.parse(fileSupply, handlerSuppl);
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   390
        Map<String, Object> parentData = handlerSuppl.getData("root");
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   391
        parentData.keySet().forEach(key -> {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   392
                parentLocalesMap.put(key, new TreeSet(
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   393
                    Arrays.asList(((String)parentData.get(key)).split(" "))));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   394
            });
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   395
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   396
        // Parse numberingSystems to get digit zero character information.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   397
        SAXParserFactory numberingParser = SAXParserFactory.newInstance();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   398
        numberingParser.setValidating(true);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   399
        SAXParser parserNumbering = numberingParser.newSAXParser();
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   400
        enableFileAccess(parserNumbering);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   401
        handlerNumbering = new NumberingSystemsParseHandler();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   402
        File fileNumbering = new File(NUMBERING_SOURCE_FILE);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   403
        parserNumbering.parse(fileNumbering, handlerNumbering);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   404
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   405
        // Parse metaZones to create mappings between Olson tzids and CLDR meta zone names
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   406
        info("..... Parsing metaZones.xml .....");
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   407
        SAXParserFactory metazonesParser = SAXParserFactory.newInstance();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   408
        metazonesParser.setValidating(true);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   409
        SAXParser parserMetaZones = metazonesParser.newSAXParser();
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   410
        enableFileAccess(parserMetaZones);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   411
        handlerMetaZones = new MetaZonesParseHandler();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   412
        File fileMetaZones = new File(METAZONES_SOURCE_FILE);
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   413
        parserMetaZones.parse(fileMetaZones, handlerMetaZones);
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   414
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   415
        // Parse likelySubtags
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   416
        info("..... Parsing likelySubtags.xml .....");
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   417
        SAXParserFactory likelySubtagsParser = SAXParserFactory.newInstance();
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   418
        likelySubtagsParser.setValidating(true);
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   419
        SAXParser parserLikelySubtags = likelySubtagsParser.newSAXParser();
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   420
        enableFileAccess(parserLikelySubtags);
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   421
        handlerLikelySubtags = new LikelySubtagsParseHandler();
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   422
        File fileLikelySubtags = new File(LIKELYSUBTAGS_SOURCE_FILE);
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   423
        parserLikelySubtags.parse(fileLikelySubtags, handlerLikelySubtags);
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   424
    }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   425
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   426
    /**
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   427
     * This method will check if a new region dependent Bundle needs to be
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   428
     * generated for this Locale id and targetMap. New Bundle will be generated
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   429
     * when Locale id has non empty script and country code and targetMap
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   430
     * contains region dependent data. This method will also remove region
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   431
     * dependent data from this targetMap after candidate locales check. E.g. It
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   432
     * will call genRegionDependentBundle() in case of az_Latn_AZ locale and
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   433
     * remove region dependent data from this targetMap so that az_Latn_AZ
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   434
     * bundle will not be created. For az_Cyrl_AZ, new Bundle will be generated
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   435
     * but region dependent data will not be removed from targetMap as its candidate
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   436
     * locales are [az_Cyrl_AZ, az_Cyrl, root], which does not include az_AZ for
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   437
     * fallback.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   438
     *
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   439
     */
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   440
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   441
    private static void checkRegionDependentBundle(Map<String, Object> targetMap, String id) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   442
        if ((CLDRConverter.getScript(id) != "")
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   443
                && (CLDRConverter.getCountryCode(id) != "")) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   444
            Map<String, Object> regionDepDataMap = targetMap
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   445
                    .keySet()
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   446
                    .stream()
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   447
                    .filter(calendarDataFields::contains)
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   448
                    .collect(Collectors.toMap(k -> k, targetMap::get));
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   449
            if (!regionDepDataMap.isEmpty()) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   450
                Locale cldrLoc = new Locale(CLDRConverter.getLanguageCode(id),
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   451
                                            CLDRConverter.getCountryCode(id));
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   452
                genRegionDependentBundle(regionDepDataMap, cldrLoc);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   453
                if (checkCandidateLocales(id, cldrLoc)) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   454
                    // Remove matchedKeys from this targetMap only if checkCandidateLocales() returns true.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   455
                    regionDepDataMap.keySet().forEach(targetMap::remove);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   456
                }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   457
            }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   458
        }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   459
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   460
    /**
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   461
     * This method will generate a new Bundle for region dependent data,
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   462
     * minimalDaysInFirstWeek and firstDayOfWeek. Newly generated Bundle will be added
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   463
     * to addedBundles list.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   464
     */
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   465
    private static void genRegionDependentBundle(Map<String, Object> targetMap, Locale cldrLoc) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   466
        String localeId = cldrLoc.toString();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   467
        StringBuilder sb = getCandLocales(cldrLoc);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   468
        if (sb.indexOf(localeId) == -1) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   469
            sb.append(localeId);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   470
        }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   471
        Bundle bundle = new Bundle(localeId, sb.toString(), null, null);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   472
        cldrBundles.put(localeId, targetMap);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   473
        addedBundles.add(bundle);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   474
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   475
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   476
    private static StringBuilder getCandLocales(Locale cldrLoc) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   477
        List<Locale> candList = getCandidateLocales(cldrLoc);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   478
        StringBuilder sb = new StringBuilder();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   479
        for (Locale loc : candList) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   480
            if (!loc.equals(Locale.ROOT)) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   481
                sb.append(toLocaleName(loc.toLanguageTag()));
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   482
                sb.append(",");
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   483
            }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   484
        }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   485
        return sb;
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   486
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   487
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   488
    private static List<Locale> getCandidateLocales(Locale cldrLoc) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   489
        List<Locale> candList = new ArrayList<>();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   490
        candList = applyParentLocales("", defCon.getCandidateLocales("",  cldrLoc));
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   491
        return candList;
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   492
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   493
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   494
    /**
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   495
     * This method will return true, if for a given locale, its language and
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   496
     * country specific locale will exist in runtime lookup path. E.g. it will
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   497
     * return true for bs_Latn_BA.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   498
     */
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   499
    private static boolean checkCandidateLocales(String id, Locale cldrLoc) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   500
        return(getCandidateLocales(Locale.forLanguageTag(id.replaceAll("_", "-")))
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   501
                .contains(cldrLoc));
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   502
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   503
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   504
    private static void convertBundles(List<Bundle> bundles) throws Exception {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   505
        // parent locales map. The mappings are put in base metaInfo file
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   506
        // for now.
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   507
        if (isBaseModule) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   508
            metaInfo.putAll(parentLocalesMap);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   509
        }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   510
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   511
        for (Bundle bundle : bundles) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   512
            // Get the target map, which contains all the data that should be
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   513
            // visible for the bundle's locale
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   514
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   515
            Map<String, Object> targetMap = bundle.getTargetMap();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   516
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   517
            // check if new region DependentBundle needs to be generated for this Locale.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   518
            checkRegionDependentBundle(targetMap, bundle.getID());
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   519
            EnumSet<Bundle.Type> bundleTypes = bundle.getBundleTypes();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   520
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   521
            if (bundle.isRoot()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   522
                // Add DateTimePatternChars because CLDR no longer supports localized patterns.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   523
                targetMap.put("DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   524
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   525
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   526
            // Now the map contains just the entries that need to be in the resources bundles.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   527
            // Go ahead and generate them.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   528
            if (bundleTypes.contains(Bundle.Type.LOCALENAMES)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   529
                Map<String, Object> localeNamesMap = extractLocaleNames(targetMap, bundle.getID());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   530
                if (!localeNamesMap.isEmpty() || bundle.isRoot()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   531
                    metaInfo.get("LocaleNames").add(toLanguageTag(bundle.getID()));
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   532
                    addLikelySubtags(metaInfo, "LocaleNames", bundle.getID());
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   533
                    bundleGenerator.generateBundle("util", "LocaleNames", bundle.getJavaID(), true, localeNamesMap, BundleType.OPEN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   534
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   535
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   536
            if (bundleTypes.contains(Bundle.Type.CURRENCYNAMES)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   537
                Map<String, Object> currencyNamesMap = extractCurrencyNames(targetMap, bundle.getID(), bundle.getCurrencies());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   538
                if (!currencyNamesMap.isEmpty() || bundle.isRoot()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   539
                    metaInfo.get("CurrencyNames").add(toLanguageTag(bundle.getID()));
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   540
                    addLikelySubtags(metaInfo, "CurrencyNames", bundle.getID());
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   541
                    bundleGenerator.generateBundle("util", "CurrencyNames", bundle.getJavaID(), true, currencyNamesMap, BundleType.OPEN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   542
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   543
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   544
            if (bundleTypes.contains(Bundle.Type.TIMEZONENAMES)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   545
                Map<String, Object> zoneNamesMap = extractZoneNames(targetMap, bundle.getID());
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   546
                if (!zoneNamesMap.isEmpty() || bundle.isRoot()) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   547
                    metaInfo.get("TimeZoneNames").add(toLanguageTag(bundle.getID()));
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   548
                    addLikelySubtags(metaInfo, "TimeZoneNames", bundle.getID());
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   549
                    bundleGenerator.generateBundle("util", "TimeZoneNames", bundle.getJavaID(), true, zoneNamesMap, BundleType.TIMEZONE);
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   550
                }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   551
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   552
            if (bundleTypes.contains(Bundle.Type.CALENDARDATA)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   553
                Map<String, Object> calendarDataMap = extractCalendarData(targetMap, bundle.getID());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   554
                if (!calendarDataMap.isEmpty() || bundle.isRoot()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   555
                    metaInfo.get("CalendarData").add(toLanguageTag(bundle.getID()));
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   556
                    addLikelySubtags(metaInfo, "CalendarData", bundle.getID());
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   557
                    bundleGenerator.generateBundle("util", "CalendarData", bundle.getJavaID(), true, calendarDataMap, BundleType.PLAIN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   558
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   559
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   560
            if (bundleTypes.contains(Bundle.Type.FORMATDATA)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   561
                Map<String, Object> formatDataMap = extractFormatData(targetMap, bundle.getID());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   562
                if (!formatDataMap.isEmpty() || bundle.isRoot()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   563
                    metaInfo.get("FormatData").add(toLanguageTag(bundle.getID()));
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   564
                    addLikelySubtags(metaInfo, "FormatData", bundle.getID());
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   565
                    bundleGenerator.generateBundle("text", "FormatData", bundle.getJavaID(), true, formatDataMap, BundleType.PLAIN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   566
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   567
            }
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   568
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   569
            // For AvailableLocales
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   570
            metaInfo.get("AvailableLocales").add(toLanguageTag(bundle.getID()));
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   571
            addLikelySubtags(metaInfo, "AvailableLocales", bundle.getID());
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   572
        }
42930
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   573
        addCldrImplicitLocales(metaInfo);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   574
        bundleGenerator.generateMetaInfo(metaInfo);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   575
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   576
42930
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   577
    /**
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   578
     * These are the Locales that are implicitly supported by CLDR.
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   579
     * Adding them explicitly as likelySubtags here, will ensure that
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   580
     * COMPAT locales do not precede them during ResourceBundle search path.
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   581
     */
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   582
    private static void addCldrImplicitLocales(Map<String, SortedSet<String>> metaInfo) {
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   583
        metaInfo.get("LocaleNames").add("zh-Hans-CN");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   584
        metaInfo.get("LocaleNames").add("zh-Hans-SG");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   585
        metaInfo.get("LocaleNames").add("zh-Hant-HK");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   586
        metaInfo.get("LocaleNames").add("zh-Hant-MO");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   587
        metaInfo.get("LocaleNames").add("zh-Hant-TW");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   588
        metaInfo.get("CurrencyNames").add("zh-Hans-CN");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   589
        metaInfo.get("CurrencyNames").add("zh-Hans-SG");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   590
        metaInfo.get("CurrencyNames").add("zh-Hant-HK");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   591
        metaInfo.get("CurrencyNames").add("zh-Hant-MO");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   592
        metaInfo.get("CurrencyNames").add("zh-Hant-TW");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   593
        metaInfo.get("TimeZoneNames").add("zh-Hans-CN");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   594
        metaInfo.get("TimeZoneNames").add("zh-Hans-SG");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   595
        metaInfo.get("TimeZoneNames").add("zh-Hant-HK");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   596
        metaInfo.get("TimeZoneNames").add("zh-Hant-MO");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   597
        metaInfo.get("TimeZoneNames").add("zh-Hant-TW");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   598
        metaInfo.get("TimeZoneNames").add("zh-HK");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   599
        metaInfo.get("CalendarData").add("zh-Hans-CN");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   600
        metaInfo.get("CalendarData").add("zh-Hans-SG");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   601
        metaInfo.get("CalendarData").add("zh-Hant-HK");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   602
        metaInfo.get("CalendarData").add("zh-Hant-MO");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   603
        metaInfo.get("CalendarData").add("zh-Hant-TW");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   604
        metaInfo.get("FormatData").add("zh-Hans-CN");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   605
        metaInfo.get("FormatData").add("zh-Hans-SG");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   606
        metaInfo.get("FormatData").add("zh-Hant-HK");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   607
        metaInfo.get("FormatData").add("zh-Hant-MO");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   608
        metaInfo.get("FormatData").add("zh-Hant-TW");
b878b7b2788e 8167143: CLDR timezone parsing does not work for all locales
rgoel
parents: 39644
diff changeset
   609
    }
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   610
    static final Map<String, String> aliases = new HashMap<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   611
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   612
    /**
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   613
     * Translate the aliases into the real entries in the bundle map.
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   614
     */
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   615
    static void handleAliases(Map<String, Object> bundleMap) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   616
        Set bundleKeys = bundleMap.keySet();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   617
        try {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   618
            for (String key : aliases.keySet()) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   619
                String targetKey = aliases.get(key);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   620
                if (bundleKeys.contains(targetKey)) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   621
                    bundleMap.putIfAbsent(key, bundleMap.get(targetKey));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   622
                }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   623
            }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   624
        } catch (Exception ex) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   625
            Logger.getLogger(CLDRConverter.class.getName()).log(Level.SEVERE, null, ex);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   626
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   627
    }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   628
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   629
    /*
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   630
     * Returns the language portion of the given id.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   631
     * If id is "root", "" is returned.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   632
     */
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   633
    static String getLanguageCode(String id) {
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   634
        return "root".equals(id) ? "" : Locale.forLanguageTag(id.replaceAll("_", "-")).getLanguage();
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   635
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   636
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   637
    /**
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   638
     * Examine if the id includes the country (territory) code. If it does, it returns
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   639
     * the country code.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   640
     * Otherwise, it returns null. eg. when the id is "zh_Hans_SG", it return "SG".
36014
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   641
     * It does NOT return UN M.49 code, e.g., '001', as those three digit numbers cannot
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   642
     * be translated into package names.
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   643
     */
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   644
    static String getCountryCode(String id) {
36014
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   645
        String rgn = getRegionCode(id);
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   646
        return rgn.length() == 2 ? rgn: null;
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   647
    }
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   648
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   649
    /**
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   650
     * Examine if the id includes the region code. If it does, it returns
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   651
     * the region code.
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   652
     * Otherwise, it returns null. eg. when the id is "zh_Hans_SG", it return "SG".
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   653
     * It DOES return UN M.49 code, e.g., '001', as well as ISO 3166 two letter country codes.
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   654
     */
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   655
    static String getRegionCode(String id) {
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   656
        return Locale.forLanguageTag(id.replaceAll("_", "-")).getCountry();
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   657
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   658
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   659
    /*
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   660
     * Returns the script portion of the given id.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   661
     * If id is "root", "" is returned.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   662
     */
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   663
    static String getScript(String id) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   664
        return "root".equals(id) ? "" : Locale.forLanguageTag(id.replaceAll("_", "-")).getScript();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   665
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   666
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   667
    private static class KeyComparator implements Comparator<String> {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   668
        static KeyComparator INSTANCE = new KeyComparator();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   669
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   670
        private KeyComparator() {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   671
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   672
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   673
        @Override
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   674
        public int compare(String o1, String o2) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   675
            int len1 = o1.length();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   676
            int len2 = o2.length();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   677
            if (!isDigit(o1.charAt(0)) && !isDigit(o2.charAt(0))) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   678
                // Shorter string comes first unless either starts with a digit.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   679
                if (len1 < len2) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   680
                    return -1;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   681
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   682
                if (len1 > len2) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   683
                    return 1;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   684
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   685
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   686
            return o1.compareTo(o2);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   687
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   688
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   689
        private boolean isDigit(char c) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   690
            return c >= '0' && c <= '9';
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   691
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   692
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   693
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   694
    private static Map<String, Object> extractLocaleNames(Map<String, Object> map, String id) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   695
        Map<String, Object> localeNames = new TreeMap<>(KeyComparator.INSTANCE);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   696
        for (String key : map.keySet()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   697
            if (key.startsWith(LOCALE_NAME_PREFIX)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   698
                localeNames.put(key.substring(LOCALE_NAME_PREFIX.length()), map.get(key));
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   699
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   700
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   701
        return localeNames;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   702
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   703
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   704
    @SuppressWarnings("AssignmentToForLoopParameter")
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   705
    private static Map<String, Object> extractCurrencyNames(Map<String, Object> map, String id, String names)
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   706
            throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   707
        Map<String, Object> currencyNames = new TreeMap<>(KeyComparator.INSTANCE);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   708
        for (String key : map.keySet()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   709
            if (key.startsWith(CURRENCY_NAME_PREFIX)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   710
                currencyNames.put(key.substring(CURRENCY_NAME_PREFIX.length()), map.get(key));
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   711
            } else if (key.startsWith(CURRENCY_SYMBOL_PREFIX)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   712
                currencyNames.put(key.substring(CURRENCY_SYMBOL_PREFIX.length()), map.get(key));
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   713
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   714
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   715
        return currencyNames;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   716
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   717
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   718
    private static Map<String, Object> extractZoneNames(Map<String, Object> map, String id) {
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   719
        Map<String, Object> names = new HashMap<>();
32510
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   720
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   721
        // Copy over missing time zone ids from JRE for English locale
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   722
        if (id.equals("en")) {
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   723
            Map<String[], String> jreMetaMap = new HashMap<>();
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   724
            jreTimeZoneNames.stream().forEach(e -> {
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   725
                String tzid = (String)e[0];
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   726
                String[] data = (String[])e[1];
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   727
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   728
                if (map.get(TIMEZONE_ID_PREFIX + tzid) == null &&
38440
9e77c5b81def 7102969: currency.properties supercede not working correctly
nishjain
parents: 36014
diff changeset
   729
                    handlerMetaZones.get(tzid) == null ||
9e77c5b81def 7102969: currency.properties supercede not working correctly
nishjain
parents: 36014
diff changeset
   730
                    handlerMetaZones.get(tzid) != null &&
9e77c5b81def 7102969: currency.properties supercede not working correctly
nishjain
parents: 36014
diff changeset
   731
                    map.get(METAZONE_ID_PREFIX + handlerMetaZones.get(tzid)) == null) {
32510
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   732
                    // First, check the CLDR meta key
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   733
                    Optional<Map.Entry<String, String>> cldrMeta =
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   734
                        handlerMetaZones.getData().entrySet().stream()
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   735
                            .filter(me ->
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   736
                                Arrays.deepEquals(data,
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   737
                                    (String[])map.get(METAZONE_ID_PREFIX + me.getValue())))
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   738
                            .findAny();
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   739
                    if (cldrMeta.isPresent()) {
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   740
                        names.put(tzid, cldrMeta.get().getValue());
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   741
                    } else {
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   742
                        // check the JRE meta key, add if there is not.
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   743
                        Optional<Map.Entry<String[], String>> jreMeta =
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   744
                            jreMetaMap.entrySet().stream()
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   745
                                .filter(jm -> Arrays.deepEquals(data, jm.getKey()))
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   746
                                .findAny();
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   747
                        if (jreMeta.isPresent()) {
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   748
                            names.put(tzid, jreMeta.get().getValue());
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   749
                        } else {
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   750
                            String metaName = "JRE_" + tzid.replaceAll("[/-]", "_");
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   751
                            names.put(METAZONE_ID_PREFIX + metaName, data);
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   752
                            names.put(tzid, metaName);
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   753
                            jreMetaMap.put(data, metaName);
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   754
                        }
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   755
                    }
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   756
                }
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   757
            });
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   758
        }
7530a468314c 8134384: Continuation of JDK-8130845 : A date string created by Date#toString() is not parseable neither with ENGLISH, US nor ROOT locale
naoto
parents: 32030
diff changeset
   759
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   760
        for (String tzid : handlerMetaZones.keySet()) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   761
            String tzKey = TIMEZONE_ID_PREFIX + tzid;
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   762
            Object data = map.get(tzKey);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   763
            if (data instanceof String[]) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   764
                names.put(tzid, data);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   765
            } else {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   766
                String meta = handlerMetaZones.get(tzid);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   767
                if (meta != null) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   768
                    String metaKey = METAZONE_ID_PREFIX + meta;
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   769
                    data = map.get(metaKey);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   770
                    if (data instanceof String[]) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   771
                        // Keep the metazone prefix here.
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   772
                        names.put(metaKey, data);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   773
                        names.put(tzid, meta);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   774
                    }
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   775
                }
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   776
            }
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   777
        }
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   778
        return names;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   779
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   780
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   781
    private static Map<String, Object> extractCalendarData(Map<String, Object> map, String id) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   782
        Map<String, Object> calendarData = new LinkedHashMap<>();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   783
        copyIfPresent(map, "firstDayOfWeek", calendarData);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   784
        copyIfPresent(map, "minimalDaysInFirstWeek", calendarData);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   785
        return calendarData;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   786
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   787
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   788
    static final String[] FORMAT_DATA_ELEMENTS = {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   789
        "MonthNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   790
        "standalone.MonthNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   791
        "MonthAbbreviations",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   792
        "standalone.MonthAbbreviations",
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   793
        "MonthNarrows",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   794
        "standalone.MonthNarrows",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   795
        "DayNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   796
        "standalone.DayNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   797
        "DayAbbreviations",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   798
        "standalone.DayAbbreviations",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   799
        "DayNarrows",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   800
        "standalone.DayNarrows",
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   801
        "QuarterNames",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   802
        "standalone.QuarterNames",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   803
        "QuarterAbbreviations",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   804
        "standalone.QuarterAbbreviations",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   805
        "QuarterNarrows",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   806
        "standalone.QuarterNarrows",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   807
        "AmPmMarkers",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   808
        "narrow.AmPmMarkers",
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   809
        "abbreviated.AmPmMarkers",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   810
        "long.Eras",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   811
        "Eras",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   812
        "narrow.Eras",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   813
        "field.era",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   814
        "field.year",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   815
        "field.month",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   816
        "field.week",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   817
        "field.weekday",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   818
        "field.dayperiod",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   819
        "field.hour",
39644
4d04bb90a87c 8154797: Localization data for "GMT"
rgoel
parents: 38747
diff changeset
   820
        "timezone.hourFormat",
4d04bb90a87c 8154797: Localization data for "GMT"
rgoel
parents: 38747
diff changeset
   821
        "timezone.gmtFormat",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   822
        "field.minute",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   823
        "field.second",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   824
        "field.zone",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   825
        "TimePatterns",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   826
        "DatePatterns",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   827
        "DateTimePatterns",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   828
        "DateTimePatternChars"
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   829
    };
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   830
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   831
    private static Map<String, Object> extractFormatData(Map<String, Object> map, String id) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   832
        Map<String, Object> formatData = new LinkedHashMap<>();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   833
        for (CalendarType calendarType : CalendarType.values()) {
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   834
            if (calendarType == CalendarType.GENERIC) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   835
                continue;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   836
            }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   837
            String prefix = calendarType.keyElementName();
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   838
            for (String element : FORMAT_DATA_ELEMENTS) {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   839
                String key = prefix + element;
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   840
                copyIfPresent(map, "java.time." + key, formatData);
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   841
                copyIfPresent(map, key, formatData);
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   842
            }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   843
        }
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   844
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   845
        for (String key : map.keySet()) {
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   846
        // Copy available calendar names
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   847
            if (key.startsWith(CLDRConverter.CALENDAR_NAME_PREFIX)) {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   848
                String type = key.substring(CLDRConverter.CALENDAR_NAME_PREFIX.length());
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   849
                for (CalendarType calendarType : CalendarType.values()) {
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   850
                    if (calendarType == CalendarType.GENERIC) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   851
                        continue;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   852
                    }
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   853
                    if (type.equals(calendarType.lname())) {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   854
                        Object value = map.get(key);
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   855
                        formatData.put(key, value);
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   856
                        String ukey = CLDRConverter.CALENDAR_NAME_PREFIX + calendarType.uname();
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   857
                        if (!key.equals(ukey)) {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   858
                            formatData.put(ukey, value);
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   859
                        }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   860
                    }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   861
                }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   862
            }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   863
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   864
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   865
        copyIfPresent(map, "DefaultNumberingSystem", formatData);
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   866
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   867
        @SuppressWarnings("unchecked")
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   868
        List<String> numberingScripts = (List<String>) map.remove("numberingScripts");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   869
        if (numberingScripts != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   870
            for (String script : numberingScripts) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   871
                copyIfPresent(map, script + "." + "NumberElements", formatData);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   872
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   873
        } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   874
            copyIfPresent(map, "NumberElements", formatData);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   875
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   876
        copyIfPresent(map, "NumberPatterns", formatData);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   877
        return formatData;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   878
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   879
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   880
    private static void copyIfPresent(Map<String, Object> src, String key, Map<String, Object> dest) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   881
        Object value = src.get(key);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   882
        if (value != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   883
            dest.put(key, value);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   884
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   885
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   886
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   887
    // --- code below here is adapted from java.util.Properties ---
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   888
    private static final String specialSaveCharsJava = "\"";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   889
    private static final String specialSaveCharsProperties = "=: \t\r\n\f#!";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   890
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   891
    /*
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   892
     * Converts unicodes to encoded &#92;uxxxx
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   893
     * and writes out any of the characters in specialSaveChars
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   894
     * with a preceding slash
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   895
     */
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   896
    static String saveConvert(String theString, boolean useJava) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   897
        if (theString == null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   898
            return "";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   899
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   900
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   901
        String specialSaveChars;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   902
        if (useJava) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   903
            specialSaveChars = specialSaveCharsJava;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   904
        } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   905
            specialSaveChars = specialSaveCharsProperties;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   906
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   907
        boolean escapeSpace = false;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   908
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   909
        int len = theString.length();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   910
        StringBuilder outBuffer = new StringBuilder(len * 2);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   911
        Formatter formatter = new Formatter(outBuffer, Locale.ROOT);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   912
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   913
        for (int x = 0; x < len; x++) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   914
            char aChar = theString.charAt(x);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   915
            switch (aChar) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   916
            case ' ':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   917
                if (x == 0 || escapeSpace) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   918
                    outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   919
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   920
                outBuffer.append(' ');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   921
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   922
            case '\\':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   923
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   924
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   925
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   926
            case '\t':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   927
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   928
                outBuffer.append('t');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   929
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   930
            case '\n':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   931
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   932
                outBuffer.append('n');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   933
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   934
            case '\r':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   935
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   936
                outBuffer.append('r');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   937
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   938
            case '\f':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   939
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   940
                outBuffer.append('f');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   941
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   942
            default:
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   943
                if (aChar < 0x0020 || (!USE_UTF8 && aChar > 0x007e)) {
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   944
                    formatter.format("\\u%04x", (int)aChar);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   945
                } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   946
                    if (specialSaveChars.indexOf(aChar) != -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   947
                        outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   948
                    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   949
                    outBuffer.append(aChar);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   950
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   951
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   952
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   953
        return outBuffer.toString();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   954
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   955
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   956
    private static String toLanguageTag(String locName) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   957
        if (locName.indexOf('_') == -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   958
            return locName;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   959
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   960
        String tag = locName.replaceAll("_", "-");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   961
        Locale loc = Locale.forLanguageTag(tag);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   962
        return loc.toLanguageTag();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   963
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   964
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   965
    private static void addLikelySubtags(Map<String, SortedSet<String>> metaInfo, String category, String id) {
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   966
        String likelySubtag = handlerLikelySubtags.get(id);
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   967
        if (likelySubtag != null) {
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   968
            // Remove Script for now
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   969
            metaInfo.get(category).add(toLanguageTag(likelySubtag).replaceFirst("-[A-Z][a-z]{3}", ""));
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   970
        }
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   971
    }
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   972
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   973
    private static String toLocaleName(String tag) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   974
        if (tag.indexOf('-') == -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   975
            return tag;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   976
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   977
        return tag.replaceAll("-", "_");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   978
    }
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   979
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   980
    private static void setupBaseLocales(String localeList) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   981
        Arrays.stream(localeList.split(","))
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   982
            .map(Locale::forLanguageTag)
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   983
            .map(l -> Control.getControl(Control.FORMAT_DEFAULT)
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   984
                             .getCandidateLocales("", l))
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   985
            .forEach(BASE_LOCALES::addAll);
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   986
    }
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   987
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   988
    // applying parent locale rules to the passed candidates list
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   989
    // This has to match with the one in sun.util.cldr.CLDRLocaleProviderAdapter
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   990
    private static Map<Locale, Locale> childToParentLocaleMap = null;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   991
    private static List<Locale> applyParentLocales(String baseName, List<Locale> candidates) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   992
        if (Objects.isNull(childToParentLocaleMap)) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   993
            childToParentLocaleMap = new HashMap<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   994
            parentLocalesMap.keySet().forEach(key -> {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   995
                String parent = key.substring(PARENT_LOCALE_PREFIX.length()).replaceAll("_", "-");
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   996
                parentLocalesMap.get(key).stream().forEach(child -> {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   997
                    childToParentLocaleMap.put(Locale.forLanguageTag(child),
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   998
                        "root".equals(parent) ? Locale.ROOT : Locale.forLanguageTag(parent));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   999
                });
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1000
            });
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1001
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1002
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1003
        // check irregular parents
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1004
        for (int i = 0; i < candidates.size(); i++) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1005
            Locale l = candidates.get(i);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1006
            Locale p = childToParentLocaleMap.get(l);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1007
            if (!l.equals(Locale.ROOT) &&
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1008
                Objects.nonNull(p) &&
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1009
                !candidates.get(i+1).equals(p)) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1010
                List<Locale> applied = candidates.subList(0, i+1);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1011
                applied.addAll(applyParentLocales(baseName, defCon.getCandidateLocales(baseName, p)));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1012
                return applied;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1013
            }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1014
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1015
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1016
        return candidates;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1017
    }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1018
}