Skip to content

Commit 202077c

Browse files
authored
Use IndexUnicodeProperties in the JSPs (#659)
1 parent 709e4c4 commit 202077c

File tree

21 files changed

+643
-584
lines changed

21 files changed

+643
-584
lines changed

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

Lines changed: 0 additions & 288 deletions
This file was deleted.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.SortedMap;
2323
import java.util.TreeMap;
2424
import java.util.TreeSet;
25+
import org.unicode.props.IndexUnicodeProperties;
2526

2627
public 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

Comments
 (0)