From 40229a5631dd3e052751acabe086f3f4bb8d00d8 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 10 Jun 2024 15:02:28 +0100 Subject: Move codepointToString to Strings --- .../zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java | 10 +--------- src/main/java/org/zwobble/mammoth/internal/util/Strings.java | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java index d17a404..ae495d5 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java @@ -24,6 +24,7 @@ import static org.zwobble.mammoth.internal.util.Lists.list; import static org.zwobble.mammoth.internal.util.Maps.entry; import static org.zwobble.mammoth.internal.util.Maps.lookup; import static org.zwobble.mammoth.internal.util.Sets.set; +import static org.zwobble.mammoth.internal.util.Strings.codepointToString; class StatefulBodyXmlReader { private static final Set IMAGE_TYPES_SUPPORTED_BY_BROWSERS = set( @@ -408,15 +409,6 @@ class StatefulBodyXmlReader { ); } - public String codepointToString(int codePoint) { - if (Character.isBmpCodePoint(codePoint)) { - return String.valueOf((char) codePoint); - } else { - return String.valueOf(Character.highSurrogate(codePoint)) + - Character.lowSurrogate(codePoint); - } - } - private ReadResult readBreak(XmlElement element) { String breakType = element.getAttributeOrNone("w:type").orElse("textWrapping"); switch (breakType) { diff --git a/src/main/java/org/zwobble/mammoth/internal/util/Strings.java b/src/main/java/org/zwobble/mammoth/internal/util/Strings.java index f39f35e..fad42a6 100644 --- a/src/main/java/org/zwobble/mammoth/internal/util/Strings.java +++ b/src/main/java/org/zwobble/mammoth/internal/util/Strings.java @@ -16,4 +16,13 @@ public class Strings { public static boolean startsWithIgnoreCase(String value, String prefix) { return value.regionMatches(true, 0, prefix, 0, prefix.length()); } + + public static String codepointToString(int codePoint) { + if (Character.isBmpCodePoint(codePoint)) { + return String.valueOf((char) codePoint); + } else { + return String.valueOf(Character.highSurrogate(codePoint)) + + Character.lowSurrogate(codePoint); + } + } } -- cgit v1.2.3