2222import java .util .SortedMap ;
2323import java .util .TreeMap ;
2424import java .util .TreeSet ;
25+ import org .unicode .props .IndexUnicodeProperties ;
2526
2627public class ScriptTester2 {
2728 private final UnicodeMap <UnicodeSet > toEquivalents ;
@@ -48,7 +49,7 @@ private ScriptTester2(
4849
4950 public static ScriptTester2 getInstance (VersionInfo version , UnicodeSet allowed ) {
5051 allowed = allowed .isFrozen () ? allowed : new UnicodeSet (allowed ).freeze ();
51- CachedProps props = CachedProps . getInstance (version );
52+ var props = IndexUnicodeProperties . make (version );
5253 // System.out.println(new TreeSet(props.getAvailable()));
5354 UnicodeMap <String > confusables = props .getProperty ("Confusable_MA" ).getUnicodeMap ();
5455 UnicodeMap <UnicodeSet > equiv = new UnicodeMap ();
@@ -114,12 +115,12 @@ public static ScriptTester2 getInstance(VersionInfo version, UnicodeSet allowed)
114115 }
115116
116117 public static UnicodeSet getAllowedStatus (VersionInfo version ) {
117- CachedProps props = CachedProps . getInstance (version );
118+ var props = IndexUnicodeProperties . make (version );
118119 return props .getProperty ("Identifier_Status" ).getUnicodeMap ().getSet ("Allowed" ).freeze ();
119120 }
120121
121122 public static UnicodeSet getNFKD_Quick_CheckNo (VersionInfo version ) {
122- CachedProps props = CachedProps . getInstance (version );
123+ var props = IndexUnicodeProperties . make (version );
123124 return props .getProperty ("NFKD_Quick_Check" ).getUnicodeMap ().getSet ("No" ).freeze ();
124125 }
125126
0 commit comments