do not wait for unihan

Author: eggrobin

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

@@ -49,7 +49,8 @@ private static void loadUcdHistory(VersionInfo earliest, boolean includeUnihan)
             var version = VersionInfo.getInstance(age.getShortName());
             final long ucdStart = System.currentTimeMillis();
             System.out.println("Loading UCD " + age.getShortName() + "...");
-            for (boolean unihan : includeUnihan ? new boolean[] {false, true} : new boolean[] {false}) {
+            for (boolean unihan :
+                    includeUnihan ? new boolean[] {false, true} : new boolean[] {false}) {
                 final long partStart = System.currentTimeMillis();
                 final String name = unihan ? "Unihan" : "non-Unihan properties";
                 final var properties = IndexUnicodeProperties.make(age.getShortName());

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

@@ -1409,8 +1409,11 @@ public static void showProperties(
         TreeSet<String> sortedProps =
                 Builder.with(new TreeSet<String>(col)).addAll(availableNames).remove("Name").get();
 
-        String kRSUnicode = getFactory().getProperty("kRSUnicode").getValue(cp);
-        boolean isUnihan = kRSUnicode != null;
+        boolean isUnihan =
+                getFactory()
+                        .getProperty("Udev:Block")
+                        .getValue(cp)
+                        .matches("CJK.(Unified|Compatibility).Ideographs");
 
         Age_Values age = Age_Values.forName(getFactory().getProperty("Age").getValue(cp));
         VersionInfo minVersion =
@@ -1424,7 +1427,7 @@ public static void showProperties(
             out.append(
                     "<p class='changed'>Still loading UCD versions before "
                             + minVersion.getVersionString(2, 4)
-                            + "</p>");
+                            + "…</p>");
         }
 
         out.append(
@@ -1472,25 +1475,34 @@ public static void showProperties(
 
         out.append("</td></tr></table>\n");
         if (isUnihan) {
-            out.append(
-                    "<table class='propTable'>"
-                            + "<caption>"
-                            + "Unihan properties for U+"
-                            + hex
-                            + "</caption>"
-                            + "<tr><td width='50%'>\n");
-            out.append("<table width='100%'>\n");
-            for (int i = 0; i < unihanProperties.size() / 2; ++i) {
-                showPropertyValue(unihanProperties.get(i), cp, minVersion, maxVersion, false, out);
-            }
-            out.append("</table>\n");
-            out.append("</td><td width='50%'>\n");
-            out.append("<table width='100%'>\n");
-            for (int i = unihanProperties.size() / 2; i < unihanProperties.size(); ++i) {
-                showPropertyValue(unihanProperties.get(i), cp, minVersion, maxVersion, false, out);
-            }
-            out.append("</table>\n");
-            out.append("</td></tr></table>\n");
+            if (UcdLoader.getOldestLoadedUnihan() == minVersion) {
+                out.append(
+                        "<table class='propTable'>"
+                                + "<caption>"
+                                + "Unihan properties for U+"
+                                + hex
+                                + "</caption>"
+                                + "<tr><td width='50%'>\n");
+                out.append("<table width='100%'>\n");
+                for (int i = 0; i < unihanProperties.size() / 2; ++i) {
+                    showPropertyValue(
+                            unihanProperties.get(i), cp, minVersion, maxVersion, false, out);
+                }
+                out.append("</table>\n");
+                out.append("</td><td width='50%'>\n");
+                out.append("<table width='100%'>\n");
+                for (int i = unihanProperties.size() / 2; i < unihanProperties.size(); ++i) {
+                    showPropertyValue(
+                            unihanProperties.get(i), cp, minVersion, maxVersion, false, out);
+                }
+                out.append("</table>\n");
+                out.append("</td></tr></table>\n");
+            } else {
+                out.append(
+                        "<p class='changed'>Still loading Unihan "
+                                + minVersion.getVersionString(2, 4)
+                                + "…</p>");
+            }
         }
     }
 

UnicodeJsps/src/test/java/org/unicode/jsptest/TestUnicodeSet.java

@@ -4,18 +4,13 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
-import com.google.common.base.Objects;
 import com.ibm.icu.impl.Row.R2;
-import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UProperty.NameChoice;
-import com.ibm.icu.text.BreakIterator;
-import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.LocaleData;
 import com.ibm.icu.util.TimeZone;
-import com.ibm.icu.util.ULocale;
 import com.ibm.icu.util.VersionInfo;
 import java.io.IOException;
 import java.nio.charset.Charset;