Skip to content

Replace ICU4J UCharacter methods with standard Java Character class #118

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

Merged
sideshowbarker merged 1 commit into from
May 12, 2026
+5 −6
Merged

Replace ICU4J UCharacter methods with standard Java Character class #118

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
11 changes: 5 additions & 6 deletions src/nu/validator/htmlparser/extra/NormalizationChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

import com.ibm.icu.lang.UCharacter;
import com.ibm.icu.text.Normalizer;
import com.ibm.icu.text.UnicodeSet;

Expand Down Expand Up @@ -103,7 +102,7 @@ public void err(String message) throws SAXException {
* or a surrogate and <code>false</code> otherwise
*/
private static boolean isComposingCharOrSurrogate(char c) {
if (UCharacter.isHighSurrogate(c) || UCharacter.isLowSurrogate(c)) {
if (Character.isHighSurrogate(c) || Character.isLowSurrogate(c)) {
return true;
}
return isComposingChar(c);
Expand Down Expand Up @@ -153,18 +152,18 @@ public void characters(char[] ch, int start, int length)
char c = ch[start];
if (pos == 1) {
// there's a single high surrogate in buf
if (isComposingChar(UCharacter.getCodePoint(buf[0], c))) {
if (isComposingChar(Character.toCodePoint(buf[0], c))) {
err("Text run starts with a composing character.");
}
atStartOfRun = false;
} else {
if (length == 1 && UCharacter.isHighSurrogate(c)) {
if (length == 1 && Character.isHighSurrogate(c)) {
buf[0] = c;
pos = 1;
return;
} else {
if (UCharacter.isHighSurrogate(c)) {
if (isComposingChar(UCharacter.getCodePoint(c,
if (Character.isHighSurrogate(c)) {
if (isComposingChar(Character.toCodePoint(c,
ch[start + 1]))) {
err("Text run starts with a composing character.");
}
Expand Down
Loading