From a3bf5b349db918a68a26d43a4ea9f95db607ac22 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Fri, 24 Apr 2026 17:10:58 -0700
Subject: [PATCH] fix some deprecated-type warnings

---
 .../java/org/unicode/draft/UnicodeIntMap.java    | 12 ------------
 .../org/unicode/tools/NormalizeForMatch.java     |  7 -------
 .../org/unicode/tools/NormalizeForMatchDiff.java | 16 ++++++++++++----
 .../java/org/unicode/tools/emoji/CountEmoji.java |  1 +
 .../unicode/tools/emoji/EmojiAnnotations.java    |  7 -------
 .../unicode/tools/emoji/GenerateEmojiData.java   |  1 +
 6 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java b/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java
index b7623e7dcf..63d301a00b 100644
--- a/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java
+++ b/unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java
@@ -884,18 +884,6 @@ public UnicodeIntMap putAll(Map<? extends String, ? extends Integer> map) {
         return this;
     }
 
-    /**
-     * Utility for extracting map
-     *
-     * @deprecated
-     */
-    public UnicodeIntMap putAllIn(Map<? super String, ? super Integer> map) {
-        for (String key : keySet()) {
-            map.put(key, get(key));
-        }
-        return this;
-    }
-
     /** Utility for extracting map */
     public <U extends Map<String, Integer>> U putAllInto(U map) {
         for (EntryRange<Integer> entry : entryRanges()) {
diff --git a/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java b/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java
index 7d59ccfeb7..9a2b9bddd4 100644
--- a/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java
+++ b/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java
@@ -78,13 +78,6 @@ public NormalizeForMatch(
 
     static String TEST = Utility.fromHex("1F19B");
 
-    /**
-     * @deprecated Use {@link #load(String,String,boolean)} instead
-     */
-    public static NormalizeForMatch load(String directory, String file) {
-        return load(directory, file, true);
-    }
-
     public static NormalizeForMatch load(String directory, String file, boolean acceptRawChars) {
         UnicodeMap<String> sourceToTarget = new UnicodeMap<>();
         UnicodeMap<SpecialReason> sourceToReason = new UnicodeMap<>();
diff --git a/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatchDiff.java b/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatchDiff.java
index 8864b79931..2cea826e04 100644
--- a/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatchDiff.java
+++ b/unicodetools/src/main/java/org/unicode/tools/NormalizeForMatchDiff.java
@@ -11,15 +11,23 @@ public static void main(String[] args) {
         NormalizeForMatch production =
                 NormalizeForMatch.load(
                         "/Users/markdavis/Google Drive/workspace/Generated/n4m-old/",
-                        "xnfkccf_curated.txt");
-        NormalizeForMatch sourceDirectory = NormalizeForMatch.load(null, "XNFKCCF-Curated.txt");
+                        "xnfkccf_curated.txt",
+                        /*acceptRawChars=*/ true);
+        NormalizeForMatch sourceDirectory =
+                NormalizeForMatch.load(
+                        null,
+                        "XNFKCCF-Curated.txt",
+                        /*acceptRawChars=*/ true);
         NormalizeForMatch dir90 =
                 NormalizeForMatch.load(
-                        Settings.UnicodeTools.DATA_DIR + "n4m/9.0.0/", "XNFKCCF-Curated.txt");
+                        Settings.UnicodeTools.DATA_DIR + "n4m/9.0.0/",
+                        "XNFKCCF-Curated.txt",
+                        /*acceptRawChars=*/ true);
         NormalizeForMatch gen =
                 NormalizeForMatch.load(
                         "/Users/markdavis/Google Drive/workspace/Generated/n4m/",
-                        "XNFKCCF-Curated.txt");
+                        "XNFKCCF-Curated.txt",
+                        /*acceptRawChars=*/ true);
 
         UnicodeSet keys =
                 new UnicodeSet()
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java b/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java
index b299a8f2cc..08e9d83f36 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java
@@ -657,6 +657,7 @@ public Set<Attribute> getAttributes() {
     /**
      * @deprecated Replace by the {@link CountEmoji.Category}
      */
+    @Deprecated
     public enum ZwjType {
         roleWithHair,
         roleWithObject,
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java
index b825aef27e..15aacf6a83 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java
@@ -55,13 +55,6 @@ public enum Status {
     public static final EmojiAnnotations ANNOTATIONS_TO_CHARS =
             new EmojiAnnotations("en", EmojiOrder.STD_ORDER.codepointCompare);
 
-    /**
-     * @deprecated Use {@link #EmojiAnnotations(String,Comparator<String>,String...)} instead
-     */
-    public EmojiAnnotations(Comparator<String> codepointCompare, String... filenames) {
-        this("en", codepointCompare, filenames);
-    }
-
     public EmojiAnnotations(
             String localeString, Comparator<String> codepointCompare, String... filenames) {
         super(
diff --git a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java
index 53989f0895..961185968f 100644
--- a/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java
+++ b/unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java
@@ -121,6 +121,7 @@ public static final String getOutputDir() {
     /**
      * @deprecated Replace by the CountEmoji.Category
      */
+    @Deprecated
     public enum ZwjType {
         roleWithHair,
         roleWithObject,