Skip to content

fix some deprecated-type warnings #1341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markusicu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix some deprecated-type warnings #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions unicodetools/src/main/java/org/unicode/draft/UnicodeIntMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
7 changes: 0 additions & 7 deletions unicodetools/src/main/java/org/unicode/tools/NormalizeForMatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down
16 changes: 12 additions & 4 deletions unicodetools/src/main/java/org/unicode/tools/NormalizeForMatchDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions unicodetools/src/main/java/org/unicode/tools/emoji/CountEmoji.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ public Set<Attribute> getAttributes() {
/**
* @deprecated Replace by the {@link CountEmoji.Category}
*/
@Deprecated
public enum ZwjType {
roleWithHair,
roleWithObject,
Expand Down
7 changes: 0 additions & 7 deletions unicodetools/src/main/java/org/unicode/tools/emoji/EmojiAnnotations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions unicodetools/src/main/java/org/unicode/tools/emoji/GenerateEmojiData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public static final String getOutputDir() {
/**
* @deprecated Replace by the CountEmoji.Category
*/
@Deprecated
public enum ZwjType {
roleWithHair,
roleWithObject,
Expand Down
Loading