Skip to content

Commit cf7b302

Browse files
authored
Fix Jsp versioning (#499)
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
1 parent 763c03b commit cf7b302

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.google.common.collect.ImmutableMultimap;
66
import com.google.common.collect.Multimap;
77
import com.ibm.icu.dev.util.UnicodeMap;
8+
import com.ibm.icu.lang.UCharacter;
89
import com.ibm.icu.util.ICUUncheckedIOException;
910
import com.ibm.icu.util.VersionInfo;
1011
import java.io.DataInputStream;
@@ -26,7 +27,6 @@
2627
import org.unicode.cldr.draft.FileUtilities;
2728
import org.unicode.jsp.UnicodeDataInput.ItemReader;
2829
import org.unicode.props.UnicodeProperty;
29-
import org.unicode.text.utility.Settings;
3030

3131
public class CachedProps {
3232
public static final boolean IS_BETA = true;
@@ -44,8 +44,7 @@ public class CachedProps {
4444
final BiMultimap<String, String> nameToAliases = new BiMultimap<String, String>(null, null);
4545
final Map<String, BiMultimap<String, String>> nameToValueToAliases = new LinkedHashMap();
4646

47-
static String jspVersion = IS_BETA ? Settings.lastVersion : Settings.latestVersion;
48-
static VersionInfo jspVersionInfo = VersionInfo.getInstance(jspVersion);
47+
static VersionInfo jspVersionInfo = UCharacter.getUnicodeVersion();
4948
static CachedProps CACHED_PROPS = getInstance(jspVersionInfo);
5049

5150
static UnicodeProperty NAMES = CachedProps.CACHED_PROPS.getProperty("Name");

UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeJsp.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.unicode.idna.Idna2008;
2626
import org.unicode.idna.Uts46;
2727
import org.unicode.jsp.UnicodeUtilities.CodePointShower;
28+
import org.unicode.text.utility.Settings;
2829

2930
public class UnicodeJsp {
3031

@@ -420,7 +421,7 @@ public static String getVersions() {
420421
: "<p style='border: 1pt solid red;'>Properties use ICU for Unicode V"
421422
+ UCharacter.getUnicodeVersion().getVersionString(2, 2)
422423
+ "; the beta properties support Unicode V"
423-
+ CachedProps.CACHED_PROPS.version.getVersionString(2, 2)
424+
+ VersionInfo.getInstance(Settings.latestVersion).getVersionString(2, 2)
424425
+ "&beta;. "
425426
+ "For more information, see <a target='help' href='https://unicode-org.github.io/unicodetools/help/changes'>Unicode Utilities Beta</a>.</p>";
426427

0 commit comments

Comments
 (0)