Skip to content

Commit 58c94dc

Browse files
macchiatimacchiati
authored
More Settings cleanup. (#34)
* More Settings cleanup. Re-indented Settings.java, and left TODO referring to the CLDR cleanup ticket. Replaced failing compiles because of CLDR changes in 3 files. * The EMPTY_COLUMNS is so that we have the same number of tab columns on each line, displaying better in github
1 parent a653b2a commit 58c94dc

File tree

5 files changed

+43
-32
lines changed

5 files changed

+43
-32
lines changed

‎unicodetools/org/unicode/draft/GeneratePickerData2.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.unicode.cldr.util.CLDRPaths;
4040
import org.unicode.cldr.util.CLDRTool;
4141
import org.unicode.draft.GeneratePickerData2.CategoryTable.Separation;
42+
import org.unicode.text.utility.Settings;
4243

4344
import com.ibm.icu.lang.UCharacter;
4445
import com.ibm.icu.lang.UProperty;
@@ -161,7 +162,7 @@ public int compare(String o1, String o2) {
161162
enum MyOptions {
162163
output(".*", CLDRPaths.BASE_DIRECTORY + "tools/java/org/unicode/cldr/draft/picker/",
163164
"output data directory"),
164-
unicodedata(".*", CLDRPaths.UCD_DATA_DIRECTORY, "Unicode Data directory"),
165+
unicodedata(".*", Settings.UCD_DATA_DIRECTORY, "Unicode Data directory"),
165166
verbose(null, null, "verbose debugging messages"),
166167
korean(null, null, "generate korean hangul defectives instead"), ;
167168
// boilerplate

‎unicodetools/org/unicode/draft/IdnaLabelTester2.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ public IdnaLabelTester2(String file) throws IOException {
222222

223223
public static XEquivalenceClass<String, String> getConfusables() throws IOException {
224224
XEquivalenceClass<String, String> result = new XEquivalenceClass<String, String>();
225-
BufferedReader in = openFile(CLDRPaths.UCD_DATA_DIRECTORY + "security/" + Settings.latestVersion + "/confusables.txt");
225+
BufferedReader in = openFile(Settings.UCD_DATA_DIRECTORY + "security/" + Settings.latestVersion + "/confusables.txt");
226226
String original = null;
227227
try {
228228
while (true) {

‎unicodetools/org/unicode/draft/RadicalStroke2.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.unicode.cldr.util.CLDRPaths;
1414
import org.unicode.cldr.util.CldrUtility;
1515
import org.unicode.cldr.util.PatternCache;
16+
import org.unicode.text.utility.Settings;
1617

1718
import com.ibm.icu.dev.util.UnicodeMap;
1819
import com.ibm.icu.text.UnicodeSet;
@@ -44,7 +45,7 @@ private RadicalStroke2() {
4445
Matcher iiCore = IICORE.matcher("");
4546
radStrokesToRadToRemainingStrokes = new TreeMap<Integer, Map<String, Map<Integer, UnicodeSet>>>();
4647
remainder = ScriptCategories2.parseUnicodeSet("[:script=Han:]").removeAll(GeneratePickerData2.SKIP);
47-
String dataDir = CLDRPaths.UCD_DATA_DIRECTORY + "/Unihan/";
48+
String dataDir = Settings.UCD_DATA_DIRECTORY + "/Unihan/";
4849

4950
BufferedReader in = new BufferedReader(
5051
new FileReader(

‎unicodetools/org/unicode/text/utility/Settings.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@
44
import org.unicode.cldr.util.CldrUtility;
55

66
public class Settings {
7+
8+
// TODO Many of these settings are crufty and need revision. https://unicode-org.atlassian.net/browse/CLDR-14335 is for fixing these and CLDR.
79

810
public static final boolean BUILD_FOR_COMPARE = org.unicode.cldr.util.CldrUtility.getProperty("BUILD_FOR_COMPARE", "false").startsWith("t");
9-
10-
public static final String SVN_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("SVN_DIR", CLDRPaths.BASE_DIRECTORY + "/../"), null);
11-
12-
public static final String AUX_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("CLDR_TMP_DIR",
13-
CldrUtility.getPath(SVN_DIRECTORY, "cldr-aux/")), null);
14-
15-
public static final String UCD_DATA_DIRECTORY = CldrUtility.getPath(SVN_DIRECTORY + "unicodetools/unicodetools/data/", null);
16-
11+
12+
public static final String SVN_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("SVN_DIR", CLDRPaths.BASE_DIRECTORY + "/../"), null);
13+
14+
public static final String AUX_DIRECTORY = CldrUtility.getPath(CldrUtility.getProperty("CLDR_TMP_DIR",
15+
CldrUtility.getPath(SVN_DIRECTORY, "cldr-aux/")), null);
16+
17+
public static final String UCD_DATA_DIRECTORY = CldrUtility.getPath(SVN_DIRECTORY + "unicodetools/unicodetools/data/", null);
18+
1719
public static final String SVN_WORKSPACE_DIRECTORY = Utility.fixFileName(
18-
CldrUtility.getProperty("SVN_WORKSPACE", SVN_DIRECTORY)) + "/";
20+
CldrUtility.getProperty("SVN_WORKSPACE", SVN_DIRECTORY)) + "/";
1921
public static final String OTHER_WORKSPACE_DIRECTORY = Utility.fixFileName(
20-
CldrUtility.getProperty("OTHER_WORKSPACE", CLDRPaths.LOCAL_DIRECTORY)) + "/";
22+
CldrUtility.getProperty("OTHER_WORKSPACE", CLDRPaths.LOCAL_DIRECTORY)) + "/";
2123

2224
public static final String BASE_DIRECTORY = Utility.fixFileName(
23-
CldrUtility.getProperty("BASE_DIRECTORY", SVN_DIRECTORY + "../")) + "/";
25+
CldrUtility.getProperty("BASE_DIRECTORY", SVN_DIRECTORY + "../")) + "/";
2426

2527
/**
2628
* Used for the default version.
@@ -31,19 +33,19 @@ public class Settings {
3133
public static final boolean SKIP_COPYRIGHT = "skip".equalsIgnoreCase(CldrUtility.getProperty("copyright", "skip"));
3234

3335
public static final String UNICODETOOLS_DIRECTORY =
34-
CldrUtility.getProperty("UNICODETOOLS_DIR",
35-
SVN_DIRECTORY + "unicodetools/unicodetools") + '/';
36+
CldrUtility.getProperty("UNICODETOOLS_DIR",
37+
SVN_DIRECTORY + "unicodetools/unicodetools") + '/';
3638
public static final String UNICODEJSPS_DIRECTORY = SVN_WORKSPACE_DIRECTORY + "unicodetools/UnicodeJsps/";
3739
public static final String UNICODE_DRAFT_DIRECTORY =
38-
CldrUtility.getProperty("UNICODE_DRAFT_DIR",
39-
SVN_WORKSPACE_DIRECTORY + "emoji/docs") + '/';
40+
CldrUtility.getProperty("UNICODE_DRAFT_DIR",
41+
SVN_WORKSPACE_DIRECTORY + "emoji/docs") + '/';
4042
public static final String UNICODE_DRAFT_PUBLIC = UNICODE_DRAFT_DIRECTORY + "Public/";
4143

4244
public static final String DATA_DIR = Utility.fixFileName(CldrUtility.getProperty("UCD_DIR", UNICODETOOLS_DIRECTORY + "data/")) + "/";
4345
public static final String UCD_DIR = DATA_DIR + "ucd/";
4446
public static final String IDN_DIR = DATA_DIR + "IDN/";
4547
public static final String DICT_DIR = DATA_DIR + "dict/";
46-
48+
4749
public static final String GEN_DIR_OLD = Utility.fixFileName(CldrUtility.getProperty("GEN_DIR", OTHER_WORKSPACE_DIRECTORY+"Generated")) + "/";
4850
public static final String GEN_DIR = BUILD_FOR_COMPARE ? UNICODE_DRAFT_PUBLIC : GEN_DIR_OLD;
4951
public static final String BIN_DIR = GEN_DIR_OLD + "BIN/";

‎unicodetools/org/unicode/tools/emoji/EmojiImageData.java‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -241,17 +241,21 @@ public static void main(String[] args) throws IOException {
241241

242242
private static void showText(PrintWriter out, int MAX) {
243243
EmojiData current = EmojiData.of(Emoji.VERSION_TO_GENERATE);
244-
245-
out.println("TOTALS\n");
244+
245+
// The EMPTY_COLUMNS is so that we have the same number of tab columns on each line, displaying better in github
246+
247+
out.println("TOTALS" + EMPTY_COLUMNS);
248+
out.println(EMPTY_COLUMNS);
246249
for (Source source : Source.VENDOR_SOURCES) {
247250
final UnicodeSet supported = getSupported(source);
248251
UnicodeSet missing = new UnicodeSet(current.getAllEmojiWithoutDefectives()).removeAll(supported);
249252
getCounts(out, source, "missing\tv" + current.getVersionString(), missing, MAX);
250253
// getCounts(PrintWriter out, Source source, String title, UnicodeSet missing, int MAX) {
251254
}
252-
out.println();
255+
out.println(EMPTY_COLUMNS);
253256
Output<Boolean> printed = new Output<>(false);
254-
out.println("DETAILS\n");
257+
out.println("DETAILS" + EMPTY_COLUMNS);
258+
out.println(EMPTY_COLUMNS);
255259
for (Source source : Source.VENDOR_SOURCES) {
256260
final UnicodeSet supported = getSupported(source);
257261
//System.out.println(source + "\t" + supported.size() + "\t" + max(supported.toPattern(false), MAX));
@@ -266,35 +270,35 @@ private static void showText(PrintWriter out, int MAX) {
266270
missing.removeAll(foundItems);
267271
}
268272
if (!missing.isEmpty()) {
269-
out.println("\tOthers: " + PRETTY_HEX.format(missing));
273+
out.println("Others" + EMPTY_COLUMNS + PRETTY_HEX.format(missing));
270274
printed.value = true;
271275
}
272276

273277
if (printed.value) {
274-
out.println();
278+
out.println(EMPTY_COLUMNS);
275279
}
276280
for (Breakdown breakdown : breakdowns) {
277281
UnicodeSet foundItems = getCounts(out, source, breakdown, -1, printed);
278282
missing.removeAll(foundItems);
279283
}
280284
if (!missing.isEmpty()) {
281-
out.println("\tOthers: " + PRETTY_HEX.format(missing));
285+
out.println("Others" + EMPTY_COLUMNS + PRETTY_HEX.format(missing));
282286
}
283287

284288
if (printed.value) {
285-
out.println();
289+
out.println(EMPTY_COLUMNS);
286290
}
287291
for (Breakdown breakdown : breakdowns) {
288292
UnicodeSet foundItems = getCounts(out, source, breakdown, -2, printed);
289293
missing.removeAll(foundItems);
290294
}
291295
if (!missing.isEmpty()) {
292-
out.println("\tOthers: " + formatFiles(source, missing));
296+
out.println("Others" + EMPTY_COLUMNS + formatFiles(source, missing));
293297
}
294298

295299
if (printed.value) {
296-
out.println();
297-
out.println();
300+
out.println(EMPTY_COLUMNS);
301+
out.println(EMPTY_COLUMNS);
298302
}
299303

300304
out.flush();
@@ -319,15 +323,18 @@ private static UnicodeSet getCounts(PrintWriter out, Source source, Breakdown br
319323
return breakdown.getSupported(source); // new UnicodeSet(breakdown.uset).retainAll(getSupported(source)).freeze();
320324
}
321325

326+
static final String EMPTY_COLUMNS = "\t\t\t\t\t";
327+
322328
private static void getCounts(PrintWriter out, Source source, String title, UnicodeSet missing, int MAX) {
323-
out.println(source + "\t"
324-
+ title
329+
out.println(source
330+
+ "\t" + title
325331
+ "\t" + missing.size()
326332
+ "\t" + (MAX == -1 ? "hex\t" + PRETTY_HEX.format(missing)
327333
: MAX == -2 ? "file\t" + formatFiles(source, missing)
328334
: "plain\t" + max(PRETTY_PLAIN.format(missing), MAX)
329335
)
330336
);
337+
331338
}
332339

333340
private static String formatFiles(Source type, UnicodeSet lastMissingSingletons) {

0 commit comments

Comments
 (0)