--- old/make/data/lsrdata/language-subtag-registry.txt 2020-03-17 11:56:34.000000000 -0700 +++ new/make/data/lsrdata/language-subtag-registry.txt 2020-03-17 11:56:33.000000000 -0700 @@ -1,4 +1,4 @@ -File-Date: 2019-09-16 +File-Date: 2020-03-16 %% Type: language Subtag: aa @@ -47129,6 +47129,16 @@ Creole continuum in Eastern Suriname and Western French Guiana %% Type: variant +Subtag: peano +Description: Latino Sine Flexione +Description: Interlingua de API +Description: Interlingua de Peano +Prefix: la +Comments: Peano’s Interlingua, created in 1903 by Giuseppe Peano as an + international auxiliary language +Added: 2020-03-12 +%% +Type: variant Subtag: petr1708 Description: Petrine orthography Added: 2010-10-10 --- old/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java 2020-03-17 11:56:35.000000000 -0700 +++ new/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java 2020-03-17 11:56:35.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -215,10 +215,7 @@ + " static final Map multiEquivsMap;\n" + " static final Map regionVariantEquivMap;\n\n" + " static {\n" - + " singleEquivMap = new HashMap<>();\n" - + " multiEquivsMap = new HashMap<>();\n" - + " regionVariantEquivMap = new HashMap<>();\n\n" - + " // This is an auto-generated file and should not be manually edited.\n"; + + " singleEquivMap = new HashMap<>("; private static final String footerText = " }\n\n" @@ -242,6 +239,12 @@ Paths.get(fileName))) { writer.write(getOpenJDKCopyright()); writer.write(headerText + + (int)(sortedLanguageMap1.size() / 0.75f + 1) + ");\n" + + " multiEquivsMap = new HashMap<>(" + + (int)(sortedLanguageMap2.size() / 0.75f + 1) + ");\n" + + " regionVariantEquivMap = new HashMap<>(" + + (int)(sortedRegionVariantMap.size() / 0.75f + 1) + ");\n\n" + + " // This is an auto-generated file and should not be manually edited.\n" + " // LSR Revision: " + LSRrevisionDate); writer.newLine(); --- old/test/jdk/java/util/Locale/Bug8040211.java 2020-03-17 11:56:36.000000000 -0700 +++ new/test/jdk/java/util/Locale/Bug8040211.java 2020-03-17 11:56:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,9 +23,9 @@ /* * @test - * @bug 8040211 8191404 8203872 8222980 8225435 + * @bug 8040211 8191404 8203872 8222980 8225435 8241082 * @summary Checks the IANA language subtag registry data update - * (LSR Revision: 2019-09-16) with Locale and Locale.LanguageRange + * (LSR Revision: 2020-03-16) with Locale and Locale.LanguageRange * class methods. * @run main Bug8040211 */