Synced to current nx01 snapshot and removed EL tomcat dep

This commit is contained in:
Willem Cazander 2026-04-20 17:26:34 +02:00
parent 3428ad1bf1
commit 57c087866c
23 changed files with 85 additions and 106 deletions

View file

@ -51,7 +51,7 @@ import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ.ᔆᣖᑊᒄᓫᣗ.Bã
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒼᒻᣔᙆᙆ.ᣖᑊᣗᣔᐪᓫ.BãßBȍőnꝐḯŕḕʸᴰ;
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᔿᓑᔿᔿᔋᐝᣚ.BãßᛗᚢᛗᛗᛉBoneBabe𓄯;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᒢℭỗᶇṧⱦᶏꬼȶʂ;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodePlane;
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᐪᓫᕽᐪ.ᓑᣕᣳᒼᐤᒄᓫ.UnicodeBlock;
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
@DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
@ -67,20 +67,20 @@ public class NotepadDeskApp extends AbstractDeskApp implements DeskAppRenderer,
private final ImInt runSpeed = new ImInt(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟTEN);
private final ImBoolean runChina = new ImBoolean(false);
private final static char DEFAULT_CHAR = '亞';
private final static UnicodePlane[] GRID_PLANES = {
UnicodePlane.BRAHMI,
UnicodePlane.UGARITIC,
UnicodePlane.BAMUM_SUPPLEMENT,
UnicodePlane.TAI_XUAN_JING_SYMBOLS
private final static UnicodeBlock[] GRID_PLANES = {
UnicodeBlock.BRAHMI,
UnicodeBlock.UGARITIC,
UnicodeBlock.BAMUM_SUPPLEMENT,
UnicodeBlock.TAI_XUAN_JING_SYMBOLS
};
private final static UnicodePlane[] GRID_PLANES_CHINA = {
UnicodePlane.CJK_UNIFIED_IDEOGRAPHS,
UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A,
UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B,
UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C,
UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D,
UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E,
UnicodePlane.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F
private final static UnicodeBlock[] GRID_PLANES_CHINA = {
UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS,
UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A,
UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B,
UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C,
UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D,
UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E,
UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F
};
private final static int Y_LINE_COLOR = ImColor.intToColor(200, 10, 10);
private String gridChars;
@ -185,11 +185,11 @@ public class NotepadDeskApp extends AbstractDeskApp implements DeskAppRenderer,
private String createGridChars() {
StringBuilder buf = new StringBuilder();
UnicodePlane[] planes = GRID_PLANES;
UnicodeBlock[] planes = GRID_PLANES;
if (runChina.get()) {
planes = GRID_PLANES_CHINA;
}
for (UnicodePlane plane:planes) {
for (UnicodeBlock plane:planes) {
for (int i=plane.getStart();i<plane.getStop();i++) {
buf.appendCodePoint(i);
}