From 9608697de610322037fd98073da003620e730014 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 19 Jan 2025 22:45:19 +0100 Subject: [PATCH] Split FC18 X21 unicode import from display --- .../x4o/fc18/FourCornerUnicodeDisplay.java | 21 ++++---- .../org/x4o/fc18/FourCornerUnicodeImport.java | 10 ++-- .../org/x4o/fc18/FourCornerUnicodeMapper.java | 53 ++++++++----------- .../org/x4o/fc18/cake2/FourCornerDotCake.java | 12 ++--- .../cake2/FourCornerX00PetitCollePie9.java | 48 +++++++++++++++++ .../FourCornerX00PetitColleZero33P8.java | 37 +++++++++++++ ...oints.java => FourCornerX00PetitVide.java} | 22 ++++---- .../FourCornerX00PetitVideCoinCarne.java | 2 +- .../cake2/FourCornerX06BaklavaPoints.java | 2 +- .../fc18/cake2/FourCornerX08MuffinPoints.java | 2 +- .../fc18/cake2/FourCornerX18CakePoints.java | 2 +- .../cake2/FourCornerX21CodePointDisplay.java | 35 ++++++++++++ ...java => FourCornerX21CodePointImport.java} | 4 +- .../fc18/cake2/pie9c/FCDotPIE9CDash01.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash02.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash03.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash04.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash05.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash06.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash07.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash08.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash09.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash10.java | 19 ++++--- .../fc18/cake2/pie9c/FCDotPIE9CDash11.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash12.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash13.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash14.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash15.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash16.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash17.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash18.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash19.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash20.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash21.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash22.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash23.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash24.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash25.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash26.java | 18 +++---- .../fc18/cake2/pie9c/FCDotPIE9CDash27.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash01.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash02.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash03.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash04.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash05.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash06.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash07.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash08.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash09.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash10.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash11.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash12.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash13.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash14.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash15.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash16.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash17.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash18.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash19.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash20.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash21.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash22.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash23.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash24.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash25.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash26.java | 18 +++---- .../fc18/cake2/pie9d/FCDotPIE9DDash27.java | 18 +++---- .../cake2/zero33/FCDotAPL0127DashP7A.java | 13 ++--- .../cake2/zero33/FCDotAPL0127DashP7B.java | 13 ++--- .../cake2/zero33/FCDotAPL0127DashP7C.java | 13 ++--- .../cake2/zero33/FCDotBYD0127DashP7D.java | 13 ++--- .../cake2/zero33/FCDotBYD0127DashP7E.java | 13 ++--- .../cake2/zero33/FCDotBYD0127DashP7F.java | 13 ++--- .../fc18/cake2/zero33/FCDotCDC1604DashP6.java | 13 ++--- .../cake2/fcdoc/FCDocPageWriterMuffin.java | 12 ++--- .../fc18/cake2/fcdoc/FCDocSegmentWriter.java | 2 +- .../fcdoc/FCDocSegmentWriterCakeSlice.java | 12 ++--- .../fcdoc/FCDocSegmentWriterCakeWord.java | 36 +++++++------ .../x4o/fc18/cake2/zero33/FCDotAPLTest.java | 4 +- .../x4o/fc18/cake2/zero33/FCDotBYDTest.java | 4 +- .../cake2/zero33/FCDotCDC1604DashP6Test.java | 4 +- 81 files changed, 744 insertions(+), 644 deletions(-) create mode 100644 nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitCollePie9.java create mode 100644 nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleZero33P8.java rename nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/{FourCornerX00PetitVidePoints.java => FourCornerX00PetitVide.java} (82%) create mode 100644 nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDisplay.java rename nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/{FourCornerX21CodePoints.java => FourCornerX21CodePointImport.java} (93%) diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java index ce13160..ed19f22 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeDisplay.java @@ -24,13 +24,12 @@ package org.x4o.fc18; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.function.Consumer; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX00PetitVidePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; import org.x4o.fc18.cake2.FourCornerX18CakePoints; @@ -175,7 +174,7 @@ public class FourCornerUnicodeDisplay { if (printedEscape(slice, offset)) { return; } - FourCornerX00PetitVidePoints[] videPoints = slice.getVidePoints(); + FourCornerX00PetitVide[] videPoints = slice.getVidePoints(); if (slice.isExternWord()) { String nameSpec = slice.nameSpec(); @@ -184,14 +183,14 @@ public class FourCornerUnicodeDisplay { if (value != null) { output.append(value); } else { - FourCornerX00PetitVidePoints videPoint = videPoints[offset]; + FourCornerX00PetitVide videPoint = videPoints[offset]; if (videPoint instanceof FourCornerX18CakeWord) { FourCornerX18CakeWord cakeWord = FourCornerX18CakeWord.class.cast(videPoint); FourCornerX18CakePoints[] wordDefault = cakeWord.nameDefault(); for (FourCornerX18CakePoints letter : wordDefault) { - if (letter.isX21()) { - Arrays.stream(letter.toX21().codePoints()).forEach(v -> output.appendCodePoint(v)); - } + letter.kaasX21CodePointDisplay().ifPresent(v -> { + v.codePointDisplay().forEach(vv -> output.appendCodePoint(vv)); + }); } } } @@ -207,10 +206,10 @@ public class FourCornerUnicodeDisplay { //if (offset < 0 || offset > videPoints.length) { // continue; //} - FourCornerX00PetitVidePoints videPoint = videPoints[offset]; - if (videPoint.isX21()) { - Arrays.stream(videPoint.toX21().codePoints()).forEach(v -> output.appendCodePoint(v)); - } + FourCornerX00PetitVide videPoint = videPoints[offset]; + videPoint.kaasX21CodePointDisplay().ifPresent(v -> { + v.codePointDisplay().forEach(vv -> output.appendCodePoint(vv)); + }); return; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java index 3069824..051d339 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; import java.util.PrimitiveIterator; -import org.x4o.fc18.cake2.FourCornerX00PetitVidePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; import org.x4o.fc18.cake2.FourCornerX18CakePoints; @@ -83,11 +83,11 @@ public class FourCornerUnicodeImport { final private class ImportState { final int bits; final PrimitiveIterator.OfInt input; - final List output; + final List output; FCDotCDC1604DashP6 cdcNumberTerminator; FCDotCDC1604DashP6 cdcCaseTerminator; int codePoint; - private ImportState(int bits, PrimitiveIterator.OfInt input, List output) { + private ImportState(int bits, PrimitiveIterator.OfInt input, List output) { this.bits = bits; this.input = input; this.output = output; @@ -98,7 +98,7 @@ public class FourCornerUnicodeImport { } } - private List convertToXXX(String text, int bits) { + private List convertToXXX(String text, int bits) { ImportState ctx = new ImportState(bits, text.codePoints().iterator(), new ArrayList<>(text.length())); while (ctx.input.hasNext()) { ctx.codePoint = ctx.input.nextInt(); @@ -154,7 +154,7 @@ public class FourCornerUnicodeImport { } private boolean handleDictionary(ImportState ctx) { - FourCornerX00PetitVidePoints chs = FourCornerUnicodeMapper.DICTIONARY.findByX21(ctx.codePoint); + FourCornerX00PetitVide chs = FourCornerUnicodeMapper.DICTIONARY.findByX21(ctx.codePoint); if (chs == null) { return false; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeMapper.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeMapper.java index e4838a2..bc539f9 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeMapper.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeMapper.java @@ -24,7 +24,6 @@ package org.x4o.fc18; import java.math.BigInteger; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -33,10 +32,9 @@ import java.util.Map; import java.util.PrimitiveIterator; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX00PetitVidePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash10; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash11; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash20; @@ -52,11 +50,11 @@ public enum FourCornerUnicodeMapper { ; private final Map> int18To21 = new HashMap<>(); - private final Map int21ToVide = new HashMap<>(); + private final Map int21ToVide = new HashMap<>(); private FourCornerUnicodeMapper() { for (FourCornerDotCake slice : FourCornerDotCake.values()) { - FourCornerX00PetitVidePoints[] videPoints = slice.getVidePoints(); + FourCornerX00PetitVide[] videPoints = slice.getVidePoints(); if (videPoints.length == 0) { continue; } @@ -66,46 +64,41 @@ public enum FourCornerUnicodeMapper { int18To21.forEach((k,v) -> int18To21.put(k, Collections.unmodifiableList(v))); } - private void mapPointsX18(FourCornerX00PetitVidePoints[] videPoints) { - for (FourCornerX00PetitVidePoints videPoint : videPoints) { - if (!videPoint.isX18()) { + private void mapPointsX18(FourCornerX00PetitVide[] petitVides) { + for (FourCornerX00PetitVide petitVide : petitVides) { + if (!petitVide.isX18()) { continue; } - if (!videPoint.isX21()) { - continue; - } - FourCornerX18CakePoints x18 = videPoint.toX18(); - FourCornerX21CodePoints x21 = videPoint.toX21(); + FourCornerX18CakePoints x18 = petitVide.toX18(); if (x18.cakePoints().length > 1) { continue; } int char18 = x18.cakePoints()[0]; - List chs = new ArrayList<>(); - int[] char21 = x21.codePoints(); - Arrays.stream(char21).forEach(v -> chs.add(v)); - int18To21.put(char18, chs); + petitVide.kaasX21CodePointDisplay().ifPresent(v -> { + int18To21.put(char18, v.codePointDisplay()); + }); } } - private void mapPointsX21(FourCornerX00PetitVidePoints[] videPoints) { - for (FourCornerX00PetitVidePoints videPoint : videPoints) { - if (!videPoint.isX21()) { - continue; - } - FourCornerX21CodePoints x21 = videPoint.toX21(); - if (x21.codePoints().length > 1) { - continue; - } - int char21 = x21.codePoints()[0]; - int21ToVide.put(char21, videPoint); + private void mapPointsX21(FourCornerX00PetitVide[] petitVides) { + for (FourCornerX00PetitVide petitVide : petitVides) { + petitVide.kaasX21CodePointImport().ifPresent(v -> { + int codePoint = v.codePointImport(); + if (codePoint < 0) { + return; + } + int21ToVide.put(codePoint, v); + }); } + // Fix space + int21ToVide.put((int)' ', FCDotCDC1604DashP6._SPACE); } public List findByX18(Integer letter) { return int18To21.get(letter); } - public FourCornerX00PetitVidePoints findByX21(Integer letter) { + public FourCornerX00PetitVide findByX21(Integer letter) { return int21ToVide.get(letter); } @@ -216,7 +209,7 @@ public enum FourCornerUnicodeMapper { } @SuppressWarnings("unchecked") - private List toDecimalsX00(int value) { + private List toDecimalsX00(int value) { List result = new ArrayList<>(); String valueStr = Integer.toString(value); PrimitiveIterator.OfInt i = valueStr.codePoints().iterator(); diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java index 227eb70..db1ed0d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java @@ -299,22 +299,22 @@ public enum FourCornerDotCake { private final int stop; private final String nameSpec; private final String description; - private final FourCornerX00PetitVidePoints[] videPoints; + private final FourCornerX00PetitVide[] videPoints; private static final FourCornerDotCake[] VALUES = values(); private FourCornerDotCake(int start, int size) { - this(start, size, new FourCornerX00PetitVidePoints[] {}, null); + this(start, size, new FourCornerX00PetitVide[] {}, null); } private FourCornerDotCake(int start, int size, String description) { - this(start, size, new FourCornerX00PetitVidePoints[] {}, description); + this(start, size, new FourCornerX00PetitVide[] {}, description); } - private FourCornerDotCake(int start, int size, FourCornerX00PetitVidePoints[] videPoints) { + private FourCornerDotCake(int start, int size, FourCornerX00PetitVide[] videPoints) { this(start, size, videPoints, null); } - private FourCornerDotCake(int start, int size, FourCornerX00PetitVidePoints[] videPoints, String description) { + private FourCornerDotCake(int start, int size, FourCornerX00PetitVide[] videPoints, String description) { this.start = start; this.stop = start + size - 1; this.videPoints = videPoints; @@ -392,7 +392,7 @@ public enum FourCornerDotCake { return description; } - public FourCornerX00PetitVidePoints[] getVidePoints() { + public FourCornerX00PetitVide[] getVidePoints() { return videPoints; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitCollePie9.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitCollePie9.java new file mode 100644 index 0000000..422e628 --- /dev/null +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitCollePie9.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.fc18.cake2; + +import java.util.List; + +/// Parent interface for all PIE9C and PIE9D enum. +/// +/// @author Willem Cazander +/// @version 1.0 Jan 18, 2025 +public interface FourCornerX00PetitCollePie9 extends FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePointDisplay, FourCornerX21CodePointImport { + + @Override + default int codePointImport() { + List display = codePointDisplay(); + if (display.isEmpty()) { + return -1; + } + if (display.size() > 1) { + return -1; + } + int letter = display.get(0); + if (letter == ' ') { + return -1; + } + return letter; + } +} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleZero33P8.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleZero33P8.java new file mode 100644 index 0000000..d3e4184 --- /dev/null +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleZero33P8.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.fc18.cake2; + +import java.util.List; + +/// Parent interface for all P8 enum. +/// +/// @author Willem Cazander +/// @version 1.0 Jan 19, 2025 +public interface FourCornerX00PetitColleZero33P8 extends FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePointImport, FourCornerX21CodePointDisplay { + + @Override + default List codePointDisplay() { + return List.of(codePointImport()); + } +} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVidePoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVide.java similarity index 82% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVidePoints.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVide.java index b2913c2..cd8e8c0 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVidePoints.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVide.java @@ -22,11 +22,13 @@ */ package org.x4o.fc18.cake2; +import java.util.Optional; + /// Empty petit points interface /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX00PetitVidePoints { +public interface FourCornerX00PetitVide { default boolean isX06() { return this instanceof FourCornerX06BaklavaPoints; @@ -40,14 +42,20 @@ public interface FourCornerX00PetitVidePoints { return this instanceof FourCornerX18CakePoints; } - default boolean isX21() { - return this instanceof FourCornerX21CodePoints; - } - default boolean isCoinCarne() { return this instanceof FourCornerX00PetitVideCoinCarne; } + + default Optional kaasX21CodePointImport() { + return this instanceof FourCornerX21CodePointImport?Optional.of(FourCornerX21CodePointImport.class.cast(this)):Optional.empty(); + } + + default Optional kaasX21CodePointDisplay() { + return this instanceof FourCornerX21CodePointDisplay?Optional.of(FourCornerX21CodePointDisplay.class.cast(this)):Optional.empty(); + } + + default FourCornerX06BaklavaPoints toX06() { return FourCornerX06BaklavaPoints.class.cast(this); } @@ -60,10 +68,6 @@ public interface FourCornerX00PetitVidePoints { return FourCornerX18CakePoints.class.cast(this); } - default FourCornerX21CodePoints toX21() { - return FourCornerX21CodePoints.class.cast(this); - } - default FourCornerX00PetitVideCoinCarne toCoinCarne() { return FourCornerX00PetitVideCoinCarne.class.cast(this); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarne.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarne.java index cbafa26..08c1308 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarne.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVideCoinCarne.java @@ -26,7 +26,7 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 18, 2025 -public interface FourCornerX00PetitVideCoinCarne extends FourCornerX00PetitVidePoints { +public interface FourCornerX00PetitVideCoinCarne extends FourCornerX00PetitVide { FourCornerX00PetitVideCoinCarneFrapper petitVideCoinCarneFrapper(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java index 2533568..f6ad33b 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java @@ -26,7 +26,7 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX06BaklavaPoints extends FourCornerX00PetitVidePoints { +public interface FourCornerX06BaklavaPoints extends FourCornerX00PetitVide { /// One baklava piece weights 52 gram int[] baklavaPoints(); diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java index 6241c34..ef337e1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java @@ -26,7 +26,7 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX08MuffinPoints extends FourCornerX00PetitVidePoints { +public interface FourCornerX08MuffinPoints extends FourCornerX00PetitVide { /// One muffin piece weights 111 gram int[] muffinPoints(); diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java index 4e64bf1..360896c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java @@ -26,7 +26,7 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Dec 28, 2024 -public interface FourCornerX18CakePoints extends FourCornerX00PetitVidePoints { +public interface FourCornerX18CakePoints extends FourCornerX00PetitVide { /// One cake piece weights 800 gram int[] cakePoints(); diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDisplay.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDisplay.java new file mode 100644 index 0000000..e3aa8cb --- /dev/null +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDisplay.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.fc18.cake2; + +import java.util.List; + +/// Display retriever for four corner 21 bit code points. +/// +/// @author Willem Cazander +/// @version 1.0 Jan 19, 2025 +public interface FourCornerX21CodePointDisplay extends FourCornerX00PetitVide { + + /// One code point weights ~1234 gram + List codePointDisplay(); +} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePoints.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointImport.java similarity index 93% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePoints.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointImport.java index b2216d6..d5fe352 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePoints.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointImport.java @@ -26,8 +26,8 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX21CodePoints extends FourCornerX00PetitVidePoints { +public interface FourCornerX21CodePointImport extends FourCornerX00PetitVide { /// One code point weights ~1234 gram - int[] codePoints(); + int codePointImport(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java index 8b47dc7..67fbfd1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,14 +36,14 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 05, 2025 */ -public enum FCDotPIE9CDash01 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash01 implements FourCornerX00PetitCollePie9 { VOID('〇'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash01(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -62,7 +62,7 @@ public enum FCDotPIE9CDash01 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java index 6f4e49f..f6276f8 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,15 +36,15 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 05, 2025 */ -public enum FCDotPIE9CDash02 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash02 implements FourCornerX00PetitCollePie9 { MULTIPLY('×'), DIVIDE('÷'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash02(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -63,7 +63,7 @@ public enum FCDotPIE9CDash02 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java index 2ac1aca..af09a3a 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,16 +36,16 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 05, 2025 */ -public enum FCDotPIE9CDash03 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash03 implements FourCornerX00PetitCollePie9 { CJK_1('一'), CJK_2('二'), CJK_3('三'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash03(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -64,7 +64,7 @@ public enum FCDotPIE9CDash03 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java index 6a97cfc..7a7b998 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,17 +36,17 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 05, 2025 */ -public enum FCDotPIE9CDash04 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash04 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), NXX_03(' '), NXX_04(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash04(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -65,7 +65,7 @@ public enum FCDotPIE9CDash04 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java index 56848ba..c994328 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 05, 2025 */ -public enum FCDotPIE9CDash05 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash05 implements FourCornerX00PetitCollePie9 { NXX_01('˥'), NXX_02('˦'), @@ -44,10 +44,10 @@ public enum FCDotPIE9CDash05 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_04('˨'), NXX_05('˩'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash05(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -66,7 +66,7 @@ public enum FCDotPIE9CDash05 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java index 290a80e..8132992 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 05, 2025 */ -public enum FCDotPIE9CDash06 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash06 implements FourCornerX00PetitCollePie9 { NXX_1('⌽'), // ⌽ = FROM APL NXX_2('⊖'), // ⊖ = FROM APL @@ -45,10 +45,10 @@ public enum FCDotPIE9CDash06 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_5('⊗'), // ⊗ = FROM APL NXX_6('⊗'), // ⊗ = FROM APL ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash06(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -67,7 +67,7 @@ public enum FCDotPIE9CDash06 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java index 04dd338..34f1e96 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 05, 2025 */ -public enum FCDotPIE9CDash07 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash07 implements FourCornerX00PetitCollePie9 { CJK_0('零'), CJK_4('四'), @@ -46,10 +46,10 @@ public enum FCDotPIE9CDash07 implements FourCornerX06BaklavaPoints, FourCornerX0 CJK_8('八'), CJK_9('九'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash07(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -68,7 +68,7 @@ public enum FCDotPIE9CDash07 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java index dd8da8c..d33f356 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash08 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash08 implements FourCornerX00PetitCollePie9 { NXX_01('☰'), NXX_02('☱'), @@ -47,10 +47,10 @@ public enum FCDotPIE9CDash08 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_07('☶'), NXX_08('☷'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash08(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -69,7 +69,7 @@ public enum FCDotPIE9CDash08 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java index b6ad288..fc0f19f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash09 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash09 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -48,10 +48,10 @@ public enum FCDotPIE9CDash09 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_08(' '), NXX_09(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash09(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -70,7 +70,7 @@ public enum FCDotPIE9CDash09 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java index 0d39954..512c813 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java @@ -22,11 +22,10 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +35,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash10 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash10 implements FourCornerX00PetitCollePie9 { DECIMAL_0('0'), DECIMAL_1('1'), @@ -50,10 +49,10 @@ public enum FCDotPIE9CDash10 implements FourCornerX06BaklavaPoints, FourCornerX0 DECIMAL_9('9'), ; private final static FCDotPIE9CDash10[] VALUES = values(); - private final int[] codePoints; + private final List codePointDisplay; - private FCDotPIE9CDash10(int...codePoints) { - this.codePoints = codePoints; + private FCDotPIE9CDash10(int codePoint) { + this.codePointDisplay = List.of(codePoint); } @Override @@ -72,8 +71,8 @@ public enum FCDotPIE9CDash10 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java index ae4c704..bd11a0a 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash11 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash11 implements FourCornerX00PetitCollePie9 { NXX_01('*'), NXX_02('⁺'), @@ -50,10 +50,10 @@ public enum FCDotPIE9CDash11 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_10('₎'), NXX_11('₌'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash11(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -72,7 +72,7 @@ public enum FCDotPIE9CDash11 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java index 776d82e..cbfb5d2 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash12 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash12 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -51,10 +51,10 @@ public enum FCDotPIE9CDash12 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_11(' '), NXX_12(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash12(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -73,7 +73,7 @@ public enum FCDotPIE9CDash12 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java index 54b61fb..82228a4 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash13 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash13 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -52,10 +52,10 @@ public enum FCDotPIE9CDash13 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_12(' '), NXX_13(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash13(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -74,7 +74,7 @@ public enum FCDotPIE9CDash13 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java index bd26b61..16daae8 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash14 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash14 implements FourCornerX00PetitCollePie9 { NXX_01('⊢'), NXX_02('⊣'), @@ -53,10 +53,10 @@ public enum FCDotPIE9CDash14 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_13('⊮'), NXX_14('⊯'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash14(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -75,7 +75,7 @@ public enum FCDotPIE9CDash14 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java index 234ef6f..9a47404 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash15 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash15 implements FourCornerX00PetitCollePie9 { NXX_01('꜍'), NXX_02('꜎'), @@ -54,10 +54,10 @@ public enum FCDotPIE9CDash15 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_14('꜕'), NXX_15('꜖'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash15(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -76,7 +76,7 @@ public enum FCDotPIE9CDash15 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java index 4219310..b5071df 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash16 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash16 implements FourCornerX00PetitCollePie9 { NXX_01('˧','˥','˩'), NXX_02('˧','˩','˥'), @@ -55,10 +55,10 @@ public enum FCDotPIE9CDash16 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_15('˥','˥','˧'), NXX_16('˩','˩','˧'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash16(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -77,7 +77,7 @@ public enum FCDotPIE9CDash16 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java index a9ae382..1733a1d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash17 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash17 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -56,10 +56,10 @@ public enum FCDotPIE9CDash17 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_16(' '), NXX_17(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash17(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -78,7 +78,7 @@ public enum FCDotPIE9CDash17 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java index 0eee333..123cacf 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash18 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash18 implements FourCornerX00PetitCollePie9 { NXX_01(0x1D369), NXX_02(0x1D36A), @@ -58,10 +58,10 @@ public enum FCDotPIE9CDash18 implements FourCornerX06BaklavaPoints, FourCornerX0 NYY_08(0x1D367), NYY_09(0x1D368), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash18(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -80,7 +80,7 @@ public enum FCDotPIE9CDash18 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java index adb9942..d0fef74 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash19 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash19 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -58,10 +58,10 @@ public enum FCDotPIE9CDash19 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_18(' '), NXX_19(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash19(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -80,7 +80,7 @@ public enum FCDotPIE9CDash19 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java index a226397..3e2ecc6 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash20 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash20 implements FourCornerX00PetitCollePie9 { SUPER_0('⁰'), SUPER_1('¹'), @@ -59,10 +59,10 @@ public enum FCDotPIE9CDash20 implements FourCornerX06BaklavaPoints, FourCornerX0 SUB_8('₈'), SUB_9('₉'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash20(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -81,7 +81,7 @@ public enum FCDotPIE9CDash20 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java index c8863f2..d28d5f0 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash21 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash21 implements FourCornerX00PetitCollePie9 { NXX_01('Ⅰ'), NXX_02('Ⅱ'), @@ -60,10 +60,10 @@ public enum FCDotPIE9CDash21 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_20('ↇ'), NXX_21('ↈ'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash21(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -82,7 +82,7 @@ public enum FCDotPIE9CDash21 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java index 8f31e36..1f2874c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash22 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash22 implements FourCornerX00PetitCollePie9 { NXX_01('←'), NXX_02('↑'), @@ -61,10 +61,10 @@ public enum FCDotPIE9CDash22 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_21('↴'), NXX_22('↵'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash22(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -83,7 +83,7 @@ public enum FCDotPIE9CDash22 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java index 1140aa2..4383093 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash23 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash23 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -62,10 +62,10 @@ public enum FCDotPIE9CDash23 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_22(' '), NXX_23(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash23(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -84,7 +84,7 @@ public enum FCDotPIE9CDash23 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java index 8461e5c..ac8530c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash24 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash24 implements FourCornerX00PetitCollePie9 { UBARLOW_ALPHA('α', '\u0332'), // ⍶ = FROM APL UBARLOW_BETA('β', '\u0332'), @@ -63,10 +63,10 @@ public enum FCDotPIE9CDash24 implements FourCornerX06BaklavaPoints, FourCornerX0 UBARLOW_PSI('ψ', '\u0332'), UBARLOW_OMEGA('ω', '\u0332'), // ⍹ = FROM APL ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash24(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -85,7 +85,7 @@ public enum FCDotPIE9CDash24 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java index a7974d9..dd7f7ed 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash25 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash25 implements FourCornerX00PetitCollePie9 { // Lower case greek from MSX KANJI KuTen-632 and KuTen-648 @@ -66,10 +66,10 @@ public enum FCDotPIE9CDash25 implements FourCornerX06BaklavaPoints, FourCornerX0 LOW_OMEGA('ω'), // ⍵ = FROM APL APL_REMARK('⍝'), // ⍝ = FROM APL ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash25(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -88,7 +88,7 @@ public enum FCDotPIE9CDash25 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java index 7f1c3f2..a3bf2ae 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash26 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash26 implements FourCornerX00PetitCollePie9 { LOW_A('a'), LOW_B('b'), @@ -65,10 +65,10 @@ public enum FCDotPIE9CDash26 implements FourCornerX06BaklavaPoints, FourCornerX0 LOW_Y('y'), LOW_Z('z'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash26(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -87,7 +87,7 @@ public enum FCDotPIE9CDash26 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java index f50dcf2..6551975 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9c; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 06, 2025 */ -public enum FCDotPIE9CDash27 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9CDash27 implements FourCornerX00PetitCollePie9 { LOWUBAR_A('a', '\u0332'), LOWUBAR_B('b', '\u0332'), @@ -66,10 +66,10 @@ public enum FCDotPIE9CDash27 implements FourCornerX06BaklavaPoints, FourCornerX0 LOWUBAR_Z('z', '\u0332'), LOWUBAR_AMP('&', '\u0332'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9CDash27(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -88,7 +88,7 @@ public enum FCDotPIE9CDash27 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash01.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash01.java index c74a8b2..4fdb9c1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash01.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash01.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,14 +36,14 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash01 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash01 implements FourCornerX00PetitCollePie9 { NXX_1('�'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash01(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -62,7 +62,7 @@ public enum FCDotPIE9DDash01 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash02.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash02.java index 8aa4e65..911144f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash02.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash02.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,17 +36,17 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash02 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash02 implements FourCornerX00PetitCollePie9 { // Symbols from MSX KANJI KuTen-164 NXX_1('♂'), NXX_2('♀'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash02(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -65,7 +65,7 @@ public enum FCDotPIE9DDash02 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java index 00b2677..9f4178a 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash03.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,16 +36,16 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash03 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash03 implements FourCornerX00PetitCollePie9 { NXX_1(' '), NXX_2(' '), NXX_3(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash03(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -64,7 +64,7 @@ public enum FCDotPIE9DDash03 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash04.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash04.java index aef1280..0df60e6 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash04.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash04.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,17 +36,17 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash04 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash04 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), NXX_03(' '), NXX_04(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash04(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -65,7 +65,7 @@ public enum FCDotPIE9DDash04 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash05.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash05.java index dafd7c0..94fad4b 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash05.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash05.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash05 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash05 implements FourCornerX00PetitCollePie9 { NXX_01(0x1D372), NXX_02(0x1D373), @@ -50,10 +50,10 @@ public enum FCDotPIE9DDash05 implements FourCornerX06BaklavaPoints, FourCornerX0 // NXX_04('⋋'), // NXX_05('⋌'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash05(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -72,7 +72,7 @@ public enum FCDotPIE9DDash05 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java index 34537e7..c41a1f1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash06.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash06 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash06 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -45,10 +45,10 @@ public enum FCDotPIE9DDash06 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_05(' '), NXX_06(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash06(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -67,7 +67,7 @@ public enum FCDotPIE9DDash06 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash07.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash07.java index c81e51a..f3ef549 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash07.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash07.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash07 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash07 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -46,10 +46,10 @@ public enum FCDotPIE9DDash07 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_06(' '), NXX_07(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash07(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -68,7 +68,7 @@ public enum FCDotPIE9DDash07 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java index 1f210cc..bc3404d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash08.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash08 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash08 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -47,10 +47,10 @@ public enum FCDotPIE9DDash08 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_07(' '), NXX_08(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash08(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -69,7 +69,7 @@ public enum FCDotPIE9DDash08 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash09.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash09.java index 3422596..8033298 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash09.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash09.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash09 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash09 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -48,10 +48,10 @@ public enum FCDotPIE9DDash09 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_08(' '), NXX_09(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash09(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -70,7 +70,7 @@ public enum FCDotPIE9DDash09 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash10.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash10.java index 0a18719..50b48c8 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash10.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash10.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash10 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash10 implements FourCornerX00PetitCollePie9 { BOLD_DECIMAL_0(0x1D7CE), BOLD_DECIMAL_1(0x1D7CF), @@ -50,10 +50,10 @@ public enum FCDotPIE9DDash10 implements FourCornerX06BaklavaPoints, FourCornerX0 BOLD_DECIMAL_9(0x1D7D7), ; private final static FCDotPIE9DDash10[] VALUES = values(); - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash10(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -72,8 +72,8 @@ public enum FCDotPIE9DDash10 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java index f7add92..46c7756 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash11.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash11 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash11 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -50,10 +50,10 @@ public enum FCDotPIE9DDash11 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_10(' '), NXX_11(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash11(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -72,7 +72,7 @@ public enum FCDotPIE9DDash11 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash12.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash12.java index c1f9c55..6ac73d6 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash12.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash12.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash12 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash12 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -51,10 +51,10 @@ public enum FCDotPIE9DDash12 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_11(' '), NXX_12(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash12(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -73,7 +73,7 @@ public enum FCDotPIE9DDash12 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash13.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash13.java index 09b0c04..e6db98b 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash13.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash13.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash13 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash13 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -52,10 +52,10 @@ public enum FCDotPIE9DDash13 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_12(' '), NXX_13(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash13(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -74,7 +74,7 @@ public enum FCDotPIE9DDash13 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java index 4149b51..9a4e647 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash14.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash14 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash14 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -53,10 +53,10 @@ public enum FCDotPIE9DDash14 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_13(' '), NXX_14(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash14(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -75,7 +75,7 @@ public enum FCDotPIE9DDash14 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java index 443b02c..e54cf40 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash15.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash15 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash15 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -54,10 +54,10 @@ public enum FCDotPIE9DDash15 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_14(' '), NXX_15(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash15(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -76,7 +76,7 @@ public enum FCDotPIE9DDash15 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash16.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash16.java index 202556c..a603342 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash16.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash16.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash16 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash16 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -55,10 +55,10 @@ public enum FCDotPIE9DDash16 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_15(' '), NXX_16(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash16(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -77,7 +77,7 @@ public enum FCDotPIE9DDash16 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash17.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash17.java index c6963f8..bffe36d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash17.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash17.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash17 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash17 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -56,10 +56,10 @@ public enum FCDotPIE9DDash17 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_16(' '), NXX_17(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash17(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -78,7 +78,7 @@ public enum FCDotPIE9DDash17 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash18.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash18.java index 45914bf..d7b16f9 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash18.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash18.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash18 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash18 implements FourCornerX00PetitCollePie9 { NXX_10(0x1D369, '\u20E5'), NXX_11(0x1D36A, '\u20E5'), @@ -58,10 +58,10 @@ public enum FCDotPIE9DDash18 implements FourCornerX06BaklavaPoints, FourCornerX0 NYY_17(0x1D367, '\u20E5'), NYY_18(0x1D368, '\u20E5'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash18(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -80,7 +80,7 @@ public enum FCDotPIE9DDash18 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash19.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash19.java index ae15be3..3a34c02 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash19.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash19.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash19 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash19 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -58,10 +58,10 @@ public enum FCDotPIE9DDash19 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_18(' '), NXX_19(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash19(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -80,7 +80,7 @@ public enum FCDotPIE9DDash19 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash20.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash20.java index 408d2f1..3e3e2f4 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash20.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash20.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash20 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash20 implements FourCornerX00PetitCollePie9 { UBAR_DECIMAL_0(0x1D7E2, '\u0332'), UBAR_DECIMAL_1(0x1D7E3, '\u0332'), @@ -59,10 +59,10 @@ public enum FCDotPIE9DDash20 implements FourCornerX06BaklavaPoints, FourCornerX0 NEG_DECIMAL_8(0x1D7E0, '\u0337'), NEG_DECIMAL_9(0x1D7E1, '\u0337'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash20(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -81,7 +81,7 @@ public enum FCDotPIE9DDash20 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java index be5f33a..6cfe2f5 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash21.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash21 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash21 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -60,10 +60,10 @@ public enum FCDotPIE9DDash21 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_20(' '), NXX_21(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash21(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -82,7 +82,7 @@ public enum FCDotPIE9DDash21 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash22.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash22.java index 042fcaf..cd0d1a3 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash22.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash22.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash22 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash22 implements FourCornerX00PetitCollePie9 { NXX_01('⇐'), NXX_02('⇑'), @@ -61,10 +61,10 @@ public enum FCDotPIE9DDash22 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_21('⇎'), NXX_22('⇏'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash22(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -83,7 +83,7 @@ public enum FCDotPIE9DDash22 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash23.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash23.java index d3f6992..0563720 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash23.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash23.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash23 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash23 implements FourCornerX00PetitCollePie9 { NXX_01(' '), NXX_02(' '), @@ -62,10 +62,10 @@ public enum FCDotPIE9DDash23 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_22(' '), NXX_23(' '), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash23(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -84,7 +84,7 @@ public enum FCDotPIE9DDash23 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash24.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash24.java index f6662be..675e850 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash24.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash24.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash24 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash24 implements FourCornerX00PetitCollePie9 { NXX_01(0x1D6A8), NXX_02(0x1D6A9), @@ -63,10 +63,10 @@ public enum FCDotPIE9DDash24 implements FourCornerX06BaklavaPoints, FourCornerX0 NXX_23(0x1D6BF), NXX_24(0x1D6C0), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash24(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -85,7 +85,7 @@ public enum FCDotPIE9DDash24 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash25.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash25.java index d514788..b043147 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash25.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash25.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash25 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash25 implements FourCornerX00PetitCollePie9 { // Upper case greek from MSX KANJI KuTen-600 and 616 @@ -66,10 +66,10 @@ public enum FCDotPIE9DDash25 implements FourCornerX06BaklavaPoints, FourCornerX0 OMEGA('Ω'), NXX_25('∇'), // ∇ = FROM APL ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash25(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -88,7 +88,7 @@ public enum FCDotPIE9DDash25 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash26.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash26.java index 9508263..9ad9763 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash26.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash26.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash26 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash26 implements FourCornerX00PetitCollePie9 { BOLD_A(0x1D400), BOLD_B(0x1D401), @@ -65,10 +65,10 @@ public enum FCDotPIE9DDash26 implements FourCornerX06BaklavaPoints, FourCornerX0 BOLD_Y(0x1D418), BOLD_Z(0x1D419), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash26(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -87,7 +87,7 @@ public enum FCDotPIE9DDash26 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash27.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash27.java index 4142ca3..78fd243 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash27.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9d/FCDotPIE9DDash27.java @@ -22,11 +22,11 @@ */ package org.x4o.fc18.cake2.pie9d; +import java.util.Arrays; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitCollePie9; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -36,7 +36,7 @@ import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; * @author Willem Cazander * @version 1.0 Jan 15, 2025 */ -public enum FCDotPIE9DDash27 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotPIE9DDash27 implements FourCornerX00PetitCollePie9 { // Why is 0x1D455 undefined, too many math symbols has killed unicode and all math sites uses pictures.... @@ -72,10 +72,10 @@ public enum FCDotPIE9DDash27 implements FourCornerX06BaklavaPoints, FourCornerX0 /// NL: Wat is een domme duitser ? Een duitser die engels kent. LOWITALIC_AMP('₰', '\u0337'), ; - private final int[] codePoints; + private final List codePointDisplay; private FCDotPIE9DDash27(int...codePoints) { - this.codePoints = codePoints; + this.codePointDisplay = Arrays.stream(codePoints).mapToObj(v -> v).toList(); } @Override @@ -94,7 +94,7 @@ public enum FCDotPIE9DDash27 implements FourCornerX06BaklavaPoints, FourCornerX0 } @Override - public int[] codePoints() { - return codePoints; + public List codePointDisplay() { + return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java index 6bf5534..2f8afcb 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7A.java @@ -23,17 +23,14 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; /// "FC.APL0127-P8A" Four Corner A Programming Language symbols cake slice of cake points. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// -public enum FCDotAPL0127DashP7A implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotAPL0127DashP7A implements FourCornerX00PetitColleZero33P8 { /// SL080000 One is pi CIRCLE('○'), @@ -109,7 +106,7 @@ public enum FCDotAPL0127DashP7A implements FourCornerX06BaklavaPoints, FourCorne static final private FCDotAPL0127DashP7A[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotAPL0127DashP7A(char codePoint) { + private FCDotAPL0127DashP7A(int codePoint) { this.codePoint = codePoint; } @@ -129,8 +126,8 @@ public enum FCDotAPL0127DashP7A implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] codePoints() { - return new int[] {codePoint}; + public int codePointImport() { + return codePoint; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java index eac41f2..f21898a 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7B.java @@ -23,17 +23,14 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; /// "FC.APL0127-P8B" Four Corner A Programming Language symbols cake slice of cake points. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// -public enum FCDotAPL0127DashP7B implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotAPL0127DashP7B implements FourCornerX00PetitColleZero33P8 { /// NEW from dynlog APL CIRCLE_DOT_XL('⍥'), @@ -113,7 +110,7 @@ public enum FCDotAPL0127DashP7B implements FourCornerX06BaklavaPoints, FourCorne static final private FCDotAPL0127DashP7B[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotAPL0127DashP7B(char codePoint) { + private FCDotAPL0127DashP7B(int codePoint) { this.codePoint = codePoint; } @@ -133,8 +130,8 @@ public enum FCDotAPL0127DashP7B implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] codePoints() { - return new int[] {codePoint}; + public int codePointImport() { + return codePoint; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java index c236d2e..9aaaaa2 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAPL0127DashP7C.java @@ -23,17 +23,14 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; /// "FC.APL0127-P8C" Four Corner A Programming Language symbols cake slice of cake points. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// -public enum FCDotAPL0127DashP7C implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotAPL0127DashP7C implements FourCornerX00PetitColleZero33P8 { /// SL720000 EPSILON('∊'), @@ -115,7 +112,7 @@ public enum FCDotAPL0127DashP7C implements FourCornerX06BaklavaPoints, FourCorne static final private FCDotAPL0127DashP7C[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotAPL0127DashP7C(char codePoint) { + private FCDotAPL0127DashP7C(int codePoint) { this.codePoint = codePoint; } @@ -135,8 +132,8 @@ public enum FCDotAPL0127DashP7C implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] codePoints() { - return new int[] {codePoint}; + public int codePointImport() { + return codePoint; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java index 6972c4d..a32e05c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7D.java @@ -23,17 +23,14 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; /// "FC.BYD0127-P8D" Four Corner Block Your Display terminal application. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// -public enum FCDotBYD0127DashP7D implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotBYD0127DashP7D implements FourCornerX00PetitColleZero33P8 { // 32 chars are CP/M Plus aligned @@ -71,7 +68,7 @@ public enum FCDotBYD0127DashP7D implements FourCornerX06BaklavaPoints, FourCorne static final private FCDotBYD0127DashP7D[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotBYD0127DashP7D(char codePoint) { + private FCDotBYD0127DashP7D(int codePoint) { this.codePoint = codePoint; } @@ -91,8 +88,8 @@ public enum FCDotBYD0127DashP7D implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] codePoints() { - return new int[] {codePoint}; + public int codePointImport() { + return codePoint; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java index 84f7923..61d5c5c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7E.java @@ -23,17 +23,14 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; /// "FC.BYD0127-P8E" Four Corner Block Your Display terminal application. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// -public enum FCDotBYD0127DashP7E implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotBYD0127DashP7E implements FourCornerX00PetitColleZero33P8 { BOX1_C('┐'), BOX1_D('┤'), @@ -71,7 +68,7 @@ public enum FCDotBYD0127DashP7E implements FourCornerX06BaklavaPoints, FourCorne static final private FCDotBYD0127DashP7E[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotBYD0127DashP7E(char codePoint) { + private FCDotBYD0127DashP7E(int codePoint) { this.codePoint = codePoint; } @@ -91,8 +88,8 @@ public enum FCDotBYD0127DashP7E implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] codePoints() { - return new int[] {codePoint}; + public int codePointImport() { + return codePoint; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java index a1d5dce..fe96ccb 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBYD0127DashP7F.java @@ -23,17 +23,14 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; /// "FC.BYD0127-P8F" Four Corner Block Your Display terminal application. /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 /// -public enum FCDotBYD0127DashP7F implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints { +public enum FCDotBYD0127DashP7F implements FourCornerX00PetitColleZero33P8 { U2597('▗'), U2598('▘'), @@ -70,7 +67,7 @@ public enum FCDotBYD0127DashP7F implements FourCornerX06BaklavaPoints, FourCorne static final private FCDotBYD0127DashP7F[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotBYD0127DashP7F(char codePoint) { + private FCDotBYD0127DashP7F(int codePoint) { this.codePoint = codePoint; } @@ -90,8 +87,8 @@ public enum FCDotBYD0127DashP7F implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] codePoints() { - return new int[] {codePoint}; + public int codePointImport() { + return codePoint; } static public int valuesLength() { diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java index 83d7502..c88a509 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java @@ -22,13 +22,10 @@ */ package org.x4o.fc18.cake2.zero33; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarne; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarneFrapper; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarneFrapperRetrait; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; -import org.x4o.fc18.cake2.FourCornerX21CodePoints; /// /// "FC.CDC1604-P6" Four Corner Core Data Cake has 27 pie slice number systems "Packed" for MATH and BASIC letters. @@ -43,7 +40,7 @@ import org.x4o.fc18.cake2.FourCornerX21CodePoints; /// @author Willem Cazander /// @version 1.0 Dec 22, 2024 /// -public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePoints, FourCornerX00PetitVideCoinCarne { +public enum FCDotCDC1604DashP6 implements FourCornerX00PetitColleZero33P8, FourCornerX00PetitVideCoinCarne { // [__NUL][__PIE68][__NCR68][__ESC6] [_NEWLINE][_SPACE]?! <>[] (){} // ~+-* ,.:; '"`^ =#$% // |_\/ @ABC DEFG HIJK @@ -126,7 +123,7 @@ public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCorner static final private FCDotCDC1604DashP6[] VALUES = values(); // values() is slow method private final int codePoint; - private FCDotCDC1604DashP6(char codePoint) { + private FCDotCDC1604DashP6(int codePoint) { this.codePoint = codePoint; } @@ -146,8 +143,8 @@ public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCorner } @Override - public int[] codePoints() { - return new int[] {codePoint}; + public int codePointImport() { + return codePoint; } @Override diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterMuffin.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterMuffin.java index 9822821..9492c97 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterMuffin.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterMuffin.java @@ -71,18 +71,18 @@ public class FCDocPageWriterMuffin implements ApiDocPageWriter, FCDocSegmentWrit String xSpec = FourCornerDotCake.FC_APL0127_P7A.nameSpec().replaceAll("P7A", "P7x"); try (ContentCloseable table = writer.docTable(xSpec, null, ApiDocContentCss.overviewSummary)) { writeTableBoxHeaderNumeric(writer, 28, true); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7A, v -> FCDotAPL0127DashP7A.valueOf(v).codePoints()[0]); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7B, v -> FCDotAPL0127DashP7B.valueOf(v).codePoints()[0]); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7C, v -> FCDotAPL0127DashP7C.valueOf(v).codePoints()[0]); + writeP7x(writer, FourCornerDotCake.FC_APL0127_P7A, v -> FCDotAPL0127DashP7A.valueOf(v).codePointImport()); + writeP7x(writer, FourCornerDotCake.FC_APL0127_P7B, v -> FCDotAPL0127DashP7B.valueOf(v).codePointImport()); + writeP7x(writer, FourCornerDotCake.FC_APL0127_P7C, v -> FCDotAPL0127DashP7C.valueOf(v).codePointImport()); } } try (ContentCloseable content = writer.docPageContent()) { String xSpec = FourCornerDotCake.FC_BYD0127_P7D.nameSpec().replaceAll("P7D", "P7x"); try (ContentCloseable table = writer.docTable(xSpec, null, ApiDocContentCss.overviewSummary)) { writeTableBoxHeaderNumeric(writer, 28, true); - writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7D, v -> FCDotBYD0127DashP7D.valueOf(v).codePoints()[0]); - writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7E, v -> FCDotBYD0127DashP7E.valueOf(v).codePoints()[0]); - writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7F, v -> FCDotBYD0127DashP7F.valueOf(v).codePoints()[0]); + writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7D, v -> FCDotBYD0127DashP7D.valueOf(v).codePointImport()); + writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7E, v -> FCDotBYD0127DashP7E.valueOf(v).codePointImport()); + writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7F, v -> FCDotBYD0127DashP7F.valueOf(v).codePointImport()); } } try (ContentCloseable content = writer.docPageContent()) { diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriter.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriter.java index 6d1aaea..0e075aa 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriter.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriter.java @@ -77,7 +77,7 @@ public interface FCDocSegmentWriter { writer.printTagEnd(Tag.td); for (int i = off; i < 16 + off; i++) { FCDotCDC1604DashP6 cdc = FCDotCDC1604DashP6.valueOf(i); - int codePoint = cdc.codePoints()[0]; + int codePoint = cdc.codePointImport(); if (i + 1 < 16 + off) { writer.printTagStart(Tag.td); } else { diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeSlice.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeSlice.java index 61c8466..aa858fa 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeSlice.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeSlice.java @@ -97,27 +97,27 @@ public class FCDocSegmentWriterCakeSlice implements FCDocSegmentWriter { return; } if (FourCornerDotCake.FC_APL0127_P7A.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7A.valueOf(v).codePoints()[0]); + writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7A.valueOf(v).codePointImport()); return; } if (FourCornerDotCake.FC_APL0127_P7B.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7B.valueOf(v).codePoints()[0]); + writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7B.valueOf(v).codePointImport()); return; } if (FourCornerDotCake.FC_APL0127_P7C.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7C.valueOf(v).codePoints()[0]); + writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7C.valueOf(v).codePointImport()); return; } if (FourCornerDotCake.FC_BYD0127_P7D.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7D.valueOf(v).codePoints()[0]); + writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7D.valueOf(v).codePointImport()); return; } if (FourCornerDotCake.FC_BYD0127_P7E.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7E.valueOf(v).codePoints()[0]); + writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7E.valueOf(v).codePointImport()); return; } if (FourCornerDotCake.FC_BYD0127_P7F.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7F.valueOf(v).codePoints()[0]); + writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7F.valueOf(v).codePointImport()); return; } if (FourCornerDotCake.FC_CDC1604_P6.equals(slice)) { diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeWord.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeWord.java index ab3b86a..e5dedbb 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeWord.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocSegmentWriterCakeWord.java @@ -24,9 +24,12 @@ package org.x4o.fc18.cake2.fcdoc; import java.io.IOException; import java.util.Arrays; +import java.util.List; +import java.util.Optional; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarne; -import org.x4o.fc18.cake2.FourCornerX00PetitVidePoints; +import org.x4o.fc18.cake2.FourCornerX21CodePointDisplay; +import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.o2o.tdoc.ApiDocContentCss; import org.x4o.o2o.tdoc.ApiDocContentWriter; @@ -47,13 +50,14 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { public void writeCakeWordSummary(ApiDocWriteEvent event) throws IOException { ApiDocContentWriter writer = event.getWriter(); TDocCakeWord word = event.getEventObject().toUserData(TDocCakeWord.class); - FourCornerX00PetitVidePoints[] videPoints = word.getSlice().getVidePoints(); + FourCornerX00PetitVide[] videPoints = word.getSlice().getVidePoints(); if (videPoints.length == 0) { return; } writer.docTableStart("Points Summary", "Encode point for all systems.",ApiDocContentCss.overviewSummary); writer.docTableHeader("System", "Point Sequence"); - FourCornerX00PetitVidePoints videPoint = videPoints[word.getOffset()]; + FourCornerX00PetitVide videPoint = videPoints[word.getOffset()]; + Optional x21Display = videPoint.kaasX21CodePointDisplay(); if (videPoint.isX06()) { writeSequence(writer, "X06", videPoint.toX06().baklavaPoints()); } @@ -63,8 +67,8 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { if (videPoint.isX18()) { writeSequence(writer, "X18", videPoint.toX18().cakePoints()); } - if (videPoint.isX21()) { - writeSequence(writer, "X21", videPoint.toX21().codePoints()); + if (x21Display.isPresent()) { + writeSequence(writer, "X21", x21Display.get().codePointDisplay()); } if (videPoint.isCoinCarne()) { FourCornerX00PetitVideCoinCarne cornerKerning = videPoint.toCoinCarne(); @@ -75,12 +79,16 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { } private void writeSequence(ApiDocContentWriter writer, String system, int[] sequence) throws IOException { + writeSequence(writer, system, Arrays.stream(sequence).mapToObj(v -> v).toList()); + } + + private void writeSequence(ApiDocContentWriter writer, String system, List sequence) throws IOException { StringBuilder buf = new StringBuilder(); - for (int i = 0; i < sequence.length; i++) { - int seq = sequence[i]; + for (int i = 0; i < sequence.size(); i++) { + int seq = sequence.get(i); String hex = String.format("0x%02X", seq); buf.append(hex); - if (i + 1 < sequence.length) { + if (i + 1 < sequence.size()) { buf.append(" - "); } } @@ -91,17 +99,15 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { public void writeCakeWordDetail(ApiDocWriteEvent event) throws IOException { ApiDocContentWriter writer = event.getWriter(); TDocCakeWord word = event.getEventObject().toUserData(TDocCakeWord.class); - FourCornerX00PetitVidePoints[] videPoints = word.getSlice().getVidePoints(); + FourCornerX00PetitVide[] videPoints = word.getSlice().getVidePoints(); if (videPoints.length == 0) { return; } - FourCornerX00PetitVidePoints letter = videPoints[word.getOffset()]; - if (!letter.isX21()) { - return; - } + FourCornerX00PetitVide letter = videPoints[word.getOffset()]; StringBuilder buf = new StringBuilder(); - Arrays.stream(letter.toX21().codePoints()).forEach(v -> buf.appendCodePoint(v)); - + letter.kaasX21CodePointDisplay().ifPresent(v -> { + v.codePointDisplay().forEach(vv -> buf.appendCodePoint(vv)); + }); writer.printTagStart(Tag.pre); writer.printCharacters(buf.toString()); writer.printTagEnd(Tag.pre); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java index 04f3fa2..99c0ea1 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotAPLTest.java @@ -49,11 +49,11 @@ public class FCDotAPLTest { Map global = new HashMap<>(); for (FCDotAPL0127DashP7A v : FCDotAPL0127DashP7A.values()) { Assertions.assertNotNull(v); - if (global.containsKey(v.codePoints()[0])) { + if (global.containsKey(v.codePointImport())) { duplicate = true; break; } - global.put(v.codePoints()[0], v); + global.put(v.codePointImport(), v); } Assertions.assertTrue(global.size() > 1); Assertions.assertFalse(duplicate, "Duplicate ascii core value detected"); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java index d1a0a8e..7b52ec1 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotBYDTest.java @@ -53,11 +53,11 @@ public class FCDotBYDTest { Map global = new HashMap<>(); for (FCDotBYD0127DashP7D v : FCDotBYD0127DashP7D.values()) { Assertions.assertNotNull(v); - if (global.containsKey(v.codePoints()[0])) { + if (global.containsKey(v.codePointImport())) { duplicate = true; break; } - global.put(v.codePoints()[0], v); + global.put(v.codePointImport(), v); } Assertions.assertTrue(global.size() > 1); Assertions.assertFalse(duplicate, "Duplicate ascii core value detected"); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java index e35434e..4f61f3c 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6Test.java @@ -43,11 +43,11 @@ public class FCDotCDC1604DashP6Test { Map global = new HashMap<>(); for (FCDotCDC1604DashP6 v : FCDotCDC1604DashP6.values()) { Assertions.assertNotNull(v); - if (global.containsKey(v.codePoints()[0])) { + if (global.containsKey(v.codePointImport())) { duplicate = true; break; } - global.put(v.codePoints()[0], v); + global.put(v.codePointImport(), v); } Assertions.assertTrue(global.size() > 1); Assertions.assertFalse(duplicate, "Duplicate ascii core value detected");