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 ed19f22..e542579 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 @@ -30,9 +30,9 @@ import java.util.function.Consumer; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitVide; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; import org.x4o.fc18.cake2.FourCornerX18CakeWord; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.zion7.FourCornerZion7Candlelier; @@ -78,42 +78,42 @@ public class FourCornerUnicodeDisplay { return buf.toString(); } - public String renderFromX06(List chars) { + public String renderFromX06(List chars) { return buildString(v -> renderFromX06(chars, v)); } - public void renderFromX06(List chars, StringBuilder buf) { + public void renderFromX06(List chars, StringBuilder buf) { List charPoints = new ArrayList<>(chars.size()); - for (FourCornerX06BaklavaPoints oven : chars) { - for (int v : oven.baklavaPoints()) { + for (FourCornerX06BaklavaPointSequence oven : chars) { + for (int v : oven.baklavaPointSequence()) { charPoints.add(v); } } renderFromInt18(charPoints, buf); } - public String renderFromX08(List chars) { + public String renderFromX08(List chars) { return buildString(v -> renderFromX08(chars, v)); } - public void renderFromX08(List chars, StringBuilder buf) { + public void renderFromX08(List chars, StringBuilder buf) { List charPoints = new ArrayList<>(chars.size()); - for (FourCornerX08MuffinPoints oven : chars) { - for (int v : oven.muffinPoints()) { + for (FourCornerX08MuffinPointSequence oven : chars) { + for (int v : oven.muffinPointSequence()) { charPoints.add(v); } } renderFromInt18(charPoints, buf); } - public String renderFromX18(List chars) { + public String renderFromX18(List chars) { return buildString(v -> renderFromX18(chars, v)); } - public void renderFromX18(List chars, StringBuilder buf) { + public void renderFromX18(List chars, StringBuilder buf) { List charPoints = new ArrayList<>(chars.size()); - for (FourCornerX18CakePoints oven : chars) { - for (int v : oven.cakePoints()) { + for (FourCornerX18CakePointSequence oven : chars) { + for (int v : oven.cakePointSequence()) { charPoints.add(v); } } @@ -186,10 +186,10 @@ public class FourCornerUnicodeDisplay { FourCornerX00PetitVide videPoint = videPoints[offset]; if (videPoint instanceof FourCornerX18CakeWord) { FourCornerX18CakeWord cakeWord = FourCornerX18CakeWord.class.cast(videPoint); - FourCornerX18CakePoints[] wordDefault = cakeWord.nameDefault(); - for (FourCornerX18CakePoints letter : wordDefault) { + FourCornerX18CakePointSequence[] wordDefault = cakeWord.nameDefault(); + for (FourCornerX18CakePointSequence letter : wordDefault) { letter.kaasX21CodePointDisplay().ifPresent(v -> { - v.codePointDisplay().forEach(vv -> output.appendCodePoint(vv)); + v.codePointSequence().forEach(vv -> output.appendCodePoint(vv)); }); } } @@ -208,7 +208,7 @@ public class FourCornerUnicodeDisplay { //} FourCornerX00PetitVide videPoint = videPoints[offset]; videPoint.kaasX21CodePointDisplay().ifPresent(v -> { - v.codePointDisplay().forEach(vv -> output.appendCodePoint(vv)); + v.codePointSequence().forEach(vv -> output.appendCodePoint(vv)); }); return; } @@ -223,13 +223,13 @@ public class FourCornerUnicodeDisplay { public void strobeNCR1632(BigInteger denominator, BigInteger numerator) { List math = new ArrayList<>(); FourCornerUnicodeMapper.DICTIONARY.toScriptSuper(numerator).forEach(v -> { - for (int chr : v.cakePoints()) { + for (int chr : v.cakePointSequence()) { math.add(chr); } }); math.add(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT.ordinal()); FourCornerUnicodeMapper.DICTIONARY.toScriptSub(denominator).forEach(v -> { - for (int chr : v.cakePoints()) { + for (int chr : v.cakePointSequence()) { math.add(chr); } }); 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 051d339..55839fe 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 @@ -27,9 +27,9 @@ import java.util.List; import java.util.PrimitiveIterator; import org.x4o.fc18.cake2.FourCornerX00PetitVide; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -60,23 +60,23 @@ public class FourCornerUnicodeImport { public List convertToInt18(String text) { List cakePoints = new ArrayList<>(text.length()); - for (FourCornerX18CakePoints oven : convertToX18(text)) { - for (int v : oven.cakePoints()) { + for (FourCornerX18CakePointSequence oven : convertToX18(text)) { + for (int v : oven.cakePointSequence()) { cakePoints.add(v); } } return cakePoints; } - public List convertToX06(String text) { + public List convertToX06(String text) { return convertToXXX(text, 6).stream().map(v -> v.toX06()).toList(); } - public List convertToX08(String text) { + public List convertToX08(String text) { return convertToXXX(text, 8).stream().map(v -> v.toX08()).toList(); } - public List convertToX18(String text) { + public List convertToX18(String text) { return convertToXXX(text, 18).stream().map(v -> v.toX18()).toList(); } 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 bc539f9..a8b116e 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 @@ -33,8 +33,8 @@ import java.util.PrimitiveIterator; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitVide; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash10; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash11; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash20; @@ -69,13 +69,13 @@ public enum FourCornerUnicodeMapper { if (!petitVide.isX18()) { continue; } - FourCornerX18CakePoints x18 = petitVide.toX18(); - if (x18.cakePoints().length > 1) { + FourCornerX18CakePointSequence x18 = petitVide.toX18(); + if (x18.cakePointSequence().length > 1) { continue; } - int char18 = x18.cakePoints()[0]; + int char18 = x18.cakePointSequence()[0]; petitVide.kaasX21CodePointDisplay().ifPresent(v -> { - int18To21.put(char18, v.codePointDisplay()); + int18To21.put(char18, v.codePointSequence()); }); } } @@ -83,11 +83,10 @@ public enum FourCornerUnicodeMapper { private void mapPointsX21(FourCornerX00PetitVide[] petitVides) { for (FourCornerX00PetitVide petitVide : petitVides) { petitVide.kaasX21CodePointImport().ifPresent(v -> { - int codePoint = v.codePointImport(); - if (codePoint < 0) { - return; + int codePoint = v.codePointDotIndex(); + if (codePoint >= 0) { + int21ToVide.put(codePoint, v); } - int21ToVide.put(codePoint, v); }); } // Fix space @@ -165,24 +164,24 @@ public enum FourCornerUnicodeMapper { return result; } - public List toScriptSuper(int value) { + public List toScriptSuper(int value) { return toScript(Integer.toString(value), 0); } - public List toScriptSub(int value) { + public List toScriptSub(int value) { return toScript(Integer.toString(value), 10); } - public List toScriptSuper(BigInteger value) { + public List toScriptSuper(BigInteger value) { return toScript(value.toString(10), 0); } - public List toScriptSub(BigInteger value) { + public List toScriptSub(BigInteger value) { return toScript(value.toString(10), 10); } - private List toScript(String value, int off) { - List result = new ArrayList<>(); + private List toScript(String value, int off) { + List result = new ArrayList<>(); PrimitiveIterator.OfInt i = value.codePoints().iterator(); while (i.hasNext()) { int chr = i.nextInt(); @@ -200,11 +199,11 @@ public enum FourCornerUnicodeMapper { return result; } - public List toDecimalsX06(int value) { + public List toDecimalsX06(int value) { return toDecimalsX00(value); } - public List toDecimalsX18(int value) { + public List toDecimalsX18(int value) { return toDecimalsX00(value); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLK.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLK.java index 135a00d..cf7e0f5 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLK.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLK.java @@ -48,7 +48,7 @@ public interface FourCornerX00PetitColleCLK extends FourCornerX18CakeWord { return Optional.empty(); } - default FourCornerX18CakePoints[] nameDefault() { - return FourCornerUnicodeImport.strict().convertToX18(name()).toArray(new FourCornerX18CakePoints[] {}); + default FourCornerX18CakePointSequence[] nameDefault() { + return FourCornerUnicodeImport.strict().convertToX18(name()).toArray(new FourCornerX18CakePointSequence[] {}); } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParler.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParler.java index e2506f0..28a69b0 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParler.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParler.java @@ -31,5 +31,5 @@ public interface FourCornerX00PetitColleCLKParler { FourCornerX00PetitColleCLKParlerMerde parlerMerde(); - String parlerName(); + String parlerToken(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParlerMerde.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParlerMerde.java index bc8690a..4c11b89 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParlerMerde.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleCLKParlerMerde.java @@ -58,13 +58,13 @@ public enum FourCornerX00PetitColleCLKParlerMerde implements FourCornerX00PetitC } @Override - public String parlerName() { + public String parlerToken() { return name().toLowerCase(); } /// NOTE this is not really for parsing, after moving to nether DB it gets full version-ed mapping per language and dialect. - public FourCornerX00PetitColleCLKParler parlerJeton(String alias) { - Objects.requireNonNull(alias); + public FourCornerX00PetitColleCLKParler parlerJeton(String token) { + Objects.requireNonNull(token); return new FourCornerX00PetitColleCLKParler() { @Override @@ -73,8 +73,8 @@ public enum FourCornerX00PetitColleCLKParlerMerde implements FourCornerX00PetitC } @Override - public String parlerName() { - return alias; + public String parlerToken() { + return token; } }; } 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 index 422e628..31fb308 100644 --- 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 @@ -28,11 +28,11 @@ import java.util.List; /// /// @author Willem Cazander /// @version 1.0 Jan 18, 2025 -public interface FourCornerX00PetitCollePie9 extends FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePointDisplay, FourCornerX21CodePointImport { +public interface FourCornerX00PetitCollePie9 extends FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence, FourCornerX21CodePointSequence, FourCornerX21CodePointDotIndex { @Override - default int codePointImport() { - List display = codePointDisplay(); + default int codePointDotIndex() { + List display = codePointSequence(); if (display.isEmpty()) { return -1; } 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 index d3e4184..af80b57 100644 --- 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 @@ -28,10 +28,10 @@ import java.util.List; /// /// @author Willem Cazander /// @version 1.0 Jan 19, 2025 -public interface FourCornerX00PetitColleZero33P8 extends FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints, FourCornerX21CodePointImport, FourCornerX21CodePointDisplay { +public interface FourCornerX00PetitColleZero33P8 extends FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence, FourCornerX21CodePointDotIndex, FourCornerX21CodePointSequence { @Override - default List codePointDisplay() { - return List.of(codePointImport()); + default List codePointSequence() { + return List.of(codePointDotIndex()); } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVide.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVide.java index 0adc72a..60baa9f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVide.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitVide.java @@ -31,38 +31,38 @@ import java.util.Optional; public interface FourCornerX00PetitVide { default boolean isX06() { - return this instanceof FourCornerX06BaklavaPoints; + return this instanceof FourCornerX06BaklavaPointSequence; } default boolean isX08() { - return this instanceof FourCornerX08MuffinPoints; + return this instanceof FourCornerX08MuffinPointSequence; } default boolean isX18() { - return this instanceof FourCornerX18CakePoints; + return this instanceof FourCornerX18CakePointSequence; } default Optional kaasX00CoinCarne() { return this instanceof FourCornerX00PetitVideCoinCarne?Optional.of(FourCornerX00PetitVideCoinCarne.class.cast(this)):Optional.empty(); } - default Optional kaasX21CodePointImport() { - return this instanceof FourCornerX21CodePointImport?Optional.of(FourCornerX21CodePointImport.class.cast(this)):Optional.empty(); + default Optional kaasX21CodePointImport() { + return this instanceof FourCornerX21CodePointDotIndex?Optional.of(FourCornerX21CodePointDotIndex.class.cast(this)):Optional.empty(); } - default Optional kaasX21CodePointDisplay() { - return this instanceof FourCornerX21CodePointDisplay?Optional.of(FourCornerX21CodePointDisplay.class.cast(this)):Optional.empty(); + default Optional kaasX21CodePointDisplay() { + return this instanceof FourCornerX21CodePointSequence?Optional.of(FourCornerX21CodePointSequence.class.cast(this)):Optional.empty(); } - default FourCornerX06BaklavaPoints toX06() { - return FourCornerX06BaklavaPoints.class.cast(this); + default FourCornerX06BaklavaPointSequence toX06() { + return FourCornerX06BaklavaPointSequence.class.cast(this); } - default FourCornerX08MuffinPoints toX08() { - return FourCornerX08MuffinPoints.class.cast(this); + default FourCornerX08MuffinPointSequence toX08() { + return FourCornerX08MuffinPointSequence.class.cast(this); } - default FourCornerX18CakePoints toX18() { - return FourCornerX18CakePoints.class.cast(this); + default FourCornerX18CakePointSequence toX18() { + return FourCornerX18CakePointSequence.class.cast(this); } } 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/FourCornerX06BaklavaPointSequence.java similarity index 93% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPoints.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPointSequence.java index f6ad33b..d65ed49 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/FourCornerX06BaklavaPointSequence.java @@ -26,8 +26,8 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX06BaklavaPoints extends FourCornerX00PetitVide { +public interface FourCornerX06BaklavaPointSequence extends FourCornerX00PetitVide { /// One baklava piece weights 52 gram - int[] baklavaPoints(); + int[] baklavaPointSequence(); } 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/FourCornerX08MuffinPointSequence.java similarity index 93% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPoints.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPointSequence.java index ef337e1..bda8138 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/FourCornerX08MuffinPointSequence.java @@ -26,8 +26,8 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX08MuffinPoints extends FourCornerX00PetitVide { +public interface FourCornerX08MuffinPointSequence extends FourCornerX00PetitVide { /// One muffin piece weights 111 gram - int[] muffinPoints(); + int[] muffinPointSequence(); } 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/FourCornerX18CakePointDotIndex.java similarity index 91% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePoints.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointDotIndex.java index 360896c..f4ba0ee 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/FourCornerX18CakePointDotIndex.java @@ -25,9 +25,9 @@ package org.x4o.fc18.cake2; /// Number index retriever for four corner cake points. /// /// @author Willem Cazander -/// @version 1.0 Dec 28, 2024 -public interface FourCornerX18CakePoints extends FourCornerX00PetitVide { +/// @version 1.0 Jan 19, 2025 +public interface FourCornerX18CakePointDotIndex extends FourCornerX00PetitVide { /// One cake piece weights 800 gram - int[] cakePoints(); + int cakePointDotIndex(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointSequence.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointSequence.java new file mode 100644 index 0000000..dc57b7d --- /dev/null +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointSequence.java @@ -0,0 +1,33 @@ +/* + * 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; + +/// Number sequence for four corner cake points. +/// +/// @author Willem Cazander +/// @version 1.0 Dec 28, 2024 +public interface FourCornerX18CakePointSequence extends FourCornerX00PetitVide { + + /// One cake piece weights 800 gram + int[] cakePointSequence(); +} diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakeWord.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakeWord.java index f2ff667..bf0d9a9 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakeWord.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakeWord.java @@ -26,8 +26,8 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 11, 2025 -public interface FourCornerX18CakeWord extends FourCornerX18CakePoints { +public interface FourCornerX18CakeWord extends FourCornerX18CakePointSequence { /// Default word provider - FourCornerX18CakePoints[] nameDefault(); + FourCornerX18CakePointSequence[] nameDefault(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointImport.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDotIndex.java similarity index 93% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointImport.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDotIndex.java index d5fe352..a37e521 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointImport.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDotIndex.java @@ -26,8 +26,8 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX21CodePointImport extends FourCornerX00PetitVide { +public interface FourCornerX21CodePointDotIndex extends FourCornerX00PetitVide { /// One code point weights ~1234 gram - int codePointImport(); + int codePointDotIndex(); } 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/FourCornerX21CodePointSequence.java similarity index 93% rename from nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDisplay.java rename to nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointSequence.java index e3aa8cb..25f9f9b 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDisplay.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointSequence.java @@ -28,8 +28,8 @@ import java.util.List; /// /// @author Willem Cazander /// @version 1.0 Jan 19, 2025 -public interface FourCornerX21CodePointDisplay extends FourCornerX00PetitVide { +public interface FourCornerX21CodePointSequence extends FourCornerX00PetitVide { /// One code point weights ~1234 gram - List codePointDisplay(); + List codePointSequence(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashA.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashA.java index b18794b..9d30cb1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashA.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashA.java @@ -83,7 +83,7 @@ public enum FCDotCLK1KDashA implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_A.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashB.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashB.java index fd839cb..7d635a1 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashB.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashB.java @@ -71,7 +71,7 @@ public enum FCDotCLK1KDashB implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_B.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashC.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashC.java index 4e715e6..4fac437 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashC.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashC.java @@ -98,7 +98,7 @@ public enum FCDotCLK1KDashC implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_C.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashD.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashD.java index e26db2f..34ce369 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashD.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashD.java @@ -71,7 +71,7 @@ public enum FCDotCLK1KDashD implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_D.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashE.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashE.java index d5e0aec..2be0401 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashE.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashE.java @@ -82,7 +82,7 @@ public enum FCDotCLK1KDashE implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_E.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashF.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashF.java index 82144c8..b7820f8 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashF.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashF.java @@ -79,7 +79,7 @@ public enum FCDotCLK1KDashF implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_F.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashG.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashG.java index 3fb2fad..d6960fc 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashG.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashG.java @@ -60,7 +60,7 @@ public enum FCDotCLK1KDashG implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_G.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashH.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashH.java index 4c723e5..160365f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashH.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashH.java @@ -48,7 +48,7 @@ public enum FCDotCLK1KDashH implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_H.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashI.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashI.java index 4374295..433d9b7 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashI.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashI.java @@ -75,7 +75,7 @@ public enum FCDotCLK1KDashI implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_I.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashJ.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashJ.java index 4f545e7..a63a97c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashJ.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashJ.java @@ -48,7 +48,7 @@ public enum FCDotCLK1KDashJ implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_J.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashK.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashK.java index b13ad9a..71c1d8f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashK.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashK.java @@ -50,7 +50,7 @@ public enum FCDotCLK1KDashK implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_K.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashL.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashL.java index 4f06dbf..430802d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashL.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashL.java @@ -63,7 +63,7 @@ public enum FCDotCLK1KDashL implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_L.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashM.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashM.java index a29da3a..d316a59 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashM.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashM.java @@ -67,7 +67,7 @@ public enum FCDotCLK1KDashM implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_M.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashN.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashN.java index a4343ca..62e08de 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashN.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashN.java @@ -69,7 +69,7 @@ public enum FCDotCLK1KDashN implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_N.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashO.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashO.java index cb2a20c..3508fda 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashO.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashO.java @@ -66,7 +66,7 @@ public enum FCDotCLK1KDashO implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_O.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashP.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashP.java index b6c95f4..96b8eea 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashP.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashP.java @@ -64,7 +64,7 @@ public enum FCDotCLK1KDashP implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_P.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashQ.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashQ.java index 1242843..29bb86d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashQ.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashQ.java @@ -48,7 +48,7 @@ public enum FCDotCLK1KDashQ implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_Q.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashR.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashR.java index c397bb6..447219e 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashR.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashR.java @@ -85,7 +85,7 @@ public enum FCDotCLK1KDashR implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_R.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashS.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashS.java index 5240d02..8d63c63 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashS.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashS.java @@ -83,7 +83,7 @@ public enum FCDotCLK1KDashS implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_S.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashT.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashT.java index 4518a09..2bb0171 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashT.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashT.java @@ -88,7 +88,7 @@ public enum FCDotCLK1KDashT implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_T.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashU.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashU.java index bd93836..b288d1c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashU.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashU.java @@ -60,7 +60,7 @@ public enum FCDotCLK1KDashU implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_U.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashV.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashV.java index 2018ae2..defca3d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashV.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashV.java @@ -57,7 +57,7 @@ public enum FCDotCLK1KDashV implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_V.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashW.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashW.java index f44d3b2..883cbd9 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashW.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashW.java @@ -64,7 +64,7 @@ public enum FCDotCLK1KDashW implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_W.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashX.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashX.java index 56b987a..f3a7b48 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashX.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashX.java @@ -52,7 +52,7 @@ public enum FCDotCLK1KDashX implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_X.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashY.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashY.java index 0a9d92d..cb7cd88 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashY.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashY.java @@ -50,7 +50,7 @@ public enum FCDotCLK1KDashY implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_Y.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashZ.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashZ.java index 081931d..322bbd7 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashZ.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/clk1k/FCDotCLK1KDashZ.java @@ -50,7 +50,7 @@ public enum FCDotCLK1KDashZ implements FourCornerX00PetitColleCLK { } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_CLK1K_Z.getStart() + ordinal()}; } } 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 67fbfd1..6c97035 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 @@ -47,22 +47,22 @@ public enum FCDotPIE9CDash01 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX01_A, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_01.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 f6276f8..f41d7ee 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 @@ -48,22 +48,22 @@ public enum FCDotPIE9CDash02 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX02_B, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_02.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 af09a3a..2613e13 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 @@ -49,22 +49,22 @@ public enum FCDotPIE9CDash03 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX03_C, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_03.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 7a7b998..34e5d83 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 @@ -50,22 +50,22 @@ public enum FCDotPIE9CDash04 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX04_D, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_04.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 c994328..b0f1ee2 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 @@ -51,22 +51,22 @@ public enum FCDotPIE9CDash05 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX05_E, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_05.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 8132992..04e3368 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 @@ -52,22 +52,22 @@ public enum FCDotPIE9CDash06 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX06_F, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_06.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 34f1e96..bd8ec13 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 @@ -53,22 +53,22 @@ public enum FCDotPIE9CDash07 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX07_G, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_07.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 d33f356..989a128 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 @@ -54,22 +54,22 @@ public enum FCDotPIE9CDash08 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX08_H, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_08.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 fc0f19f..c2b4263 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 @@ -55,22 +55,22 @@ public enum FCDotPIE9CDash09 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX09_I, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_09.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 512c813..09eb70f 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 @@ -56,22 +56,22 @@ public enum FCDotPIE9CDash10 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX10_J, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_10.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { return codePointDisplay; } 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 bd11a0a..477faee 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 @@ -57,22 +57,22 @@ public enum FCDotPIE9CDash11 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX11_K, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_11.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 cbfb5d2..2f185d2 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 @@ -58,22 +58,22 @@ public enum FCDotPIE9CDash12 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX12_L, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_12.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 82228a4..49542c0 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 @@ -59,22 +59,22 @@ public enum FCDotPIE9CDash13 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX13_M, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_13.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 16daae8..1f18e79 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 @@ -60,22 +60,22 @@ public enum FCDotPIE9CDash14 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX14_N, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_14.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 9a47404..a0e360a 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 @@ -61,22 +61,22 @@ public enum FCDotPIE9CDash15 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX15_O, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_15.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 b5071df..4f51913 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 @@ -62,22 +62,22 @@ public enum FCDotPIE9CDash16 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX16_P, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_16.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 1733a1d..07f6dc4 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 @@ -63,22 +63,22 @@ public enum FCDotPIE9CDash17 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX17_Q, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_17.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 123cacf..4a1f57f 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 @@ -65,22 +65,22 @@ public enum FCDotPIE9CDash18 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX18_R, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_18.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 d0fef74..5f607df 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 @@ -65,22 +65,22 @@ public enum FCDotPIE9CDash19 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX19_S, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_19.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 3e2ecc6..3f22837 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 @@ -66,22 +66,22 @@ public enum FCDotPIE9CDash20 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX20_T, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_20.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 d28d5f0..8ebb30e 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 @@ -67,22 +67,22 @@ public enum FCDotPIE9CDash21 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX21_U, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_21.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 1f2874c..f57fb85 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 @@ -68,22 +68,22 @@ public enum FCDotPIE9CDash22 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX22_V, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_22.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 4383093..259057a 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 @@ -69,22 +69,22 @@ public enum FCDotPIE9CDash23 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX23_W, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_23.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 ac8530c..d7d633c 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 @@ -70,22 +70,22 @@ public enum FCDotPIE9CDash24 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX24_X, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_24.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 dd7f7ed..1c56349 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 @@ -73,22 +73,22 @@ public enum FCDotPIE9CDash25 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX25_Y, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_25.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 a3bf2ae..f95561d 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 @@ -72,22 +72,22 @@ public enum FCDotPIE9CDash26 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX26_Z, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_26.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 6551975..10bdfa8 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 @@ -73,22 +73,22 @@ public enum FCDotPIE9CDash27 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX27_AMPERSAND, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9C_27.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 4fdb9c1..aec1eb6 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 @@ -47,22 +47,22 @@ public enum FCDotPIE9DDash01 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY01_AT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_01.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 911144f..41bd25a 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 @@ -50,22 +50,22 @@ public enum FCDotPIE9DDash02 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_02.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 9f4178a..29594fa 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 @@ -49,22 +49,22 @@ public enum FCDotPIE9DDash03 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY03_BAR_V_LEFT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_03.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 0df60e6..3eab735 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 @@ -50,22 +50,22 @@ public enum FCDotPIE9DDash04 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY04_BAR_UNDER, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_04.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 94fad4b..f58829d 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 @@ -57,22 +57,22 @@ public enum FCDotPIE9DDash05 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY05_BAR_VERTICAL, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_05.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 c41a1f1..31870da 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 @@ -52,22 +52,22 @@ public enum FCDotPIE9DDash06 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY06_PERCENT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_06.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 f3ef549..72831c9 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 @@ -53,22 +53,22 @@ public enum FCDotPIE9DDash07 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY07_DOLLAR, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_07.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 bc3404d..133d966 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 @@ -54,22 +54,22 @@ public enum FCDotPIE9DDash08 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY08_HASH, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_08.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 8033298..7fbcf02 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 @@ -55,22 +55,22 @@ public enum FCDotPIE9DDash09 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY09_EQUALS, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_09.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 50b48c8..b645c80 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 @@ -57,22 +57,22 @@ public enum FCDotPIE9DDash10 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY10_CARET, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_10.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { return codePointDisplay; } 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 46c7756..692dbed 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 @@ -57,22 +57,22 @@ public enum FCDotPIE9DDash11 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY11_BACKTICK, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_11.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 6ac73d6..d44e688 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 @@ -58,22 +58,22 @@ public enum FCDotPIE9DDash12 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY12_QUOTATION, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_12.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 e6db98b..024695c 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 @@ -59,22 +59,22 @@ public enum FCDotPIE9DDash13 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY13_APOSTROPHE, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_13.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 9a4e647..37f12a7 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 @@ -60,22 +60,22 @@ public enum FCDotPIE9DDash14 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY14_SEMICOLON, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_14.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 e54cf40..c281ad6 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 @@ -61,22 +61,22 @@ public enum FCDotPIE9DDash15 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY15_COLON, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_15.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 a603342..c7855ff 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 @@ -62,22 +62,22 @@ public enum FCDotPIE9DDash16 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY16_DOT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_16.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 bffe36d..8ae66ed 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 @@ -63,22 +63,22 @@ public enum FCDotPIE9DDash17 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY17_COMMA, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_17.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 d7b16f9..a631fca 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 @@ -65,22 +65,22 @@ public enum FCDotPIE9DDash18 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY18_ASTERISK, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_18.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 3a34c02..85ba1fb 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 @@ -65,22 +65,22 @@ public enum FCDotPIE9DDash19 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY19_MINUS, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_19.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 3e3e2f4..bca3053 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 @@ -66,22 +66,22 @@ public enum FCDotPIE9DDash20 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY20_PLUS, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_20.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 6cfe2f5..f10d8fe 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 @@ -67,22 +67,22 @@ public enum FCDotPIE9DDash21 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY21_TILDE, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_21.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 cd0d1a3..78ccfe0 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 @@ -68,22 +68,22 @@ public enum FCDotPIE9DDash22 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY22_TAG_CURLY_RIGHT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_22.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 0563720..1d5cfc0 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 @@ -69,22 +69,22 @@ public enum FCDotPIE9DDash23 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY23_TAG_CURLY_LEFT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_23.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 675e850..7692d45 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 @@ -70,22 +70,22 @@ public enum FCDotPIE9DDash24 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY24_TAG_ROUND_RIGHT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_24.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 b043147..f1d59c1 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 @@ -73,22 +73,22 @@ public enum FCDotPIE9DDash25 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY25_TAG_ROUND_LEFT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_25.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 9ad9763..aaa0a62 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 @@ -72,22 +72,22 @@ public enum FCDotPIE9DDash26 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY26_TAG_SQUARE_RIGHT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_26.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { 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 78fd243..31c1c28 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 @@ -79,22 +79,22 @@ public enum FCDotPIE9DDash27 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY27_TAG_SQUARE_LEFT, ordinal()); } @Override - public int[] muffinPoints() { - return baklavaPoints(); + public int[] muffinPointSequence() { + return baklavaPointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_PIE9D_27.getStart() + ordinal()}; } @Override - public List codePointDisplay() { + public List codePointSequence() { return codePointDisplay; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAMD0110DashSA.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAMD0110DashSA.java index 3eb0053..9406e70 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAMD0110DashSA.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotAMD0110DashSA.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.AMD0110-SA" Four Corner Application Methodoums Decimals @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Dec 31, 2024 */ -public enum FCDotAMD0110DashSA implements FourCornerX18CakePoints { +public enum FCDotAMD0110DashSA implements FourCornerX18CakePointSequence { /// End-user defined rendering for zero T010_NXX_001, /// End-user defined rendering for one @@ -48,7 +48,7 @@ public enum FCDotAMD0110DashSA implements FourCornerX18CakePoints { ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_AMD0110_SA.getStart() + ordinal()}; } } 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 2f8afcb..b72cdf9 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 @@ -111,22 +111,22 @@ public enum FCDotAPL0127DashP7A implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_APL0127_P7A.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_APL0127_P7A.getStart() + ordinal()}; } @Override - public int codePointImport() { + public int codePointDotIndex() { return codePoint; } 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 f21898a..8fda2b6 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 @@ -115,22 +115,22 @@ public enum FCDotAPL0127DashP7B implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_APL0127_P7B.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_APL0127_P7B.getStart() + ordinal()}; } @Override - public int codePointImport() { + public int codePointDotIndex() { return codePoint; } 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 9aaaaa2..897e6a4 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 @@ -117,22 +117,22 @@ public enum FCDotAPL0127DashP7C implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_APL0127_P7A.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_APL0127_P7C.getStart() + ordinal()}; } @Override - public int codePointImport() { + public int codePointDotIndex() { return codePoint; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBMW0102DashS2.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBMW0102DashS2.java index 2419c74..c5fa64d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBMW0102DashS2.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotBMW0102DashS2.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.BMW0102-S2" Four Corner Binary Model Word encoding. @@ -31,13 +31,13 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Dec 31, 2024 */ -public enum FCDotBMW0102DashS2 implements FourCornerX18CakePoints { +public enum FCDotBMW0102DashS2 implements FourCornerX18CakePointSequence { T002_NXX_001, T002_NXX_002, ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_BMW0102_S2.getStart() + ordinal()}; } } 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 a32e05c..3ce2710 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 @@ -73,22 +73,22 @@ public enum FCDotBYD0127DashP7D implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_BYD0127_P7D.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_BYD0127_P7D.getStart() + ordinal()}; } @Override - public int codePointImport() { + public int codePointDotIndex() { return codePoint; } 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 61d5c5c..e137eab 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 @@ -73,22 +73,22 @@ public enum FCDotBYD0127DashP7E implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_BYD0127_P7E.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_BYD0127_P7E.getStart() + ordinal()}; } @Override - public int codePointImport() { + public int codePointDotIndex() { return codePoint; } 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 fe96ccb..8aa6b69 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 @@ -72,22 +72,22 @@ public enum FCDotBYD0127DashP7F implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_BYD0127_P7F.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_BYD0127_P7F.getStart() + ordinal()}; } @Override - public int codePointImport() { + public int codePointDotIndex() { return codePoint; } 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 c88a509..12e1929 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 @@ -128,22 +128,22 @@ public enum FCDotCDC1604DashP6 implements FourCornerX00PetitColleZero33P8, FourC } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return new int[] {ordinal()}; } @Override - public int[] muffinPoints() { + public int[] muffinPointSequence() { return new int[] {ordinal()}; } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {ordinal()}; } @Override - public int codePointImport() { + public int codePointDotIndex() { return codePoint; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0.java index 57ba991..ae150b7 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0.java @@ -26,9 +26,9 @@ import java.util.ArrayList; 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.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.DEC0127-PX0" Four Corner dot Direct or Escaped Control in grid of 1 by 27 of dashed CDC invisible page X Zero codes. @@ -42,7 +42,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Dec 24, 2024 */ -public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints { +public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence { // =========== External argumented escape sequence, always has closed ending. (MUST terminate with ESC_SEQ_SALAH) @@ -193,8 +193,8 @@ public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPoints, FourCorne // ============ TODO: make api more nice - public List toX08MuffinPoints(FCDotCDC1604DashP6... letters) { - List result = new ArrayList<>(); + public List toX08MuffinPoints(FCDotCDC1604DashP6... letters) { + List result = new ArrayList<>(); result.add(this); for (FCDotCDC1604DashP6 letter : letters) { result.add(letter); @@ -202,9 +202,9 @@ public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPoints, FourCorne return result; } - public List toX06BaklavaPoints(FCDotCDC1604DashP6... letters) { - List result = new ArrayList<>(); - for (int baklave : baklavaPoints()) { + public List toX06BaklavaPoints(FCDotCDC1604DashP6... letters) { + List result = new ArrayList<>(); + for (int baklave : baklavaPointSequence()) { result.add(FCDotCDC1604DashP6.valueOf(baklave)); } for (FCDotCDC1604DashP6 letter : letters) { @@ -215,7 +215,7 @@ public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPoints, FourCorne public List toInt18BaklavaPoints(int... letters) { List result = new ArrayList<>(); - for (int baklave : baklavaPoints()) { + for (int baklave : baklavaPointSequence()) { result.add(baklave); } for (int letter : letters) { @@ -265,7 +265,7 @@ public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return new int[] { FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() / 9), FCDotCDC1604DashP6._ESC6_X1.ordinal() + ((ordinal() / 3) % 3), @@ -274,12 +274,12 @@ public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPoints, FourCorne } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_DEC0127_PX0.getStart() + ordinal()}; } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDNA0104DashS4.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDNA0104DashS4.java index e7f0302..4523066 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDNA0104DashS4.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotDNA0104DashS4.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.DNA0104-S4" Four Corner Application Direct Nuclear Air strike for quadratonic values. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Jan 07, 2024 */ -public enum FCDotDNA0104DashS4 implements FourCornerX18CakePoints { +public enum FCDotDNA0104DashS4 implements FourCornerX18CakePointSequence { NXX_001, NXX_002, NXX_003, @@ -40,7 +40,7 @@ public enum FCDotDNA0104DashS4 implements FourCornerX18CakePoints { ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_DNA0104_S4.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotIBM1616DashH8.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotIBM1616DashH8.java index 0a9cafd..1019e04 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotIBM1616DashH8.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotIBM1616DashH8.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.IBM1616-H8" Four Corner Interim Byte Mode, embed raw 8 bit Data @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotIBM1616DashH8 implements FourCornerX18CakePoints { +public enum FCDotIBM1616DashH8 implements FourCornerX18CakePointSequence { NXX_001, NXX_002, NXX_003, @@ -292,7 +292,7 @@ public enum FCDotIBM1616DashH8 implements FourCornerX18CakePoints { ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_IBM1616_H8.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotNXP0103DashS3.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotNXP0103DashS3.java index fe91bad..8c3dba8 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotNXP0103DashS3.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotNXP0103DashS3.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.NXP0103-S3" Four Corner Application Natural X-state Phasing for tri-state or high impedance (Hi-Z) signals. @@ -32,14 +32,14 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Jan 07, 2024 */ -public enum FCDotNXP0103DashS3 implements FourCornerX18CakePoints { +public enum FCDotNXP0103DashS3 implements FourCornerX18CakePointSequence { NXX_001, NXX_002, NXX_003, ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_NXP0103_S3.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0801DashH3.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0801DashH3.java index e50c51c..7920e1c 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0801DashH3.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0801DashH3.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.OCE0801-H3" Four Corner Octal Character Encoding in Hinari 3 bit. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotOCE0801DashH3 implements FourCornerX18CakePoints { +public enum FCDotOCE0801DashH3 implements FourCornerX18CakePointSequence { NXX_001, NXX_002, NXX_003, @@ -44,7 +44,7 @@ public enum FCDotOCE0801DashH3 implements FourCornerX18CakePoints { ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_OCE0801_H3.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0808DashH6.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0808DashH6.java index e7df776..bd9573d 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0808DashH6.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0808DashH6.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.OCE0808-H6" Four Corner Octal Character Encoding in Hinari 6 bit. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotOCE0808DashH6 implements FourCornerX18CakePoints { +public enum FCDotOCE0808DashH6 implements FourCornerX18CakePointSequence { NXX_001, NXX_002, NXX_003, @@ -100,7 +100,7 @@ public enum FCDotOCE0808DashH6 implements FourCornerX18CakePoints { ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_OCE0808_H6.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0864DashH9.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0864DashH9.java index 415c092..7debf3f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0864DashH9.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotOCE0864DashH9.java @@ -23,7 +23,7 @@ package org.x4o.fc18.cake2.zero33; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; /** * "FC.OCE0864-H9" Four Corner Octal Character Encoding in Hinari 9 bit. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePoints; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotOCE0864DashH9 implements FourCornerX18CakePoints { +public enum FCDotOCE0864DashH9 implements FourCornerX18CakePointSequence { NXX_001, NXX_002, NXX_003, @@ -548,7 +548,7 @@ public enum FCDotOCE0864DashH9 implements FourCornerX18CakePoints { ; @Override - public int[] cakePoints() { + public int[] cakePointSequence() { return new int[] {FourCornerDotCake.FC_OCE0864_H9.getStart() + ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroACursor.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroACursor.java index 206935c..ecdf2ac 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroACursor.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroACursor.java @@ -24,9 +24,9 @@ package org.x4o.fc18.cake2.zero33.vt06; import java.util.Objects; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; 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 14, 2025 */ -public enum VTDash06DotZeroACursor implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints { +public enum VTDash06DotZeroACursor implements FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence { /// VT-06 = ESC_VT06 /// + ESC_SEQ_RAKA_AT + A // select cursor function @@ -63,17 +63,17 @@ public enum VTDash06DotZeroACursor implements FourCornerX06BaklavaPoints, FourCo } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC_VT06.baklavaPointsVT06Action(actionGroup, action); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { - return new int[] {FCDotDEC0127DashPX0.ESC_VT06.cakePoints()[0], actionGroup.ordinal(), action.ordinal()}; + public int[] cakePointSequence() { + return new int[] {FCDotDEC0127DashPX0.ESC_VT06.cakePointSequence()[0], actionGroup.ordinal(), action.ordinal()}; } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroCClear.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroCClear.java index 87c8144..940e1ac 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroCClear.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/vt06/VTDash06DotZeroCClear.java @@ -24,9 +24,9 @@ package org.x4o.fc18.cake2.zero33.vt06; import java.util.Objects; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; 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 14, 2025 */ -public enum VTDash06DotZeroCClear implements FourCornerX06BaklavaPoints, FourCornerX08MuffinPoints, FourCornerX18CakePoints { +public enum VTDash06DotZeroCClear implements FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence { VT_CLEAR_TOP(FCDotCDC1604DashP6.NX01_A), VT_CLEAR_LEFT(FCDotCDC1604DashP6.NX02_B), @@ -54,17 +54,17 @@ public enum VTDash06DotZeroCClear implements FourCornerX06BaklavaPoints, FourCor } @Override - public int[] baklavaPoints() { + public int[] baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC_VT06.baklavaPointsVT06Action(actionGroup, action); } @Override - public int[] muffinPoints() { - return cakePoints(); + public int[] muffinPointSequence() { + return cakePointSequence(); } @Override - public int[] cakePoints() { - return new int[] {FCDotDEC0127DashPX0.ESC_VT06.cakePoints()[0], actionGroup.ordinal(), action.ordinal()}; + public int[] cakePointSequence() { + return new int[] {FCDotDEC0127DashPX0.ESC_VT06.cakePointSequence()[0], actionGroup.ordinal(), action.ordinal()}; } } diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java index 56cfda7..27f05a2 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeDisplayTest.java @@ -28,7 +28,7 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash26; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -43,7 +43,7 @@ public class FourCornerUnicodeDisplayTest { @Test public void testMixedCasing() throws Exception { - List cdc = new ArrayList<>(); + List cdc = new ArrayList<>(); cdc.add(FCDotPIE9CDash26.LOW_A); cdc.add(FCDotPIE9CDash26.LOW_B); // if used as this per letter full escaping here.... cdc.add(FCDotCDC1604DashP6._SPACE); // out of range is end lower @@ -66,7 +66,7 @@ public class FourCornerUnicodeDisplayTest { @Test public void testNumberTerminatorOutOfRange() throws Exception { - List cdc = new ArrayList<>(); + List cdc = new ArrayList<>(); cdc.add(FCDotCDC1604DashP6.NX24_X); // = X cdc.addAll(FCDotDEC0127DashPX0.ESC68_PIE.toX06BaklavaPoints()); cdc.add(FCDotCDC1604DashP6.NY10_CARET); // ^ @@ -80,7 +80,7 @@ public class FourCornerUnicodeDisplayTest { @Test public void testNumberPieOutOfRange() throws Exception { - List cdc = new ArrayList<>(); + List cdc = new ArrayList<>(); cdc.addAll(FCDotDEC0127DashPX0.ESC68_PIE.toX06BaklavaPoints()); cdc.add(FCDotCDC1604DashP6.NX01_A); cdc.add(FCDotCDC1604DashP6.NX02_B); // B diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java index 306a85c..b4ab06f 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/FourCornerUnicodeImportTest.java @@ -26,9 +26,9 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; -import org.x4o.fc18.cake2.FourCornerX08MuffinPoints; -import org.x4o.fc18.cake2.FourCornerX18CakePoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash10; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash26; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; @@ -44,7 +44,7 @@ public class FourCornerUnicodeImportTest { @Test public void testAsciiUpper() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX06("FOOBAR"); + List cdc = FourCornerUnicodeImport.strict().convertToX06("FOOBAR"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(6, cdc.size()); @@ -61,7 +61,7 @@ public class FourCornerUnicodeImportTest { @Test public void testAsciiLower() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX06("foobar"); + List cdc = FourCornerUnicodeImport.strict().convertToX06("foobar"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(10, cdc.size()); @@ -82,7 +82,7 @@ public class FourCornerUnicodeImportTest { @Test public void testAsciiMixedX06() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX06("fooBAR"); + List cdc = FourCornerUnicodeImport.strict().convertToX06("fooBAR"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(13, cdc.size()); @@ -106,7 +106,7 @@ public class FourCornerUnicodeImportTest { @Test public void testAsciiMixedX08() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX08("fooBAR"); + List cdc = FourCornerUnicodeImport.strict().convertToX08("fooBAR"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(9, cdc.size()); @@ -126,7 +126,7 @@ public class FourCornerUnicodeImportTest { @Test public void testAsciiMixedX18() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX18("fooBAR"); + List cdc = FourCornerUnicodeImport.strict().convertToX18("fooBAR"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(6, cdc.size()); // = 108 bit @@ -145,7 +145,7 @@ public class FourCornerUnicodeImportTest { @Test public void testCheckDiacritics() throws Exception { String foobar = "ꞘȍőḆẬř"; - List cdc = FourCornerUnicodeImport.lossy().convertToX06(foobar); + List cdc = FourCornerUnicodeImport.lossy().convertToX06(foobar); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals("FOOBAR", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); @@ -157,7 +157,7 @@ public class FourCornerUnicodeImportTest { @Test public void testCheckMissingChar() throws Exception { String foobar = "FOO\u5432\u5432\u5432"; - List cdc = FourCornerUnicodeImport.lossy().convertToX06(foobar); + List cdc = FourCornerUnicodeImport.lossy().convertToX06(foobar); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals("FOO???", FourCornerUnicodeDisplay.text().renderFromX06(cdc)); @@ -168,7 +168,7 @@ public class FourCornerUnicodeImportTest { @Test public void testNumberX06() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX06("01201337"); + List cdc = FourCornerUnicodeImport.strict().convertToX06("01201337"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(12, cdc.size()); @@ -191,7 +191,7 @@ public class FourCornerUnicodeImportTest { @Test public void testNumberX08() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX08("01201337"); + List cdc = FourCornerUnicodeImport.strict().convertToX08("01201337"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(10, cdc.size()); @@ -212,7 +212,7 @@ public class FourCornerUnicodeImportTest { @Test public void testNumberX18() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX18("01201337"); + List cdc = FourCornerUnicodeImport.strict().convertToX18("01201337"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(8, cdc.size()); @@ -231,7 +231,7 @@ public class FourCornerUnicodeImportTest { @Test public void testLineEndings() throws Exception { - List cdc = FourCornerUnicodeImport.strict().convertToX06("A\nB\rC\r\nD\n"); + List cdc = FourCornerUnicodeImport.strict().convertToX06("A\nB\rC\r\nD\n"); Assertions.assertNotNull(cdc); Assertions.assertFalse(cdc.isEmpty()); Assertions.assertEquals(8, cdc.size()); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterBaklava.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterBaklava.java index 8a3dc6b..c25b0c5 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterBaklava.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/fcdoc/FCDocPageWriterBaklava.java @@ -82,7 +82,7 @@ public class FCDocPageWriterBaklava implements ApiDocPageWriter, FCDocSegmentWri } List piNum = new ArrayList<>(); //piNum.add(FCDotCDC1604DashP6.__NCR68.ordinal());\ - for (int letter : FCDotDEC0127DashPX0.ESC68_NCR.baklavaPoints()) { + for (int letter : FCDotDEC0127DashPX0.ESC68_NCR.baklavaPointSequence()) { piNum.add(letter); } piNum.add(FCDotCDC1604DashP6.NX01_A.ordinal() + t); 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 9492c97..e2d385f 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).codePointImport()); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7B, v -> FCDotAPL0127DashP7B.valueOf(v).codePointImport()); - writeP7x(writer, FourCornerDotCake.FC_APL0127_P7C, v -> FCDotAPL0127DashP7C.valueOf(v).codePointImport()); + writeP7x(writer, FourCornerDotCake.FC_APL0127_P7A, v -> FCDotAPL0127DashP7A.valueOf(v).codePointDotIndex()); + writeP7x(writer, FourCornerDotCake.FC_APL0127_P7B, v -> FCDotAPL0127DashP7B.valueOf(v).codePointDotIndex()); + writeP7x(writer, FourCornerDotCake.FC_APL0127_P7C, v -> FCDotAPL0127DashP7C.valueOf(v).codePointDotIndex()); } } 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).codePointImport()); - writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7E, v -> FCDotBYD0127DashP7E.valueOf(v).codePointImport()); - writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7F, v -> FCDotBYD0127DashP7F.valueOf(v).codePointImport()); + writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7D, v -> FCDotBYD0127DashP7D.valueOf(v).codePointDotIndex()); + writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7E, v -> FCDotBYD0127DashP7E.valueOf(v).codePointDotIndex()); + writeP7x(writer, FourCornerDotCake.FC_BYD0127_P7F, v -> FCDotBYD0127DashP7F.valueOf(v).codePointDotIndex()); } } 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 0e075aa..664f9af 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.codePointImport(); + int codePoint = cdc.codePointDotIndex(); 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 aa858fa..408f4b8 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).codePointImport()); + writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7A.valueOf(v).codePointDotIndex()); return; } if (FourCornerDotCake.FC_APL0127_P7B.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7B.valueOf(v).codePointImport()); + writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7B.valueOf(v).codePointDotIndex()); return; } if (FourCornerDotCake.FC_APL0127_P7C.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7C.valueOf(v).codePointImport()); + writeP7xSlice(writer, slice, v -> FCDotAPL0127DashP7C.valueOf(v).codePointDotIndex()); return; } if (FourCornerDotCake.FC_BYD0127_P7D.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7D.valueOf(v).codePointImport()); + writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7D.valueOf(v).codePointDotIndex()); return; } if (FourCornerDotCake.FC_BYD0127_P7E.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7E.valueOf(v).codePointImport()); + writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7E.valueOf(v).codePointDotIndex()); return; } if (FourCornerDotCake.FC_BYD0127_P7F.equals(slice)) { - writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7F.valueOf(v).codePointImport()); + writeP7xSlice(writer, slice, v -> FCDotBYD0127DashP7F.valueOf(v).codePointDotIndex()); 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 54ffb17..bfeaf88 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 @@ -28,7 +28,7 @@ import java.util.List; import java.util.Optional; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarne; -import org.x4o.fc18.cake2.FourCornerX21CodePointDisplay; +import org.x4o.fc18.cake2.FourCornerX21CodePointSequence; import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.o2o.tdoc.ApiDocContentCss; @@ -57,19 +57,19 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { writer.docTableStart("Points Summary", "Encode point for all systems.",ApiDocContentCss.overviewSummary); writer.docTableHeader("System", "Point Sequence"); FourCornerX00PetitVide videPoint = videPoints[word.getOffset()]; - Optional x21Display = videPoint.kaasX21CodePointDisplay(); + Optional x21Display = videPoint.kaasX21CodePointDisplay(); Optional x00CoinCarne = videPoint.kaasX00CoinCarne(); if (videPoint.isX06()) { - writeSequence(writer, "X06", videPoint.toX06().baklavaPoints()); + writeSequence(writer, "X06", videPoint.toX06().baklavaPointSequence()); } if (videPoint.isX08()) { - writeSequence(writer, "X08", videPoint.toX08().muffinPoints()); + writeSequence(writer, "X08", videPoint.toX08().muffinPointSequence()); } if (videPoint.isX18()) { - writeSequence(writer, "X18", videPoint.toX18().cakePoints()); + writeSequence(writer, "X18", videPoint.toX18().cakePointSequence()); } if (x21Display.isPresent()) { - writeSequence(writer, "X21", x21Display.get().codePointDisplay()); + writeSequence(writer, "X21", x21Display.get().codePointSequence()); } if (x00CoinCarne.isPresent()) { FourCornerX00PetitVideCoinCarne cornerKerning = x00CoinCarne.get(); @@ -107,7 +107,7 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { FourCornerX00PetitVide letter = videPoints[word.getOffset()]; StringBuilder buf = new StringBuilder(); letter.kaasX21CodePointDisplay().ifPresent(v -> { - v.codePointDisplay().forEach(vv -> buf.appendCodePoint(vv)); + v.codePointSequence().forEach(vv -> buf.appendCodePoint(vv)); }); writer.printTagStart(Tag.pre); writer.printCharacters(buf.toString()); 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 99c0ea1..92b84f7 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.codePointImport())) { + if (global.containsKey(v.codePointDotIndex())) { duplicate = true; break; } - global.put(v.codePointImport(), v); + global.put(v.codePointDotIndex(), 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 7b52ec1..6d7bfd9 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 @@ -30,7 +30,7 @@ import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.x4o.fc18.FourCornerUnicodeDisplay; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; /** * Tests BYD encoding. @@ -53,11 +53,11 @@ public class FCDotBYDTest { Map global = new HashMap<>(); for (FCDotBYD0127DashP7D v : FCDotBYD0127DashP7D.values()) { Assertions.assertNotNull(v); - if (global.containsKey(v.codePointImport())) { + if (global.containsKey(v.codePointDotIndex())) { duplicate = true; break; } - global.put(v.codePointImport(), v); + global.put(v.codePointDotIndex(), v); } Assertions.assertTrue(global.size() > 1); Assertions.assertFalse(duplicate, "Duplicate ascii core value detected"); @@ -65,7 +65,7 @@ public class FCDotBYDTest { @Test public void testDisplay() throws Exception { - List cdc = new ArrayList<>(); + List cdc = new ArrayList<>(); cdc.add(FCDotBYD0127DashP7D.BOX2_A); cdc.add(FCDotBYD0127DashP7D.BOX2_B); cdc.add(FCDotBYD0127DashP7D.BOX2_B); 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 4f61f3c..9828045 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.codePointImport())) { + if (global.containsKey(v.codePointDotIndex())) { duplicate = true; break; } - global.put(v.codePointImport(), v); + global.put(v.codePointDotIndex(), 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/FCDotDEC0127DashPX0Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0Test.java index 4673e56..f6a6e7d 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotDEC0127DashPX0Test.java @@ -41,24 +41,24 @@ public class FCDotDEC0127DashPX0Test { @Test public void testBaklavaSequence() throws Exception { int[] seq = null; - seq = FCDotDEC0127DashPX0._ESC_USER_1.baklavaPoints(); + seq = FCDotDEC0127DashPX0._ESC_USER_1.baklavaPointSequence(); Assertions.assertEquals(3, seq.length); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq[0]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq[1]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq[2]); - seq = FCDotDEC0127DashPX0.ESC_VT06.baklavaPoints(); + seq = FCDotDEC0127DashPX0.ESC_VT06.baklavaPointSequence(); Assertions.assertEquals(3, seq.length); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq[0]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq[1]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq[2]); - seq = FCDotDEC0127DashPX0.ESC_NETHER.baklavaPoints(); + seq = FCDotDEC0127DashPX0.ESC_NETHER.baklavaPointSequence(); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq[0]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq[1]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq[2]); - seq = FCDotDEC0127DashPX0.ESC_STOP.baklavaPoints(); + seq = FCDotDEC0127DashPX0.ESC_STOP.baklavaPointSequence(); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq[0]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq[1]); Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq[2]); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java index edb049c..4729f45 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/cake2/zero33/FCDotVT06Test.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.x4o.fc18.FourCornerUnicodeDisplay; import org.x4o.fc18.FourCornerUnicodeMapper; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; import org.x4o.fc18.cake2.zero33.vt06.VTDash06DotZeroACursor; import org.x4o.fc18.cake2.zero33.vt06.VTDash06DotZeroCClear; @@ -43,7 +43,7 @@ public class FCDotVT06Test { @Test public void testCusorGoto() throws Exception { - List cdc = new ArrayList<>(); + List cdc = new ArrayList<>(); cdc.add(VTDash06DotZeroACursor.NX_CURSOR_GOTO); cdc.addAll(FourCornerUnicodeMapper.DICTIONARY.toDecimalsX06(123)); cdc.add(FCDotDEC0127DashPX0.ESC_SEQ_RAKA_AT); @@ -57,7 +57,7 @@ public class FCDotVT06Test { @Test public void testClearTop5Lines() throws Exception { - List cdc = new ArrayList<>(); + List cdc = new ArrayList<>(); cdc.add(VTDash06DotZeroCClear.VT_CLEAR_TOP); cdc.addAll(FourCornerUnicodeMapper.DICTIONARY.toDecimalsX06(5)); cdc.add(FCDotDEC0127DashPX0.ESC_SEQ_SALAH); diff --git a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerNCRTest.java b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerNCRTest.java index ac27829..baef6c7 100644 --- a/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerNCRTest.java +++ b/nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/LexerNCRTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.x4o.fc18.FourCornerUnicodeDisplay; import org.x4o.fc18.cake2.FourCornerDotCake; -import org.x4o.fc18.cake2.FourCornerX06BaklavaPoints; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; import org.x4o.fc18.cake2.zero33.FCDotCDC1604DashP6; import org.x4o.fc18.cake2.zero33.FCDotDEC0127DashPX0; @@ -79,7 +79,7 @@ public class LexerNCRTest { @Test public void testNCRSimpleX06() throws Exception { - List cdc = new ArrayList<>(); + List cdc = new ArrayList<>(); cdc.add(FCDotCDC1604DashP6.NX24_X); // = X cdc.add(FCDotCDC1604DashP6.NY09_EQUALS); cdc.addAll(FCDotDEC0127DashPX0.ESC68_NCR.toX06BaklavaPoints());