From 9fa05c25c96f1c9f0af520dd46a86ac6a476ef91 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Mon, 26 Sep 2016 22:17:21 +0100 Subject: [PATCH] API changes for updating Locale to OpenJDK8u60, part 2 This adds APIs for RFC 4647 Matching of Language Tags Bug: 29935305 Test: make update-api Change-Id: I58fc9481578a63ecd9528a62377fa9414cc836d4 --- api/current.txt | 28 ++++++++++++++++++++++++++++ api/system-current.txt | 28 ++++++++++++++++++++++++++++ api/test-current.txt | 28 ++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/api/current.txt b/api/current.txt index 2788f3648eb66..54bbc227cf0aa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -59296,6 +59296,10 @@ package java.util { ctor public Locale(java.lang.String, java.lang.String); ctor public Locale(java.lang.String); method public java.lang.Object clone(); + method public static java.util.List filter(java.util.List, java.util.Collection, java.util.Locale.FilteringMode); + method public static java.util.List filter(java.util.List, java.util.Collection); + method public static java.util.List filterTags(java.util.List, java.util.Collection, java.util.Locale.FilteringMode); + method public static java.util.List filterTags(java.util.List, java.util.Collection); method public static java.util.Locale forLanguageTag(java.lang.String); method public static java.util.Locale[] getAvailableLocales(); method public java.lang.String getCountry(); @@ -59324,6 +59328,8 @@ package java.util { method public java.lang.String getUnicodeLocaleType(java.lang.String); method public java.lang.String getVariant(); method public boolean hasExtensions(); + method public static java.util.Locale lookup(java.util.List, java.util.Collection); + method public static java.lang.String lookupTag(java.util.List, java.util.Collection); method public static synchronized void setDefault(java.util.Locale); method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale); method public java.util.Locale stripExtensions(); @@ -59379,6 +59385,28 @@ package java.util { enum_constant public static final java.util.Locale.Category FORMAT; } + public static final class Locale.FilteringMode extends java.lang.Enum { + method public static java.util.Locale.FilteringMode valueOf(java.lang.String); + method public static final java.util.Locale.FilteringMode[] values(); + enum_constant public static final java.util.Locale.FilteringMode AUTOSELECT_FILTERING; + enum_constant public static final java.util.Locale.FilteringMode EXTENDED_FILTERING; + enum_constant public static final java.util.Locale.FilteringMode IGNORE_EXTENDED_RANGES; + enum_constant public static final java.util.Locale.FilteringMode MAP_EXTENDED_RANGES; + enum_constant public static final java.util.Locale.FilteringMode REJECT_EXTENDED_RANGES; + } + + public static final class Locale.LanguageRange { + ctor public Locale.LanguageRange(java.lang.String); + ctor public Locale.LanguageRange(java.lang.String, double); + method public java.lang.String getRange(); + method public double getWeight(); + method public static java.util.List mapEquivalents(java.util.List, java.util.Map>); + method public static java.util.List parse(java.lang.String); + method public static java.util.List parse(java.lang.String, java.util.Map>); + field public static final double MAX_WEIGHT = 1.0; + field public static final double MIN_WEIGHT = 0.0; + } + public class LongSummaryStatistics implements java.util.function.IntConsumer java.util.function.LongConsumer { ctor public LongSummaryStatistics(); method public void accept(int); diff --git a/api/system-current.txt b/api/system-current.txt index 74b1af306657f..a0aebfc845452 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -62857,6 +62857,10 @@ package java.util { ctor public Locale(java.lang.String, java.lang.String); ctor public Locale(java.lang.String); method public java.lang.Object clone(); + method public static java.util.List filter(java.util.List, java.util.Collection, java.util.Locale.FilteringMode); + method public static java.util.List filter(java.util.List, java.util.Collection); + method public static java.util.List filterTags(java.util.List, java.util.Collection, java.util.Locale.FilteringMode); + method public static java.util.List filterTags(java.util.List, java.util.Collection); method public static java.util.Locale forLanguageTag(java.lang.String); method public static java.util.Locale[] getAvailableLocales(); method public java.lang.String getCountry(); @@ -62885,6 +62889,8 @@ package java.util { method public java.lang.String getUnicodeLocaleType(java.lang.String); method public java.lang.String getVariant(); method public boolean hasExtensions(); + method public static java.util.Locale lookup(java.util.List, java.util.Collection); + method public static java.lang.String lookupTag(java.util.List, java.util.Collection); method public static synchronized void setDefault(java.util.Locale); method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale); method public java.util.Locale stripExtensions(); @@ -62940,6 +62946,28 @@ package java.util { enum_constant public static final java.util.Locale.Category FORMAT; } + public static final class Locale.FilteringMode extends java.lang.Enum { + method public static java.util.Locale.FilteringMode valueOf(java.lang.String); + method public static final java.util.Locale.FilteringMode[] values(); + enum_constant public static final java.util.Locale.FilteringMode AUTOSELECT_FILTERING; + enum_constant public static final java.util.Locale.FilteringMode EXTENDED_FILTERING; + enum_constant public static final java.util.Locale.FilteringMode IGNORE_EXTENDED_RANGES; + enum_constant public static final java.util.Locale.FilteringMode MAP_EXTENDED_RANGES; + enum_constant public static final java.util.Locale.FilteringMode REJECT_EXTENDED_RANGES; + } + + public static final class Locale.LanguageRange { + ctor public Locale.LanguageRange(java.lang.String); + ctor public Locale.LanguageRange(java.lang.String, double); + method public java.lang.String getRange(); + method public double getWeight(); + method public static java.util.List mapEquivalents(java.util.List, java.util.Map>); + method public static java.util.List parse(java.lang.String); + method public static java.util.List parse(java.lang.String, java.util.Map>); + field public static final double MAX_WEIGHT = 1.0; + field public static final double MIN_WEIGHT = 0.0; + } + public class LongSummaryStatistics implements java.util.function.IntConsumer java.util.function.LongConsumer { ctor public LongSummaryStatistics(); method public void accept(int); diff --git a/api/test-current.txt b/api/test-current.txt index 8e3d4ef6cbadc..0747aa336c4e8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -59387,6 +59387,10 @@ package java.util { ctor public Locale(java.lang.String, java.lang.String); ctor public Locale(java.lang.String); method public java.lang.Object clone(); + method public static java.util.List filter(java.util.List, java.util.Collection, java.util.Locale.FilteringMode); + method public static java.util.List filter(java.util.List, java.util.Collection); + method public static java.util.List filterTags(java.util.List, java.util.Collection, java.util.Locale.FilteringMode); + method public static java.util.List filterTags(java.util.List, java.util.Collection); method public static java.util.Locale forLanguageTag(java.lang.String); method public static java.util.Locale[] getAvailableLocales(); method public java.lang.String getCountry(); @@ -59415,6 +59419,8 @@ package java.util { method public java.lang.String getUnicodeLocaleType(java.lang.String); method public java.lang.String getVariant(); method public boolean hasExtensions(); + method public static java.util.Locale lookup(java.util.List, java.util.Collection); + method public static java.lang.String lookupTag(java.util.List, java.util.Collection); method public static synchronized void setDefault(java.util.Locale); method public static synchronized void setDefault(java.util.Locale.Category, java.util.Locale); method public java.util.Locale stripExtensions(); @@ -59470,6 +59476,28 @@ package java.util { enum_constant public static final java.util.Locale.Category FORMAT; } + public static final class Locale.FilteringMode extends java.lang.Enum { + method public static java.util.Locale.FilteringMode valueOf(java.lang.String); + method public static final java.util.Locale.FilteringMode[] values(); + enum_constant public static final java.util.Locale.FilteringMode AUTOSELECT_FILTERING; + enum_constant public static final java.util.Locale.FilteringMode EXTENDED_FILTERING; + enum_constant public static final java.util.Locale.FilteringMode IGNORE_EXTENDED_RANGES; + enum_constant public static final java.util.Locale.FilteringMode MAP_EXTENDED_RANGES; + enum_constant public static final java.util.Locale.FilteringMode REJECT_EXTENDED_RANGES; + } + + public static final class Locale.LanguageRange { + ctor public Locale.LanguageRange(java.lang.String); + ctor public Locale.LanguageRange(java.lang.String, double); + method public java.lang.String getRange(); + method public double getWeight(); + method public static java.util.List mapEquivalents(java.util.List, java.util.Map>); + method public static java.util.List parse(java.lang.String); + method public static java.util.List parse(java.lang.String, java.util.Map>); + field public static final double MAX_WEIGHT = 1.0; + field public static final double MIN_WEIGHT = 0.0; + } + public class LongSummaryStatistics implements java.util.function.IntConsumer java.util.function.LongConsumer { ctor public LongSummaryStatistics(); method public void accept(int);