From 674ee4d5d0fad92ee678cab52fc55ac23c05f1b9 Mon Sep 17 00:00:00 2001 From: Stanislav Spiridonov Date: Tue, 26 Dec 2023 13:00:10 +0100 Subject: [PATCH] Update CLDR to 44 --- pom/pom.xml | 66 +++++++++---------- .../SimpleDateTimeFormatStyleProvider.java | 29 ++++---- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/pom/pom.xml b/pom/pom.xml index 76dee8b0a..53be5e128 100644 --- a/pom/pom.xml +++ b/pom/pom.xml @@ -115,11 +115,11 @@ - + - BSD-3-Clause - https://raw.githubusercontent.com/ThreeTen/threetenbp/main/LICENSE.txt + BSD-3-Clause + https://raw.githubusercontent.com/ThreeTen/threetenbp/main/LICENSE.txt repo @@ -334,37 +334,37 @@ - - + 3.3.0 + 3.12.0 + 3.2.1 + 3.0.0-M7 + 3.0.0-M7 + 3.1.0 --> + + 1.2 1.1 1.0.2-gwt2.8.2 - 2.0.13 + 2.0.14 1.0.5 - 1.0.5 + 1.0.6 1.0.3 - 11 + 11 diff --git a/time/src/main/java/org/jresearch/threetenbp/gwt/emu/java/time/format/SimpleDateTimeFormatStyleProvider.java b/time/src/main/java/org/jresearch/threetenbp/gwt/emu/java/time/format/SimpleDateTimeFormatStyleProvider.java index b8703287e..f09742c63 100644 --- a/time/src/main/java/org/jresearch/threetenbp/gwt/emu/java/time/format/SimpleDateTimeFormatStyleProvider.java +++ b/time/src/main/java/org/jresearch/threetenbp/gwt/emu/java/time/format/SimpleDateTimeFormatStyleProvider.java @@ -42,7 +42,10 @@ import org.jresearch.gwt.time.apt.base.Bases; import org.jresearch.gwt.time.apt.base.Chrono; import org.jresearch.gwt.time.apt.data.client.PatternCoordinates; -import org.jresearch.gwt.time.apt.data.client.PatternInfo; +import org.jresearch.gwt.time.apt.data.client.PatternInfoFull; +import org.jresearch.gwt.time.apt.data.client.PatternInfoLong; +import org.jresearch.gwt.time.apt.data.client.PatternInfoMedium; +import org.jresearch.gwt.time.apt.data.client.PatternInfoShort; import org.jresearch.threetenbp.gwt.emu.java.time.chrono.Chronology; import org.jresearch.threetenbp.gwt.emu.org.jresearch.threetenbp.gwt.time.client.Support; @@ -143,13 +146,13 @@ private static Locale up(Locale locale) { private static Map getTimeMap(FormatStyle style) { switch (style) { case FULL: - return PatternInfo.TIME_FULL_PATTERNS; + return PatternInfoFull.TIME_PATTERNS; case LONG: - return PatternInfo.TIME_LONG_PATTERNS; + return PatternInfoLong.TIME_PATTERNS; case MEDIUM: - return PatternInfo.TIME_MEDIUM_PATTERNS; + return PatternInfoMedium.TIME_PATTERNS; case SHORT: - return PatternInfo.TIME_SHORT_PATTERNS; + return PatternInfoShort.TIME_PATTERNS; default: throw new IllegalArgumentException("Unsupported FormatStyle: " + style); } @@ -158,13 +161,13 @@ private static Map getTimeMap(FormatStyle style) { private static Map getDateMap(FormatStyle style) { switch (style) { case FULL: - return PatternInfo.DATE_FULL_PATTERNS; + return PatternInfoFull.DATE_PATTERNS; case LONG: - return PatternInfo.DATE_LONG_PATTERNS; + return PatternInfoLong.DATE_PATTERNS; case MEDIUM: - return PatternInfo.DATE_MEDIUM_PATTERNS; + return PatternInfoMedium.DATE_PATTERNS; case SHORT: - return PatternInfo.DATE_SHORT_PATTERNS; + return PatternInfoShort.DATE_PATTERNS; default: throw new IllegalArgumentException("Unsupported FormatStyle: " + style); } @@ -173,13 +176,13 @@ private static Map getDateMap(FormatStyle style) { private static Map getDateTimeMap(FormatStyle style) { switch (style) { case FULL: - return PatternInfo.DATE_TIME_FULL_PATTERNS; + return PatternInfoFull.DATE_TIME_PATTERNS; case LONG: - return PatternInfo.DATE_TIME_LONG_PATTERNS; + return PatternInfoLong.DATE_TIME_PATTERNS; case MEDIUM: - return PatternInfo.DATE_TIME_MEDIUM_PATTERNS; + return PatternInfoMedium.DATE_TIME_PATTERNS; case SHORT: - return PatternInfo.DATE_TIME_SHORT_PATTERNS; + return PatternInfoShort.DATE_TIME_PATTERNS; default: throw new IllegalArgumentException("Unsupported FormatStyle: " + style); }