make FontGroup.Range more JavaBean-like

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884157 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2020-12-06 16:46:09 +00:00
parent 07cb9eeb26
commit bb52df5d00
1 changed files with 7 additions and 4 deletions

View File

@ -65,12 +65,15 @@ public enum FontGroup {
} }
private static class Range { private static class Range {
final int upper; private final int upper;
final FontGroup fontGroup; private final FontGroup fontGroup;
Range(int upper, FontGroup fontGroup) { Range(int upper, FontGroup fontGroup) {
this.upper = upper; this.upper = upper;
this.fontGroup = fontGroup; this.fontGroup = fontGroup;
} }
int getUpper() { return upper; }
FontGroup getFontGroup() { return fontGroup; }
} }
private static NavigableMap<Integer,Range> UCS_RANGES; private static NavigableMap<Integer,Range> UCS_RANGES;
@ -156,6 +159,6 @@ public enum FontGroup {
// Do a lookup for a match in UCS_RANGES // Do a lookup for a match in UCS_RANGES
Map.Entry<Integer, Range> entry = UCS_RANGES.floorEntry(codepoint); Map.Entry<Integer, Range> entry = UCS_RANGES.floorEntry(codepoint);
Range range = (entry != null) ? entry.getValue() : null; Range range = (entry != null) ? entry.getValue() : null;
return (range != null && codepoint <= range.upper) ? range.fontGroup : EAST_ASIAN; return (range != null && codepoint <= range.getUpper()) ? range.getFontGroup() : EAST_ASIAN;
} }
} }