From 6aa4efd552846c28f716007cf734130005bf1f2e Mon Sep 17 00:00:00 2001 From: Miroslav Pokorny Date: Thu, 19 Dec 2019 11:32:23 +1100 Subject: [PATCH] Era.displayName removed - Working towards elimination of Locale from public APIS --- src/main/java/org/threeten/bp/chrono/Era.java | 2 +- src/main/java/org/threeten/bp/chrono/HijrahEra.java | 8 ++++---- src/main/java/org/threeten/bp/chrono/IsoEra.java | 8 ++++---- src/main/java/org/threeten/bp/chrono/MinguoEra.java | 8 ++++---- src/main/java/org/threeten/bp/chrono/ThaiBuddhistEra.java | 8 ++++---- .../java/org/threeten/bp/jdk8/DefaultInterfaceEra.java | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/threeten/bp/chrono/Era.java b/src/main/java/org/threeten/bp/chrono/Era.java index 529ccb88d..a1bcda2b6 100644 --- a/src/main/java/org/threeten/bp/chrono/Era.java +++ b/src/main/java/org/threeten/bp/chrono/Era.java @@ -90,6 +90,6 @@ public interface Era extends TemporalAccessor, TemporalAdjuster { * @param locale the locale to use, not null * @return the text value of the era, not null */ - String getDisplayName(TextStyle style, Locale locale); + //String getDisplayName(TextStyle style, Locale locale); } diff --git a/src/main/java/org/threeten/bp/chrono/HijrahEra.java b/src/main/java/org/threeten/bp/chrono/HijrahEra.java index 172e50363..e6bb9a976 100644 --- a/src/main/java/org/threeten/bp/chrono/HijrahEra.java +++ b/src/main/java/org/threeten/bp/chrono/HijrahEra.java @@ -170,10 +170,10 @@ public R query(TemporalQuery query) { } //----------------------------------------------------------------------- - @Override - public String getDisplayName(TextStyle style, Locale locale) { - return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); - } +// @Override +// public String getDisplayName(TextStyle style, Locale locale) { +// return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); +// } /** * Returns the proleptic year from this era and year of era. diff --git a/src/main/java/org/threeten/bp/chrono/IsoEra.java b/src/main/java/org/threeten/bp/chrono/IsoEra.java index aef4e8254..29ad5c9e2 100644 --- a/src/main/java/org/threeten/bp/chrono/IsoEra.java +++ b/src/main/java/org/threeten/bp/chrono/IsoEra.java @@ -170,9 +170,9 @@ public R query(TemporalQuery query) { } //----------------------------------------------------------------------- - @Override - public String getDisplayName(TextStyle style, Locale locale) { - return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); - } +// @Override +// public String getDisplayName(TextStyle style, Locale locale) { +// return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); +// } } diff --git a/src/main/java/org/threeten/bp/chrono/MinguoEra.java b/src/main/java/org/threeten/bp/chrono/MinguoEra.java index 0403946b0..1a70b004f 100644 --- a/src/main/java/org/threeten/bp/chrono/MinguoEra.java +++ b/src/main/java/org/threeten/bp/chrono/MinguoEra.java @@ -170,10 +170,10 @@ public R query(TemporalQuery query) { } //----------------------------------------------------------------------- - @Override - public String getDisplayName(TextStyle style, Locale locale) { - return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); - } +// @Override +// public String getDisplayName(TextStyle style, Locale locale) { +// return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); +// } //----------------------------------------------------------------------- @GwtIncompatible diff --git a/src/main/java/org/threeten/bp/chrono/ThaiBuddhistEra.java b/src/main/java/org/threeten/bp/chrono/ThaiBuddhistEra.java index 4df9403f2..091a7c170 100644 --- a/src/main/java/org/threeten/bp/chrono/ThaiBuddhistEra.java +++ b/src/main/java/org/threeten/bp/chrono/ThaiBuddhistEra.java @@ -169,10 +169,10 @@ public R query(TemporalQuery query) { } //----------------------------------------------------------------------- - @Override - public String getDisplayName(TextStyle style, Locale locale) { - return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); - } +// @Override +// public String getDisplayName(TextStyle style, Locale locale) { +// return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); +// } //----------------------------------------------------------------------- @GwtIncompatible diff --git a/src/main/java/org/threeten/bp/jdk8/DefaultInterfaceEra.java b/src/main/java/org/threeten/bp/jdk8/DefaultInterfaceEra.java index 5ab4a5fd9..c8c50ce7a 100644 --- a/src/main/java/org/threeten/bp/jdk8/DefaultInterfaceEra.java +++ b/src/main/java/org/threeten/bp/jdk8/DefaultInterfaceEra.java @@ -106,9 +106,9 @@ public R query(TemporalQuery query) { } //----------------------------------------------------------------------- - @Override - public String getDisplayName(TextStyle style, Locale locale) { - return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); - } +// @Override +// public String getDisplayName(TextStyle style, Locale locale) { +// return new DateTimeFormatterBuilder().appendText(ERA, style).toFormatter(locale).format(this); +// } }