From cf7b302fe91635b035285f821cd4142ebae65540 Mon Sep 17 00:00:00 2001 From: Josh Hadley <51727949+josh-hadley@users.noreply.github.com> Date: Wed, 14 Jun 2023 09:02:46 -0700 Subject: [PATCH] Fix Jsp versioning (#499) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per discussion in unicodetools meeting 13 June 2023: - "The beta version string should just use Settings.latestVersion" — updated UnicodeJsp.java to use Settings.latestVersion - "The jspVersionInfo should use UCharacter.getUnicodeVersion() to match what it serves — as long as it serves ICU property values" — reworked CachedProps.java to use UCharacter.getInstance for jspVersionInfo --- UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java | 5 ++--- UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeJsp.java | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java b/UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java index 8e52500eb..35e845d58 100644 --- a/UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java +++ b/UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java @@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.ibm.icu.dev.util.UnicodeMap; +import com.ibm.icu.lang.UCharacter; import com.ibm.icu.util.ICUUncheckedIOException; import com.ibm.icu.util.VersionInfo; import java.io.DataInputStream; @@ -26,7 +27,6 @@ import org.unicode.cldr.draft.FileUtilities; import org.unicode.jsp.UnicodeDataInput.ItemReader; import org.unicode.props.UnicodeProperty; -import org.unicode.text.utility.Settings; public class CachedProps { public static final boolean IS_BETA = true; @@ -44,8 +44,7 @@ public class CachedProps { final BiMultimap nameToAliases = new BiMultimap(null, null); final Map> nameToValueToAliases = new LinkedHashMap(); - static String jspVersion = IS_BETA ? Settings.lastVersion : Settings.latestVersion; - static VersionInfo jspVersionInfo = VersionInfo.getInstance(jspVersion); + static VersionInfo jspVersionInfo = UCharacter.getUnicodeVersion(); static CachedProps CACHED_PROPS = getInstance(jspVersionInfo); static UnicodeProperty NAMES = CachedProps.CACHED_PROPS.getProperty("Name"); diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeJsp.java b/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeJsp.java index e2390b720..8d514843a 100644 --- a/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeJsp.java +++ b/UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeJsp.java @@ -25,6 +25,7 @@ import org.unicode.idna.Idna2008; import org.unicode.idna.Uts46; import org.unicode.jsp.UnicodeUtilities.CodePointShower; +import org.unicode.text.utility.Settings; public class UnicodeJsp { @@ -420,7 +421,7 @@ public static String getVersions() { : "

Properties use ICU for Unicode V" + UCharacter.getUnicodeVersion().getVersionString(2, 2) + "; the beta properties support Unicode V" - + CachedProps.CACHED_PROPS.version.getVersionString(2, 2) + + VersionInfo.getInstance(Settings.latestVersion).getVersionString(2, 2) + "β. " + "For more information, see Unicode Utilities Beta.

";