make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
author naoto
Thu, 13 Sep 2018 13:41:17 -0700
changeset 51730 cd0775f67ab0
parent 50085 f001977641fb
child 52869 c5c0db0b7c2f
permissions -rw-r--r--
8209167: Use CLDR's time zone mappings for Windows Reviewed-by: erikj, rriggs, ihse
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
     1
/*
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
     2
 * Copyright (c) 2012, 2018, 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;
49699
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
    31
import java.io.IOException;
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
    32
import java.io.UncheckedIOException;
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
    33
import java.nio.file.*;
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
    34
import java.text.MessageFormat;
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
    35
import java.time.*;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    36
import java.util.*;
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    37
import java.util.ResourceBundle.Control;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    38
import java.util.logging.Level;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    39
import java.util.logging.Logger;
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
    40
import java.util.stream.Collectors;
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    41
import java.util.stream.IntStream;
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
    42
import java.util.stream.Stream;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    43
import javax.xml.parsers.SAXParser;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    44
import javax.xml.parsers.SAXParserFactory;
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
    45
import org.xml.sax.SAXNotRecognizedException;
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
    46
import org.xml.sax.SAXNotSupportedException;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    47
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    48
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    49
/**
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    50
 * Converts locale data from "Locale Data Markup Language" format to
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    51
 * JRE resource bundle format. LDML is the format used by the Common
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    52
 * Locale Data Repository maintained by the Unicode Consortium.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    53
 */
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    54
public class CLDRConverter {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    55
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    56
    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
    57
    static final String SPPL_LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldmlSupplemental.dtd";
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    58
    static final String BCP47_LDML_DTD_SYSTEM_ID = "http://www.unicode.org/cldr/dtd/2.0/ldmlBCP47.dtd";
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    59
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    60
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
    61
    private static String CLDR_BASE;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    62
    static String LOCAL_LDML_DTD;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    63
    static String LOCAL_SPPL_LDML_DTD;
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    64
    static String LOCAL_BCP47_LDML_DTD;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    65
    private static String SOURCE_FILE_DIR;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    66
    private static String SPPL_SOURCE_FILE;
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
    67
    private static String SPPL_META_SOURCE_FILE;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    68
    private static String NUMBERING_SOURCE_FILE;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    69
    private static String METAZONES_SOURCE_FILE;
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
    70
    private static String LIKELYSUBTAGS_SOURCE_FILE;
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    71
    private static String TIMEZONE_SOURCE_FILE;
51730
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
    72
    private static String WINZONES_SOURCE_FILE;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    73
    static String DESTINATION_DIR = "build/gensrc";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    74
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    75
    static final String LOCALE_NAME_PREFIX = "locale.displayname.";
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    76
    static final String LOCALE_SEPARATOR = LOCALE_NAME_PREFIX + "separator";
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    77
    static final String LOCALE_KEYTYPE = LOCALE_NAME_PREFIX + "keytype";
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    78
    static final String LOCALE_KEY_PREFIX = LOCALE_NAME_PREFIX + "key.";
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    79
    static final String LOCALE_TYPE_PREFIX = LOCALE_NAME_PREFIX + "type.";
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    80
    static final String LOCALE_TYPE_PREFIX_CA = LOCALE_TYPE_PREFIX + "ca.";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    81
    static final String CURRENCY_SYMBOL_PREFIX = "currency.symbol.";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    82
    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
    83
    static final String CALENDAR_NAME_PREFIX = "calendarname.";
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    84
    static final String CALENDAR_FIRSTDAY_PREFIX = "firstDay.";
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    85
    static final String CALENDAR_MINDAYS_PREFIX = "minDays.";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    86
    static final String TIMEZONE_ID_PREFIX = "timezone.id.";
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
    87
    static final String EXEMPLAR_CITY_PREFIX = "timezone.excity.";
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
    88
    static final String ZONE_NAME_PREFIX = "timezone.displayname.";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    89
    static final String METAZONE_ID_PREFIX = "metazone.id.";
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
    90
    static final String PARENT_LOCALE_PREFIX = "parentLocale.";
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
    91
    static final String[] EMPTY_ZONE = {"", "", "", "", "", ""};
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    92
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    93
    private static SupplementDataParseHandler handlerSuppl;
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
    94
    private static LikelySubtagsParseHandler handlerLikelySubtags;
51730
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
    95
    private static WinZonesParseHandler handlerWinZones;
49918
8b9c78f0a712 8179071: Month value is inconsistent between CLDR and Java in some locales
rgoel
parents: 49904
diff changeset
    96
    static SupplementalMetadataParseHandler handlerSupplMeta;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    97
    static NumberingSystemsParseHandler handlerNumbering;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
    98
    static MetaZonesParseHandler handlerMetaZones;
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
    99
    static TimeZoneParseHandler handlerTimeZone;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   100
    private static BundleGenerator bundleGenerator;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   101
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   102
    // java.base module related
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   103
    static boolean isBaseModule = false;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   104
    static final Set<Locale> BASE_LOCALES = new HashSet<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   105
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   106
    // "parentLocales" map
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   107
    private static final Map<String, SortedSet<String>> parentLocalesMap = new HashMap<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   108
    private static final ResourceBundle.Control defCon =
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   109
        ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   110
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   111
    private static final String[] AVAILABLE_TZIDS = TimeZone.getAvailableIDs();
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   112
    private static String zoneNameTempFile;
49699
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
   113
    private static String tzDataDir;
50085
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   114
    private static final Map<String, String> canonicalTZMap = new HashMap<>();
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   115
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   116
    static enum DraftType {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   117
        UNCONFIRMED,
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   118
        PROVISIONAL,
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   119
        CONTRIBUTED,
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   120
        APPROVED;
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
        private static final Map<String, DraftType> map = new HashMap<>();
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   123
        static {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   124
            for (DraftType dt : values()) {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   125
                map.put(dt.getKeyword(), dt);
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   126
            }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   127
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   128
        static private DraftType defaultType = CONTRIBUTED;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   129
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   130
        private final String keyword;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   131
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   132
        private DraftType() {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   133
            keyword = this.name().toLowerCase(Locale.ROOT);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   134
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   135
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   136
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   137
        static DraftType forKeyword(String keyword) {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   138
            return map.get(keyword);
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   139
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   140
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   141
        static DraftType getDefault() {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   142
            return defaultType;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   143
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   144
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   145
        static void setDefault(String keyword) {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   146
            defaultType = Objects.requireNonNull(forKeyword(keyword));
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   147
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   148
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   149
        String getKeyword() {
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   150
            return keyword;
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   151
        }
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   152
    }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   153
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   154
    static boolean USE_UTF8 = false;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   155
    private static boolean verbose;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   156
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   157
    private CLDRConverter() {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   158
       // no instantiation
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   159
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   160
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   161
    @SuppressWarnings("AssignmentToForLoopParameter")
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   162
    public static void main(String[] args) throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   163
        if (args.length != 0) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   164
            String currentArg = null;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   165
            try {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   166
                for (int i = 0; i < args.length; i++) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   167
                    currentArg = args[i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   168
                    switch (currentArg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   169
                    case "-draft":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   170
                        String draftDataType = args[++i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   171
                        try {
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   172
                            DraftType.setDefault(draftDataType);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   173
                        } catch (NullPointerException e) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   174
                            severe("Error: incorrect draft value: %s%n", draftDataType);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   175
                            System.exit(1);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   176
                        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   177
                        info("Using the specified data type: %s%n", draftDataType);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   178
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   179
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   180
                    case "-base":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   181
                        // base directory for input files
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   182
                        CLDR_BASE = args[++i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   183
                        if (!CLDR_BASE.endsWith("/")) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   184
                            CLDR_BASE += "/";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   185
                        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   186
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   187
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   188
                    case "-baselocales":
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   189
                        // base locales
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   190
                        setupBaseLocales(args[++i]);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   191
                        break;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   192
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   193
                    case "-basemodule":
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   194
                        // indicates java.base module resource generation
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   195
                        isBaseModule = true;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   196
                        break;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   197
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   198
                    case "-o":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   199
                        // output directory
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   200
                        DESTINATION_DIR = args[++i];
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   201
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   202
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   203
                    case "-utf8":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   204
                        USE_UTF8 = true;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   205
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   206
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   207
                    case "-verbose":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   208
                        verbose = true;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   209
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   210
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   211
                    case "-zntempfile":
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   212
                        zoneNameTempFile = args[++i];
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   213
                        break;
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   214
49699
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
   215
                    case "-tzdatadir":
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
   216
                        tzDataDir = args[++i];
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
   217
                        break;
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
   218
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   219
                    case "-help":
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   220
                        usage();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   221
                        System.exit(0);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   222
                        break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   223
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   224
                    default:
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   225
                        throw new RuntimeException();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   226
                    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   227
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   228
            } catch (RuntimeException e) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   229
                severe("unknown or imcomplete arg(s): " + currentArg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   230
                usage();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   231
                System.exit(1);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   232
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   233
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   234
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   235
        // Set up path names
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   236
        LOCAL_LDML_DTD = CLDR_BASE + "/dtd/ldml.dtd";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   237
        LOCAL_SPPL_LDML_DTD = CLDR_BASE + "/dtd/ldmlSupplemental.dtd";
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   238
        LOCAL_BCP47_LDML_DTD = CLDR_BASE + "/dtd/ldmlBCP47.dtd";
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   239
        SOURCE_FILE_DIR = CLDR_BASE + "/main";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   240
        SPPL_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalData.xml";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   241
        LIKELYSUBTAGS_SOURCE_FILE = CLDR_BASE + "/supplemental/likelySubtags.xml";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   242
        NUMBERING_SOURCE_FILE = CLDR_BASE + "/supplemental/numberingSystems.xml";
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   243
        METAZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/metaZones.xml";
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   244
        TIMEZONE_SOURCE_FILE = CLDR_BASE + "/bcp47/timezone.xml";
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   245
        SPPL_META_SOURCE_FILE = CLDR_BASE + "/supplemental/supplementalMetadata.xml";
51730
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   246
        WINZONES_SOURCE_FILE = CLDR_BASE + "/supplemental/windowsZones.xml";
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   247
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   248
        if (BASE_LOCALES.isEmpty()) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   249
            setupBaseLocales("en-US");
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   250
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   251
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   252
        bundleGenerator = new ResourceBundleGenerator();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   253
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   254
        // Parse data independent of locales
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   255
        parseSupplemental();
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   256
        parseBCP47();
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   257
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   258
        List<Bundle> bundles = readBundleList();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   259
        convertBundles(bundles);
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   260
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   261
        if (isBaseModule) {
51730
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   262
            // Generate java.time.format.ZoneName.java
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   263
            generateZoneName();
51730
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   264
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   265
            // Generate Windows tzmappings
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   266
            generateWindowsTZMappings();
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   267
        }
13583
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 usage() {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   271
        errout("Usage: java CLDRConverter [options]%n"
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   272
                + "\t-help          output this usage message and exit%n"
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   273
                + "\t-verbose       output information%n"
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   274
                + "\t-draft [contributed | approved | provisional | unconfirmed]%n"
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   275
                + "\t\t       draft level for using data (default: contributed)%n"
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   276
                + "\t-base dir      base directory for CLDR input files%n"
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   277
                + "\t-basemodule    generates bundles that go into java.base module%n"
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   278
                + "\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
   279
                + "\t-o dir         output directory (default: ./build/gensrc)%n"
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   280
                + "\t-zntempfile    template file for java.time.format.ZoneName.java%n"
49699
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
   281
                + "\t-tzdatadir     tzdata directory for java.time.format.ZoneName.java%n"
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   282
                + "\t-utf8          use UTF-8 rather than \\uxxxx (for debug)%n");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   283
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   284
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   285
    static void info(String fmt, Object... args) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   286
        if (verbose) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   287
            System.out.printf(fmt, args);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   288
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   289
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   290
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   291
    static void info(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   292
        if (verbose) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   293
            System.out.println(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   294
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   295
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   296
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   297
    static void warning(String fmt, Object... args) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   298
        System.err.print("Warning: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   299
        System.err.printf(fmt, args);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   300
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   301
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   302
    static void warning(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   303
        System.err.print("Warning: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   304
        errout(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   305
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   306
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   307
    static void severe(String fmt, Object... args) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   308
        System.err.print("Error: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   309
        System.err.printf(fmt, args);
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
    static void severe(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   313
        System.err.print("Error: ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   314
        errout(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   315
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   316
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   317
    private static void errout(String msg) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   318
        if (msg.contains("%n")) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   319
            System.err.printf(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   320
        } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   321
            System.err.println(msg);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   322
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   323
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   324
17466
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   325
    /**
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   326
     * 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
   327
     */
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   328
    private static void enableFileAccess(SAXParser parser) throws SAXNotSupportedException {
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   329
        try {
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   330
            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
   331
        } catch (SAXNotRecognizedException ignore) {
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   332
            // property requires >= JAXP 1.5
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   333
        }
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   334
    }
e2c55878b26a 8014500: bootcycle-images fails after upgrade to JAXP 1.5
alanb
parents: 16852
diff changeset
   335
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   336
    private static List<Bundle> readBundleList() throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   337
        List<Bundle> retList = new ArrayList<>();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   338
        Path path = FileSystems.getDefault().getPath(SOURCE_FILE_DIR);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   339
        try (DirectoryStream<Path> dirStr = Files.newDirectoryStream(path)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   340
            for (Path entry : dirStr) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   341
                String fileName = entry.getFileName().toString();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   342
                if (fileName.endsWith(".xml")) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   343
                    String id = fileName.substring(0, fileName.indexOf('.'));
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   344
                    Locale cldrLoc = Locale.forLanguageTag(toLanguageTag(id));
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   345
                    StringBuilder sb = getCandLocales(cldrLoc);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   346
                    if (sb.indexOf("root") == -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   347
                        sb.append("root");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   348
                    }
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   349
                    Bundle b = new Bundle(id, sb.toString(), null, null);
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   350
                    // 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
   351
                    // processed first.
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   352
                    if ("root".equals(id)) {
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   353
                        retList.add(0, b);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   354
                    } else {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   355
                        retList.add(b);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   356
                    }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   357
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   358
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   359
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   360
        return retList;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   361
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   362
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   363
    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
   364
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   365
    private static Map<String, SortedSet<String>> metaInfo = new HashMap<>();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   366
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   367
    static {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   368
        // For generating information on supported locales.
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   369
        metaInfo.put("AvailableLocales", new TreeSet<>());
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   370
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   371
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   372
    static Map<String, Object> getCLDRBundle(String id) throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   373
        Map<String, Object> bundle = cldrBundles.get(id);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   374
        if (bundle != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   375
            return bundle;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   376
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   377
        File file = new File(SOURCE_FILE_DIR + File.separator + id + ".xml");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   378
        if (!file.exists()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   379
            // Skip if the file doesn't exist.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   380
            return Collections.emptyMap();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   381
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   382
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   383
        info("..... main directory .....");
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   384
        LDMLParseHandler handler = new LDMLParseHandler(id);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   385
        parseLDMLFile(file, handler);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   386
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   387
        bundle = handler.getData();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   388
        cldrBundles.put(id, bundle);
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   389
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   390
        if (id.equals("root")) {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   391
            // Calendar data (firstDayOfWeek & minDaysInFirstWeek)
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   392
            bundle = handlerSuppl.getData("root");
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   393
            if (bundle != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   394
                //merge two maps into one map
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   395
                Map<String, Object> temp = cldrBundles.remove(id);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   396
                bundle.putAll(temp);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   397
                cldrBundles.put(id, bundle);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   398
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   399
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   400
        return bundle;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   401
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   402
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   403
    // Parsers for data in "supplemental" directory
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   404
    //
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   405
    private static void parseSupplemental() throws Exception {
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   406
        // Parse SupplementalData file and store the information in the HashMap
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   407
        // Calendar information such as firstDay and minDay are stored in
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   408
        // supplementalData.xml as of CLDR1.4. Individual territory is listed
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   409
        // with its ISO 3166 country code while default is listed using UNM49
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   410
        // region and composition numerical code (001 for World.)
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   411
        //
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   412
        // SupplementalData file also provides the "parent" locales which
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   413
        // 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
   414
        //
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   415
        handlerSuppl = new SupplementDataParseHandler();
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   416
        parseLDMLFile(new File(SPPL_SOURCE_FILE), handlerSuppl);
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   417
        Map<String, Object> parentData = handlerSuppl.getData("root");
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   418
        parentData.keySet().stream()
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   419
                .filter(key -> key.startsWith(PARENT_LOCALE_PREFIX))
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   420
                .forEach(key -> {
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   421
                parentLocalesMap.put(key, new TreeSet(
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   422
                    Arrays.asList(((String)parentData.get(key)).split(" "))));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   423
            });
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   424
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   425
        // Parse numberingSystems to get digit zero character information.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   426
        handlerNumbering = new NumberingSystemsParseHandler();
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   427
        parseLDMLFile(new File(NUMBERING_SOURCE_FILE), handlerNumbering);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   428
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   429
        // Parse metaZones to create mappings between Olson tzids and CLDR meta zone names
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   430
        handlerMetaZones = new MetaZonesParseHandler();
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   431
        parseLDMLFile(new File(METAZONES_SOURCE_FILE), handlerMetaZones);
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   432
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   433
        // Parse likelySubtags
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   434
        handlerLikelySubtags = new LikelySubtagsParseHandler();
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   435
        parseLDMLFile(new File(LIKELYSUBTAGS_SOURCE_FILE), handlerLikelySubtags);
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   436
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   437
        // Parse supplementalMetadata
49918
8b9c78f0a712 8179071: Month value is inconsistent between CLDR and Java in some locales
rgoel
parents: 49904
diff changeset
   438
        // Currently interested in deprecated time zone ids and language aliases.
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   439
        handlerSupplMeta = new SupplementalMetadataParseHandler();
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   440
        parseLDMLFile(new File(SPPL_META_SOURCE_FILE), handlerSupplMeta);
51730
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   441
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   442
        // Parse windowsZones
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   443
        handlerWinZones = new WinZonesParseHandler();
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
   444
        parseLDMLFile(new File(WINZONES_SOURCE_FILE), handlerWinZones);
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   445
    }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   446
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   447
    // Parsers for data in "bcp47" directory
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   448
    //
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   449
    private static void parseBCP47() throws Exception {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   450
        // Parse timezone
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   451
        handlerTimeZone = new TimeZoneParseHandler();
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   452
        parseLDMLFile(new File(TIMEZONE_SOURCE_FILE), handlerTimeZone);
50085
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   453
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   454
        // canonical tz name map
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   455
        // alias -> primary
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   456
        handlerTimeZone.getData().forEach((k, v) -> {
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   457
            String[] ids = ((String)v).split("\\s");
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   458
            for (int i = 1; i < ids.length; i++) {
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   459
                canonicalTZMap.put(ids[i], ids[0]);
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   460
            }
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   461
        });
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   462
    }
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   463
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   464
    private static void parseLDMLFile(File srcfile, AbstractLDMLHandler handler) throws Exception {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   465
        info("..... Parsing " + srcfile.getName() + " .....");
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   466
        SAXParserFactory pf = SAXParserFactory.newInstance();
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   467
        pf.setValidating(true);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   468
        SAXParser parser = pf.newSAXParser();
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   469
        enableFileAccess(parser);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   470
        parser.parse(srcfile, handler);
47473
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   471
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   472
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   473
    private static StringBuilder getCandLocales(Locale cldrLoc) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   474
        List<Locale> candList = getCandidateLocales(cldrLoc);
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   475
        StringBuilder sb = new StringBuilder();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   476
        for (Locale loc : candList) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   477
            if (!loc.equals(Locale.ROOT)) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   478
                sb.append(toLocaleName(loc.toLanguageTag()));
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   479
                sb.append(",");
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   480
            }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   481
        }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   482
        return sb;
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
    private static List<Locale> getCandidateLocales(Locale cldrLoc) {
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   486
        List<Locale> candList = new ArrayList<>();
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   487
        candList = applyParentLocales("", defCon.getCandidateLocales("",  cldrLoc));
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   488
        return candList;
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   489
    }
5d798d729fec 8185841: Values from getFirstDayOfWeek() are inconsistent with CLDR
rgoel
parents: 47216
diff changeset
   490
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   491
    private static void convertBundles(List<Bundle> bundles) throws Exception {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   492
        // parent locales map. The mappings are put in base metaInfo file
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   493
        // for now.
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   494
        if (isBaseModule) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   495
            metaInfo.putAll(parentLocalesMap);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   496
        }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   497
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   498
        for (Bundle bundle : bundles) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   499
            // Get the target map, which contains all the data that should be
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   500
            // visible for the bundle's locale
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   501
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   502
            Map<String, Object> targetMap = bundle.getTargetMap();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   503
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   504
            EnumSet<Bundle.Type> bundleTypes = bundle.getBundleTypes();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   505
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   506
            if (bundle.isRoot()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   507
                // Add DateTimePatternChars because CLDR no longer supports localized patterns.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   508
                targetMap.put("DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   509
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   510
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   511
            // 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
   512
            // Go ahead and generate them.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   513
            if (bundleTypes.contains(Bundle.Type.LOCALENAMES)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   514
                Map<String, Object> localeNamesMap = extractLocaleNames(targetMap, bundle.getID());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   515
                if (!localeNamesMap.isEmpty() || bundle.isRoot()) {
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   516
                    bundleGenerator.generateBundle("util", "LocaleNames", bundle.getJavaID(), true, localeNamesMap, BundleType.OPEN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   517
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   518
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   519
            if (bundleTypes.contains(Bundle.Type.CURRENCYNAMES)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   520
                Map<String, Object> currencyNamesMap = extractCurrencyNames(targetMap, bundle.getID(), bundle.getCurrencies());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   521
                if (!currencyNamesMap.isEmpty() || bundle.isRoot()) {
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   522
                    bundleGenerator.generateBundle("util", "CurrencyNames", bundle.getJavaID(), true, currencyNamesMap, BundleType.OPEN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   523
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   524
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   525
            if (bundleTypes.contains(Bundle.Type.TIMEZONENAMES)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   526
                Map<String, Object> zoneNamesMap = extractZoneNames(targetMap, bundle.getID());
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   527
                if (!zoneNamesMap.isEmpty() || bundle.isRoot()) {
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   528
                    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
   529
                }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   530
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   531
            if (bundleTypes.contains(Bundle.Type.CALENDARDATA)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   532
                Map<String, Object> calendarDataMap = extractCalendarData(targetMap, bundle.getID());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   533
                if (!calendarDataMap.isEmpty() || bundle.isRoot()) {
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   534
                    bundleGenerator.generateBundle("util", "CalendarData", bundle.getJavaID(), true, calendarDataMap, BundleType.PLAIN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   535
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   536
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   537
            if (bundleTypes.contains(Bundle.Type.FORMATDATA)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   538
                Map<String, Object> formatDataMap = extractFormatData(targetMap, bundle.getID());
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   539
                if (!formatDataMap.isEmpty() || bundle.isRoot()) {
32030
f2c22ba89d0f 8132494: Wrong CLDR resource bundle names for legacy ISO language codes
naoto
parents: 31263
diff changeset
   540
                    bundleGenerator.generateBundle("text", "FormatData", bundle.getJavaID(), true, formatDataMap, BundleType.PLAIN);
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   541
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   542
            }
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   543
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   544
            // For AvailableLocales
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   545
            metaInfo.get("AvailableLocales").add(toLanguageTag(bundle.getID()));
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   546
            addLikelySubtags(metaInfo, "AvailableLocales", bundle.getID());
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   547
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   548
        bundleGenerator.generateMetaInfo(metaInfo);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   549
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   550
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   551
    static final Map<String, String> aliases = new HashMap<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   552
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   553
    /**
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   554
     * Translate the aliases into the real entries in the bundle map.
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   555
     */
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   556
    static void handleAliases(Map<String, Object> bundleMap) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   557
        Set bundleKeys = bundleMap.keySet();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   558
        try {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   559
            for (String key : aliases.keySet()) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   560
                String targetKey = aliases.get(key);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   561
                if (bundleKeys.contains(targetKey)) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   562
                    bundleMap.putIfAbsent(key, bundleMap.get(targetKey));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   563
                }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   564
            }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   565
        } catch (Exception ex) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   566
            Logger.getLogger(CLDRConverter.class.getName()).log(Level.SEVERE, null, ex);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   567
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   568
    }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   569
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   570
    /*
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   571
     * Returns the language portion of the given id.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   572
     * If id is "root", "" is returned.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   573
     */
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   574
    static String getLanguageCode(String id) {
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   575
        return "root".equals(id) ? "" : Locale.forLanguageTag(id.replaceAll("_", "-")).getLanguage();
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   576
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   577
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   578
    /**
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   579
     * 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
   580
     * the country code.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   581
     * 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
   582
     * 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
   583
     * be translated into package names.
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   584
     */
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   585
    static String getCountryCode(String id) {
36014
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   586
        String rgn = getRegionCode(id);
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   587
        return rgn.length() == 2 ? rgn: null;
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   588
    }
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   589
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   590
    /**
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   591
     * 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
   592
     * the region code.
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   593
     * 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
   594
     * 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
   595
     */
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   596
    static String getRegionCode(String id) {
3d50784f2dc2 8148346: Reduce number of packages in jdk.localedata module
naoto
parents: 32510
diff changeset
   597
        return Locale.forLanguageTag(id.replaceAll("_", "-")).getCountry();
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   598
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   599
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   600
    private static class KeyComparator implements Comparator<String> {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   601
        static KeyComparator INSTANCE = new KeyComparator();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   602
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   603
        private KeyComparator() {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   604
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   605
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   606
        @Override
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   607
        public int compare(String o1, String o2) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   608
            int len1 = o1.length();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   609
            int len2 = o2.length();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   610
            if (!isDigit(o1.charAt(0)) && !isDigit(o2.charAt(0))) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   611
                // Shorter string comes first unless either starts with a digit.
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   612
                if (len1 < len2) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   613
                    return -1;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   614
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   615
                if (len1 > len2) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   616
                    return 1;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   617
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   618
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   619
            return o1.compareTo(o2);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   620
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   621
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   622
        private boolean isDigit(char c) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   623
            return c >= '0' && c <= '9';
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   624
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   625
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   626
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   627
    private static Map<String, Object> extractLocaleNames(Map<String, Object> map, String id) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   628
        Map<String, Object> localeNames = new TreeMap<>(KeyComparator.INSTANCE);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   629
        for (String key : map.keySet()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   630
            if (key.startsWith(LOCALE_NAME_PREFIX)) {
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   631
                switch (key) {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   632
                    case LOCALE_SEPARATOR:
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   633
                        localeNames.put("ListCompositionPattern", map.get(key));
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   634
                        break;
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   635
                    case LOCALE_KEYTYPE:
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   636
                        localeNames.put("ListKeyTypePattern", map.get(key));
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   637
                        break;
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   638
                    default:
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   639
                        localeNames.put(key.substring(LOCALE_NAME_PREFIX.length()), map.get(key));
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   640
                        break;
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   641
                }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   642
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   643
        }
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   644
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   645
        if (id.equals("root")) {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   646
            // Add display name pattern, which is not in CLDR
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   647
            localeNames.put("DisplayNamePattern", "{0,choice,0#|1#{1}|2#{1} ({2})}");
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   648
        }
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   649
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   650
        return localeNames;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   651
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   652
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   653
    @SuppressWarnings("AssignmentToForLoopParameter")
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   654
    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
   655
            throws Exception {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   656
        Map<String, Object> currencyNames = new TreeMap<>(KeyComparator.INSTANCE);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   657
        for (String key : map.keySet()) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   658
            if (key.startsWith(CURRENCY_NAME_PREFIX)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   659
                currencyNames.put(key.substring(CURRENCY_NAME_PREFIX.length()), map.get(key));
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   660
            } else if (key.startsWith(CURRENCY_SYMBOL_PREFIX)) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   661
                currencyNames.put(key.substring(CURRENCY_SYMBOL_PREFIX.length()), map.get(key));
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   662
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   663
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   664
        return currencyNames;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   665
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   666
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   667
    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
   668
        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
   669
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
   670
        // 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
   671
        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
   672
            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
   673
            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
   674
                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
   675
                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
   676
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
   677
                if (map.get(TIMEZONE_ID_PREFIX + tzid) == null &&
38440
9e77c5b81def 7102969: currency.properties supercede not working correctly
nishjain
parents: 36014
diff changeset
   678
                    handlerMetaZones.get(tzid) == null ||
9e77c5b81def 7102969: currency.properties supercede not working correctly
nishjain
parents: 36014
diff changeset
   679
                    handlerMetaZones.get(tzid) != null &&
9e77c5b81def 7102969: currency.properties supercede not working correctly
nishjain
parents: 36014
diff changeset
   680
                    map.get(METAZONE_ID_PREFIX + handlerMetaZones.get(tzid)) == null) {
50085
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   681
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   682
                    // First, check the alias
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   683
                    String canonID = canonicalTZMap.get(tzid);
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   684
                    if (canonID != null && !tzid.equals(canonID)) {
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   685
                        Object value = map.get(TIMEZONE_ID_PREFIX + canonID);
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   686
                        if (value != null) {
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   687
                            names.put(tzid, value);
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   688
                            return;
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   689
                        } else {
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   690
                            String meta = handlerMetaZones.get(canonID);
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   691
                            if (meta != null) {
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   692
                                value = map.get(METAZONE_ID_PREFIX + meta);
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   693
                                if (value != null) {
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   694
                                    names.put(tzid, meta);
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   695
                                    return;
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   696
                                }
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   697
                            }
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   698
                        }
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   699
                    }
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   700
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   701
                    // Check the CLDR meta key
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
   702
                    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
   703
                        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
   704
                            .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
   705
                                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
   706
                                    (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
   707
                            .findAny();
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   708
                    cldrMeta.ifPresentOrElse(meta -> names.put(tzid, meta.getValue()), () -> {
50085
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
   709
                        // Check the JRE meta key, add if there is not.
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
   710
                        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
   711
                            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
   712
                                .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
   713
                                .findAny();
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   714
                        jreMeta.ifPresentOrElse(meta -> names.put(tzid, meta.getValue()), () -> {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   715
                                String metaName = "JRE_" + tzid.replaceAll("[/-]", "_");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   716
                                names.put(METAZONE_ID_PREFIX + metaName, data);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   717
                                names.put(tzid, metaName);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   718
                        });
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   719
                    });
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
            });
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
        }
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
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   724
        Arrays.stream(AVAILABLE_TZIDS).forEach(tzid -> {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   725
            // If the tzid is deprecated, get the data for the replacement id
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   726
            String tzKey = Optional.ofNullable((String)handlerSupplMeta.get(tzid))
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   727
                                   .orElse(tzid);
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   728
            Object data = map.get(TIMEZONE_ID_PREFIX + tzKey);
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   729
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   730
            if (data instanceof String[]) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   731
                names.put(tzid, data);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   732
            } else {
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   733
                String meta = handlerMetaZones.get(tzKey);
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   734
                if (meta != null) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   735
                    String metaKey = METAZONE_ID_PREFIX + meta;
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   736
                    data = map.get(metaKey);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   737
                    if (data instanceof String[]) {
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   738
                        // Keep the metazone prefix here.
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   739
                        names.put(metaKey, data);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   740
                        names.put(tzid, meta);
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   741
                    }
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   742
                }
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   743
            }
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   744
        });
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
   745
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   746
        // exemplar cities.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   747
        Map<String, Object> exCities = map.entrySet().stream()
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   748
                .filter(e -> e.getKey().startsWith(CLDRConverter.EXEMPLAR_CITY_PREFIX))
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   749
                .collect(Collectors
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   750
                        .toMap(Map.Entry::getKey, Map.Entry::getValue));
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   751
        names.putAll(exCities);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   752
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   753
        if (!id.equals("en") &&
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   754
            !names.isEmpty()) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   755
            // CLDR does not have UTC entry, so add it here.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   756
            names.put("UTC", EMPTY_ZONE);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   757
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   758
            // no metazone zones
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   759
            Arrays.asList(handlerMetaZones.get(MetaZonesParseHandler.NO_METAZONE_KEY)
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   760
                .split("\\s")).stream()
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   761
                .forEach(tz -> {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   762
                    names.put(tz, EMPTY_ZONE);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   763
                });
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   764
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   765
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   766
        return names;
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   767
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   768
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   769
    /**
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   770
     * Extracts the language independent calendar data. Each of the two keys,
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   771
     * "firstDayOfWeek" and "minimalDaysInFirstWeek" has a string value consists of
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   772
     * one or multiple occurrences of:
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   773
     *  i: rg1 rg2 ... rgn;
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   774
     * where "i" is the data for the following regions (delimited by a space) after
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   775
     * ":", and ends with a ";".
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   776
     */
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   777
    private static Map<String, Object> extractCalendarData(Map<String, Object> map, String id) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   778
        Map<String, Object> calendarData = new LinkedHashMap<>();
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   779
        if (id.equals("root")) {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   780
            calendarData.put("firstDayOfWeek",
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   781
                IntStream.range(1, 8)
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   782
                    .mapToObj(String::valueOf)
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   783
                    .filter(d -> map.keySet().contains(CALENDAR_FIRSTDAY_PREFIX + d))
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   784
                    .map(d -> d + ": " + map.get(CALENDAR_FIRSTDAY_PREFIX + d))
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   785
                    .collect(Collectors.joining(";")));
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   786
            calendarData.put("minimalDaysInFirstWeek",
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   787
                IntStream.range(0, 7)
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   788
                    .mapToObj(String::valueOf)
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   789
                    .filter(d -> map.keySet().contains(CALENDAR_MINDAYS_PREFIX + d))
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   790
                    .map(d -> d + ": " + map.get(CALENDAR_MINDAYS_PREFIX + d))
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   791
                    .collect(Collectors.joining(";")));
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   792
        }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   793
        return calendarData;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   794
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   795
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   796
    static final String[] FORMAT_DATA_ELEMENTS = {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   797
        "MonthNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   798
        "standalone.MonthNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   799
        "MonthAbbreviations",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   800
        "standalone.MonthAbbreviations",
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   801
        "MonthNarrows",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   802
        "standalone.MonthNarrows",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   803
        "DayNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   804
        "standalone.DayNames",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   805
        "DayAbbreviations",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   806
        "standalone.DayAbbreviations",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   807
        "DayNarrows",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   808
        "standalone.DayNarrows",
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   809
        "QuarterNames",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   810
        "standalone.QuarterNames",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   811
        "QuarterAbbreviations",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   812
        "standalone.QuarterAbbreviations",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   813
        "QuarterNarrows",
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   814
        "standalone.QuarterNarrows",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   815
        "AmPmMarkers",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   816
        "narrow.AmPmMarkers",
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   817
        "abbreviated.AmPmMarkers",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   818
        "long.Eras",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   819
        "Eras",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   820
        "narrow.Eras",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   821
        "field.era",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   822
        "field.year",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   823
        "field.month",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   824
        "field.week",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   825
        "field.weekday",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   826
        "field.dayperiod",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   827
        "field.hour",
39644
4d04bb90a87c 8154797: Localization data for "GMT"
rgoel
parents: 38747
diff changeset
   828
        "timezone.hourFormat",
4d04bb90a87c 8154797: Localization data for "GMT"
rgoel
parents: 38747
diff changeset
   829
        "timezone.gmtFormat",
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   830
        "timezone.gmtZeroFormat",
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   831
        "timezone.regionFormat",
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   832
        "timezone.regionFormat.daylight",
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents: 49699
diff changeset
   833
        "timezone.regionFormat.standard",
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   834
        "field.minute",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   835
        "field.second",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   836
        "field.zone",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   837
        "TimePatterns",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   838
        "DatePatterns",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   839
        "DateTimePatterns",
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   840
        "DateTimePatternChars"
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   841
    };
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   842
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   843
    private static Map<String, Object> extractFormatData(Map<String, Object> map, String id) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   844
        Map<String, Object> formatData = new LinkedHashMap<>();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   845
        for (CalendarType calendarType : CalendarType.values()) {
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   846
            if (calendarType == CalendarType.GENERIC) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   847
                continue;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   848
            }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   849
            String prefix = calendarType.keyElementName();
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   850
            for (String element : FORMAT_DATA_ELEMENTS) {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   851
                String key = prefix + element;
16852
60207b2b4b42 8011172: JSR 310 DateTime API Updates II
sherman
parents: 15281
diff changeset
   852
                copyIfPresent(map, "java.time." + key, formatData);
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   853
                copyIfPresent(map, key, formatData);
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   854
            }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   855
        }
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   856
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   857
        for (String key : map.keySet()) {
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   858
        // Copy available calendar names
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   859
            if (key.startsWith(CLDRConverter.LOCALE_TYPE_PREFIX_CA)) {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   860
                String type = key.substring(CLDRConverter.LOCALE_TYPE_PREFIX_CA.length());
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   861
                for (CalendarType calendarType : CalendarType.values()) {
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   862
                    if (calendarType == CalendarType.GENERIC) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   863
                        continue;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
   864
                    }
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   865
                    if (type.equals(calendarType.lname())) {
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   866
                        Object value = map.get(key);
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   867
                        String dataKey = key.replace(LOCALE_TYPE_PREFIX_CA,
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   868
                                CALENDAR_NAME_PREFIX);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   869
                        formatData.put(dataKey, value);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   870
                        String ukey = CALENDAR_NAME_PREFIX + calendarType.uname();
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   871
                        if (!dataKey.equals(ukey)) {
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   872
                            formatData.put(ukey, value);
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   873
                        }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   874
                    }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   875
                }
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   876
            }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   877
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   878
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   879
        copyIfPresent(map, "DefaultNumberingSystem", formatData);
15281
dd43cb9be0e1 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI
okutsu
parents: 14765
diff changeset
   880
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   881
        @SuppressWarnings("unchecked")
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   882
        List<String> numberingScripts = (List<String>) map.remove("numberingScripts");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   883
        if (numberingScripts != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   884
            for (String script : numberingScripts) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   885
                copyIfPresent(map, script + "." + "NumberElements", formatData);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   886
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   887
        } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   888
            copyIfPresent(map, "NumberElements", formatData);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   889
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   890
        copyIfPresent(map, "NumberPatterns", formatData);
48251
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   891
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   892
        // put extra number elements for available scripts into formatData, if it is "root"
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   893
        if (id.equals("root")) {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   894
            handlerNumbering.keySet().stream()
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   895
                .filter(k -> !numberingScripts.contains(k))
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   896
                .forEach(k -> {
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   897
                    String[] ne = (String[])map.get("latn.NumberElements");
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   898
                    String[] neNew = Arrays.copyOf(ne, ne.length);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   899
                    neNew[4] = handlerNumbering.get(k).substring(0, 1);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   900
                    formatData.put(k + ".NumberElements", neNew);
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   901
                });
57148c79bd75 8176841: Additional Unicode Language-Tag Extensions
naoto
parents: 47473
diff changeset
   902
        }
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   903
        return formatData;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   904
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   905
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   906
    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
   907
        Object value = src.get(key);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   908
        if (value != null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   909
            dest.put(key, value);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   910
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   911
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   912
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   913
    // --- code below here is adapted from java.util.Properties ---
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   914
    private static final String specialSaveCharsJava = "\"";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   915
    private static final String specialSaveCharsProperties = "=: \t\r\n\f#!";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   916
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   917
    /*
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   918
     * Converts unicodes to encoded &#92;uxxxx
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   919
     * and writes out any of the characters in specialSaveChars
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   920
     * with a preceding slash
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   921
     */
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   922
    static String saveConvert(String theString, boolean useJava) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   923
        if (theString == null) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   924
            return "";
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   925
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   926
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   927
        String specialSaveChars;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   928
        if (useJava) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   929
            specialSaveChars = specialSaveCharsJava;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   930
        } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   931
            specialSaveChars = specialSaveCharsProperties;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   932
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   933
        boolean escapeSpace = false;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   934
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   935
        int len = theString.length();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   936
        StringBuilder outBuffer = new StringBuilder(len * 2);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   937
        Formatter formatter = new Formatter(outBuffer, Locale.ROOT);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   938
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   939
        for (int x = 0; x < len; x++) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   940
            char aChar = theString.charAt(x);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   941
            switch (aChar) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   942
            case ' ':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   943
                if (x == 0 || escapeSpace) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   944
                    outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   945
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   946
                outBuffer.append(' ');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   947
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   948
            case '\\':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   949
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   950
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   951
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   952
            case '\t':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   953
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   954
                outBuffer.append('t');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   955
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   956
            case '\n':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   957
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   958
                outBuffer.append('n');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   959
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   960
            case '\r':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   961
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   962
                outBuffer.append('r');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   963
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   964
            case '\f':
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   965
                outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   966
                outBuffer.append('f');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   967
                break;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   968
            default:
14765
0987999ed367 8000983: Support narrow display names for calendar fields
okutsu
parents: 13583
diff changeset
   969
                if (aChar < 0x0020 || (!USE_UTF8 && aChar > 0x007e)) {
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   970
                    formatter.format("\\u%04x", (int)aChar);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   971
                } else {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   972
                    if (specialSaveChars.indexOf(aChar) != -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   973
                        outBuffer.append('\\');
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   974
                    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   975
                    outBuffer.append(aChar);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   976
                }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   977
            }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   978
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   979
        return outBuffer.toString();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   980
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   981
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   982
    private static String toLanguageTag(String locName) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   983
        if (locName.indexOf('_') == -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   984
            return locName;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   985
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   986
        String tag = locName.replaceAll("_", "-");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   987
        Locale loc = Locale.forLanguageTag(tag);
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   988
        return loc.toLanguageTag();
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   989
    }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   990
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   991
    private static void addLikelySubtags(Map<String, SortedSet<String>> metaInfo, String category, String id) {
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   992
        String likelySubtag = handlerLikelySubtags.get(id);
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   993
        if (likelySubtag != null) {
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   994
            // Remove Script for now
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   995
            metaInfo.get(category).add(toLanguageTag(likelySubtag).replaceFirst("-[A-Z][a-z]{3}", ""));
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   996
        }
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   997
    }
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
   998
13583
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
   999
    private static String toLocaleName(String tag) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
  1000
        if (tag.indexOf('-') == -1) {
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
  1001
            return tag;
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
  1002
        }
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
  1003
        return tag.replaceAll("-", "_");
dc0017b1a452 6336885: RFE: Locale Data Deployment Enhancements
naoto
parents:
diff changeset
  1004
    }
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1005
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1006
    private static void setupBaseLocales(String localeList) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1007
        Arrays.stream(localeList.split(","))
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1008
            .map(Locale::forLanguageTag)
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1009
            .map(l -> Control.getControl(Control.FORMAT_DEFAULT)
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1010
                             .getCandidateLocales("", l))
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1011
            .forEach(BASE_LOCALES::addAll);
38747
469920616f3a 8145136: Upgrade CLDR locale data
rgoel
parents: 38440
diff changeset
  1012
    }
31263
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
    // applying parent locale rules to the passed candidates list
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1015
    // 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
  1016
    private static Map<Locale, Locale> childToParentLocaleMap = null;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1017
    private static List<Locale> applyParentLocales(String baseName, List<Locale> candidates) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1018
        if (Objects.isNull(childToParentLocaleMap)) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1019
            childToParentLocaleMap = new HashMap<>();
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1020
            parentLocalesMap.keySet().forEach(key -> {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1021
                String parent = key.substring(PARENT_LOCALE_PREFIX.length()).replaceAll("_", "-");
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1022
                parentLocalesMap.get(key).stream().forEach(child -> {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1023
                    childToParentLocaleMap.put(Locale.forLanguageTag(child),
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1024
                        "root".equals(parent) ? Locale.ROOT : Locale.forLanguageTag(parent));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1025
                });
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1026
            });
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1027
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1028
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1029
        // check irregular parents
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1030
        for (int i = 0; i < candidates.size(); i++) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1031
            Locale l = candidates.get(i);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1032
            Locale p = childToParentLocaleMap.get(l);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1033
            if (!l.equals(Locale.ROOT) &&
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1034
                Objects.nonNull(p) &&
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1035
                !candidates.get(i+1).equals(p)) {
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1036
                List<Locale> applied = candidates.subList(0, i+1);
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1037
                applied.addAll(applyParentLocales(baseName, defCon.getCandidateLocales(baseName, p)));
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1038
                return applied;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1039
            }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1040
        }
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1041
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1042
        return candidates;
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1043
    }
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1044
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1045
    private static void generateZoneName() throws Exception {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1046
        Files.createDirectories(Paths.get(DESTINATION_DIR, "java", "time", "format"));
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1047
        Files.write(Paths.get(DESTINATION_DIR, "java", "time", "format", "ZoneName.java"),
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1048
            Files.lines(Paths.get(zoneNameTempFile))
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1049
                .flatMap(l -> {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1050
                    if (l.equals("%%%%ZIDMAP%%%%")) {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1051
                        return zidMapEntry();
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1052
                    } else if (l.equals("%%%%MZONEMAP%%%%")) {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1053
                        return handlerMetaZones.mzoneMapEntry();
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1054
                    } else if (l.equals("%%%%DEPRECATED%%%%")) {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1055
                        return handlerSupplMeta.deprecatedMap();
49699
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1056
                    } else if (l.equals("%%%%TZDATALINK%%%%")) {
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1057
                        return tzDataLinkEntry();
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1058
                    } else {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1059
                        return Stream.of(l);
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1060
                    }
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1061
                })
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1062
                .collect(Collectors.toList()),
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1063
            StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1064
    }
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1065
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1066
    private static Stream<String> zidMapEntry() {
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1067
        return ZoneId.getAvailableZoneIds().stream()
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1068
                .map(id -> {
50085
f001977641fb 8202764: api/java_text/SimpleDateFormat/index.html#Format testcases started to fail with JDK11 b12
naoto
parents: 49918
diff changeset
  1069
                    String canonId = canonicalTZMap.getOrDefault(id, id);
49574
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1070
                    String meta = handlerMetaZones.get(canonId);
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1071
                    String zone001 = handlerMetaZones.zidMap().get(meta);
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1072
                    return zone001 == null ? "" :
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1073
                            String.format("        \"%s\", \"%s\", \"%s\",",
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1074
                                            id, meta, zone001);
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1075
                })
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1076
                .filter(s -> !s.isEmpty())
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1077
                .sorted();
6a6ee36037ac 8189784: Parsing with Java 9 AKST timezone returns the SystemV variant of the timezone
naoto
parents: 48251
diff changeset
  1078
    }
49699
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1079
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1080
    private static Stream<String> tzDataLinkEntry() {
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1081
        try {
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1082
            return Files.walk(Paths.get(tzDataDir), 1)
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1083
                .filter(p -> !Files.isDirectory(p))
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1084
                .flatMap(CLDRConverter::extractLinks)
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1085
                .sorted();
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1086
        } catch (IOException e) {
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1087
            throw new UncheckedIOException(e);
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1088
        }
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1089
    }
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1090
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1091
    private static Stream<String> extractLinks(Path tzFile) {
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1092
        try {
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1093
            return Files.lines(tzFile)
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1094
                .filter(l -> l.startsWith("Link"))
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1095
                .map(l -> l.replaceFirst("^Link[\\s]+(\\S+)\\s+(\\S+).*",
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1096
                                         "        \"$2\", \"$1\","));
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1097
        } catch (IOException e) {
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1098
            throw new UncheckedIOException(e);
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1099
        }
5c2cddff67b6 8201507: Generate alias entries in j.t.f.ZoneName from tzdb at build time
naoto
parents: 49574
diff changeset
  1100
    }
51730
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1101
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1102
    // Generate tzmappings for Windows. The format is:
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1103
    //
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1104
    // (Windows Zone Name):(REGION):(Java TZID)
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1105
    //
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1106
    // where:
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1107
    //   Windows Zone Name: arbitrary time zone name string used in Windows
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1108
    //   REGION: ISO3166 or UN M.49 code
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1109
    //   Java TZID: Java's time zone ID
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1110
    //
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1111
    // Note: the entries are alphabetically sorted, *except* the "world" region
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1112
    // code, i.e., "001". It should be the last entry for the same windows time
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1113
    // zone name entries. (cf. TimeZone_md.c)
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1114
    private static void generateWindowsTZMappings() throws Exception {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1115
        Files.createDirectories(Paths.get(DESTINATION_DIR, "windows", "conf"));
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1116
        Files.write(Paths.get(DESTINATION_DIR, "windows", "conf", "tzmappings"),
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1117
            handlerWinZones.keySet().stream()
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1118
                .map(k -> k + ":" + handlerWinZones.get(k) + ":")
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1119
                .sorted(new Comparator<String>() {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1120
                    public int compare(String t1, String t2) {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1121
                        String[] s1 = t1.split(":");
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1122
                        String[] s2 = t2.split(":");
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1123
                        if (s1[0].equals(s2[0])) {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1124
                            if (s1[1].equals("001")) {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1125
                                return 1;
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1126
                            } else if (s2[1].equals("001")) {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1127
                                return -1;
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1128
                            } else {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1129
                                return s1[1].compareTo(s2[1]);
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1130
                            }
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1131
                        } else {
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1132
                            return s1[0].compareTo(s2[0]);
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1133
                        }
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1134
                    }
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1135
                })
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1136
                .collect(Collectors.toList()),
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1137
            StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
cd0775f67ab0 8209167: Use CLDR's time zone mappings for Windows
naoto
parents: 50085
diff changeset
  1138
    }
31263
a81a0af34ca0 8008577: Use CLDR Locale Data by Default
naoto
parents: 26360
diff changeset
  1139
}