src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java
author michaelm
Thu, 14 Nov 2019 15:01:49 +0000
branchunixdomainchannels
changeset 59082 5e250ee9259e
parent 54026 3e7fd3fe8411
permissions -rw-r--r--
unixdomainchannels: fix some sockaddr_un address handling
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     1
/*
53458
fb34e6aff623 8217366: ZoneStrings are not populated for all the Locales
naoto
parents: 51763
diff changeset
     2
 * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     4
 *
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    10
 *
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    15
 * accompanied this code).
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    16
 *
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    20
 *
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    23
 * questions.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    24
 */
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    25
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    26
package sun.util.cldr;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    27
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    28
import static sun.util.locale.provider.LocaleProviderAdapter.Type;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    29
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    30
import java.text.MessageFormat;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    31
import java.util.Arrays;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    32
import java.util.Locale;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    33
import java.util.Objects;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    34
import java.util.ResourceBundle;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    35
import java.util.Set;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    36
import java.util.TimeZone;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    37
import java.util.stream.Collectors;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    38
import sun.util.calendar.ZoneInfoFile;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    39
import sun.util.locale.provider.LocaleProviderAdapter;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    40
import sun.util.locale.provider.LocaleResources;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    41
import sun.util.locale.provider.TimeZoneNameProviderImpl;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    42
import sun.util.locale.provider.TimeZoneNameUtility;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    43
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    44
/**
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    45
 * Concrete implementation of the
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    46
 * {@link java.util.spi.TimeZoneNameProvider TimeZoneNameProvider} class
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    47
 * for the CLDR LocaleProviderAdapter.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    48
 *
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    49
 * @author Naoto Sato
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    50
 */
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    51
public class CLDRTimeZoneNameProviderImpl extends TimeZoneNameProviderImpl {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    52
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    53
    private static final String NO_INHERITANCE_MARKER = "\u2205\u2205\u2205";
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    54
    private static class AVAILABLE_IDS {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    55
        static final String[] INSTANCE =
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    56
            Arrays.stream(ZoneInfoFile.getZoneIds())
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    57
                .sorted()
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    58
                .toArray(String[]::new);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    59
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    60
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    61
    // display name array indexes
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    62
    private static final int INDEX_TZID         = 0;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    63
    private static final int INDEX_STD_LONG     = 1;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    64
    private static final int INDEX_STD_SHORT    = 2;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    65
    private static final int INDEX_DST_LONG     = 3;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    66
    private static final int INDEX_DST_SHORT    = 4;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    67
    private static final int INDEX_GEN_LONG     = 5;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    68
    private static final int INDEX_GEN_SHORT    = 6;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    69
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    70
    public CLDRTimeZoneNameProviderImpl(Type type, Set<String> langtags) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    71
        super(type, langtags);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    72
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    73
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    74
    @Override
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    75
    protected String[] getDisplayNameArray(String id, Locale locale) {
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    76
        // Use English for the ROOT locale
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    77
        locale = locale.equals(Locale.ROOT) ? Locale.ENGLISH : locale;
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    78
        String[] namesSuper = super.getDisplayNameArray(id, locale);
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    79
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    80
        if (namesSuper == null) {
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    81
            // try canonical id instead
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    82
            namesSuper = super.getDisplayNameArray(
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    83
                TimeZoneNameUtility.canonicalTZID(id).orElse(id),
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    84
                locale);
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    85
        }
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    86
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    87
        if (namesSuper != null) {
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    88
            // CLDR's resource bundle has an translated entry for this id.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    89
            // Fix up names if needed, either missing or no-inheritance
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    90
            namesSuper[INDEX_TZID] = id;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    91
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    92
            for(int i = INDEX_STD_LONG; i < namesSuper.length; i++) { // index 0 is the 'id' itself
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    93
                switch (namesSuper[i]) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    94
                case "":
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    95
                    // Fill in empty elements
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    96
                    deriveFallbackName(namesSuper, i, locale,
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
    97
                                       !exists(namesSuper, INDEX_DST_LONG));
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    98
                    break;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
    99
                case NO_INHERITANCE_MARKER:
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   100
                    // CLDR's "no inheritance marker"
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   101
                    namesSuper[i] = toGMTFormat(id, i == INDEX_DST_LONG || i == INDEX_DST_SHORT,
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   102
                                                i % 2 != 0, locale);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   103
                    break;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   104
                default:
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   105
                    break;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   106
                }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   107
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   108
            return namesSuper;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   109
        } else {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   110
            // Derive the names for this id. Validate the id first.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   111
            if (Arrays.binarySearch(AVAILABLE_IDS.INSTANCE, id) >= 0) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   112
                String[] names = new String[INDEX_GEN_SHORT + 1];
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   113
                names[INDEX_TZID] = id;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   114
                deriveFallbackNames(names, locale);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   115
                return names;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   116
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   117
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   118
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   119
        return null;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   120
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   121
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   122
    @Override
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   123
    protected String[][] getZoneStrings(Locale locale) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   124
        // Use English for the ROOT locale
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   125
        locale = locale.equals(Locale.ROOT) ? Locale.ENGLISH : locale;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   126
        String[][] ret = super.getZoneStrings(locale);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   127
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   128
        // Fill in for the empty names.
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   129
        // English names are prefilled for performance.
51061
9f310b672b8c 8206980: ZonedDateTime could not parse timezone name with zh_CN locale correctly.
naoto
parents: 50576
diff changeset
   130
        if (!locale.equals(Locale.ENGLISH) &&
9f310b672b8c 8206980: ZonedDateTime could not parse timezone name with zh_CN locale correctly.
naoto
parents: 50576
diff changeset
   131
            !locale.equals(Locale.US)) {
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   132
            for (int zoneIndex = 0; zoneIndex < ret.length; zoneIndex++) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   133
                deriveFallbackNames(ret[zoneIndex], locale);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   134
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   135
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   136
        return ret;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   137
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   138
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   139
    // Derive fallback time zone name according to LDML's logic
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   140
    private void deriveFallbackNames(String[] names, Locale locale) {
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   141
        boolean noDST = !exists(names, INDEX_DST_LONG);
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   142
        for (int i = INDEX_STD_LONG; i <= INDEX_GEN_SHORT; i++) {
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   143
            deriveFallbackName(names, i, locale, noDST);
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   144
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   145
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   146
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   147
    private void deriveFallbackName(String[] names, int index, Locale locale, boolean noDST) {
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   148
        String id = names[INDEX_TZID];
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   149
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   150
        if (exists(names, index)) {
53458
fb34e6aff623 8217366: ZoneStrings are not populated for all the Locales
naoto
parents: 51763
diff changeset
   151
            if (names[index].equals(NO_INHERITANCE_MARKER)) {
fb34e6aff623 8217366: ZoneStrings are not populated for all the Locales
naoto
parents: 51763
diff changeset
   152
                // CLDR's "no inheritance marker"
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   153
                names[index] = toGMTFormat(id,
53458
fb34e6aff623 8217366: ZoneStrings are not populated for all the Locales
naoto
parents: 51763
diff changeset
   154
                                    index == INDEX_DST_LONG || index == INDEX_DST_SHORT,
fb34e6aff623 8217366: ZoneStrings are not populated for all the Locales
naoto
parents: 51763
diff changeset
   155
                                    index % 2 != 0, locale);
fb34e6aff623 8217366: ZoneStrings are not populated for all the Locales
naoto
parents: 51763
diff changeset
   156
            }
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   157
            return;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   158
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   159
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   160
        // Check if COMPAT can substitute the name
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   161
        if (LocaleProviderAdapter.getAdapterPreference().contains(Type.JRE)) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   162
            String[] compatNames = (String[])LocaleProviderAdapter.forJRE()
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   163
                .getLocaleResources(mapChineseLocale(locale))
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   164
                .getTimeZoneNames(id);
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   165
            if (compatNames != null) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   166
                for (int i = INDEX_STD_LONG; i <= INDEX_GEN_SHORT; i++) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   167
                    // Assumes COMPAT has no empty slots
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   168
                    if (i == index || !exists(names, i)) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   169
                        names[i] = compatNames[i];
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   170
                    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   171
                }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   172
                return;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   173
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   174
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   175
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   176
        // Type Fallback
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   177
        if (noDST && typeFallback(names, index)) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   178
            return;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   179
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   180
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   181
        // Region Fallback
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   182
        if (regionFormatFallback(names, index, locale)) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   183
            return;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   184
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   185
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   186
        // last resort
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   187
        if (!id.toUpperCase(Locale.ROOT).startsWith("UT")) {
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   188
            names[index] = toGMTFormat(id,
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   189
                                       index == INDEX_DST_LONG || index == INDEX_DST_SHORT,
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   190
                                       index % 2 != 0,
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   191
                                       locale);
50576
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   192
            // aliases of "GMT" timezone.
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   193
            if ((exists(names, INDEX_STD_LONG)) && (id.startsWith("Etc/")
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   194
                    || id.startsWith("GMT") || id.startsWith("Greenwich"))) {
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   195
                switch (id) {
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   196
                case "Etc/GMT":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   197
                case "Etc/GMT-0":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   198
                case "Etc/GMT+0":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   199
                case "Etc/GMT0":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   200
                case "GMT+0":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   201
                case "GMT-0":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   202
                case "GMT0":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   203
                case "Greenwich":
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   204
                    names[INDEX_DST_LONG] = names[INDEX_GEN_LONG] = names[INDEX_STD_LONG];
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   205
                    break;
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   206
                }
374bd919d8fe 8202537: CLDR33
rgoel
parents: 49904
diff changeset
   207
            }
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   208
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   209
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   210
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   211
    private boolean exists(String[] names, int index) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   212
        return Objects.nonNull(names)
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   213
                && Objects.nonNull(names[index])
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   214
                && !names[index].isEmpty();
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   215
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   216
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   217
    private boolean typeFallback(String[] names, int index) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   218
        // check generic
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   219
        int genIndex = INDEX_GEN_SHORT - index % 2;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   220
        if (!exists(names, index) && exists(names, genIndex)) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   221
            names[index] = names[genIndex];
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   222
        } else {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   223
            // check standard
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   224
            int stdIndex = INDEX_STD_SHORT - index % 2;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   225
            if (!exists(names, index) && exists(names, stdIndex)) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   226
                names[index] = names[stdIndex];
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   227
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   228
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   229
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   230
        return exists(names, index);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   231
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   232
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   233
    private boolean regionFormatFallback(String[] names, int index, Locale l) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   234
        String id = names[INDEX_TZID];
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   235
        LocaleResources lr = LocaleProviderAdapter.forType(Type.CLDR).getLocaleResources(l);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   236
        ResourceBundle fd = lr.getJavaTimeFormatData();
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   237
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   238
        String rgn = (String) lr.getTimeZoneNames("timezone.excity." + id);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   239
        if (rgn == null && !id.startsWith("Etc") && !id.startsWith("SystemV")) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   240
            int slash = id.lastIndexOf('/');
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   241
            if (slash > 0) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   242
                rgn = id.substring(slash + 1).replaceAll("_", " ");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   243
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   244
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   245
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   246
        if (rgn != null) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   247
            String fmt = "";
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   248
            switch (index) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   249
            case INDEX_STD_LONG:
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   250
                fmt = fd.getString("timezone.regionFormat.standard");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   251
                break;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   252
            case INDEX_DST_LONG:
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   253
                fmt = fd.getString("timezone.regionFormat.daylight");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   254
                break;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   255
            case INDEX_GEN_LONG:
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   256
                fmt = fd.getString("timezone.regionFormat");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   257
                break;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   258
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   259
            if (!fmt.isEmpty()) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   260
                names[index] = MessageFormat.format(fmt, rgn);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   261
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   262
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   263
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   264
        return exists(names, index);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   265
    }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   266
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   267
    private String toGMTFormat(String id, boolean daylight, boolean isShort, Locale l) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   268
        TimeZone tz = ZoneInfoFile.getZoneInfo(id);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   269
        int offset = (tz.getRawOffset() + (daylight ? tz.getDSTSavings() : 0)) / 60000;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   270
        LocaleResources lr = LocaleProviderAdapter.forType(Type.CLDR).getLocaleResources(l);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   271
        ResourceBundle fd = lr.getJavaTimeFormatData();
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   272
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   273
        if (offset == 0) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   274
            return fd.getString("timezone.gmtZeroFormat");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   275
        } else {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   276
            String gmtFormat = fd.getString("timezone.gmtFormat");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   277
            String hourFormat = fd.getString("timezone.hourFormat");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   278
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   279
            if (offset > 0) {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   280
                hourFormat = hourFormat.substring(0, hourFormat.indexOf(";"));
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   281
            } else {
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   282
                hourFormat = hourFormat.substring(hourFormat.indexOf(";") + 1);
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   283
                offset = -offset;
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   284
            }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   285
            hourFormat = hourFormat
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   286
                .replaceFirst("H+", (isShort ? "\\%1\\$d" : "\\%1\\$02d"))
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   287
                .replaceFirst("m+", "\\%2\\$02d");
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   288
            return MessageFormat.format(gmtFormat,
51763
caef940517be 8210490: TimeZone.getDisplayName given Locale.US doesn't always honor the Locale.
rgoel
parents: 51061
diff changeset
   289
                    String.format(l, hourFormat, offset / 60, offset % 60));
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   290
        }
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   291
    }
54026
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   292
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   293
    // Mapping CLDR's Simplified/Traditional Chinese resources
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   294
    // to COMPAT's zh-CN/TW
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   295
    private Locale mapChineseLocale(Locale locale) {
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   296
        if (locale.getLanguage() == "zh") {
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   297
            switch (locale.getScript()) {
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   298
                case "Hans":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   299
                    return Locale.CHINA;
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   300
                case "Hant":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   301
                    return Locale.TAIWAN;
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   302
                case "":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   303
                    // no script, guess from country code.
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   304
                    switch (locale.getCountry()) {
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   305
                        case "":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   306
                        case "CN":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   307
                        case "SG":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   308
                            return Locale.CHINA;
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   309
                        case "HK":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   310
                        case "MO":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   311
                        case "TW":
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   312
                            return Locale.TAIWAN;
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   313
                    }
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   314
                    break;
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   315
            }
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   316
        }
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   317
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   318
        // no need to map
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   319
        return locale;
3e7fd3fe8411 8218948: SimpleDateFormat :: format - Zone Names are not reflected correctly during run time
naoto
parents: 53458
diff changeset
   320
    }
49904
cadca99d52e7 8181157: CLDR Timezone name fallback implementation
naoto
parents:
diff changeset
   321
}