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