Use IndexUnicodeProperties in the JSPs (#659)

unicode-org · Jan 30, 2024 · 202077c · 202077c
1 parent 709e4c4
commit 202077c
Show file tree

Hide file tree

Showing 21 changed files with 643 additions and 584 deletions.
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java b/UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java
diff --git a/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester2.java b/UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester2.java
@@ -22,6 +22,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import org.unicode.props.IndexUnicodeProperties;
 
 public class ScriptTester2 {
     private final UnicodeMap<UnicodeSet> toEquivalents;
@@ -48,7 +49,7 @@ private ScriptTester2(
 
     public static ScriptTester2 getInstance(VersionInfo version, UnicodeSet allowed) {
         allowed = allowed.isFrozen() ? allowed : new UnicodeSet(allowed).freeze();
-        CachedProps props = CachedProps.getInstance(version);
+        var props = IndexUnicodeProperties.make(version);
         // System.out.println(new TreeSet(props.getAvailable()));
         UnicodeMap<String> confusables = props.getProperty("Confusable_MA").getUnicodeMap();
         UnicodeMap<UnicodeSet> equiv = new UnicodeMap();
@@ -114,12 +115,12 @@ public static ScriptTester2 getInstance(VersionInfo version, UnicodeSet allowed)
     }
 
     public static UnicodeSet getAllowedStatus(VersionInfo version) {
-        CachedProps props = CachedProps.getInstance(version);
+        var props = IndexUnicodeProperties.make(version);
         return props.getProperty("Identifier_Status").getUnicodeMap().getSet("Allowed").freeze();
     }
 
     public static UnicodeSet getNFKD_Quick_CheckNo(VersionInfo version) {
-        CachedProps props = CachedProps.getInstance(version);
+        var props = IndexUnicodeProperties.make(version);
         return props.getProperty("NFKD_Quick_Check").getUnicodeMap().getSet("No").freeze();
     }