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 e542579..e65e0b7 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 @@ -188,7 +188,7 @@ public class FourCornerUnicodeDisplay { FourCornerX18CakeWord cakeWord = FourCornerX18CakeWord.class.cast(videPoint); FourCornerX18CakePointSequence[] wordDefault = cakeWord.nameDefault(); for (FourCornerX18CakePointSequence letter : wordDefault) { - letter.kaasX21CodePointDisplay().ifPresent(v -> { + letter.kaasX21CodeSequence().ifPresent(v -> { v.codePointSequence().forEach(vv -> output.appendCodePoint(vv)); }); } @@ -207,7 +207,7 @@ public class FourCornerUnicodeDisplay { // continue; //} FourCornerX00PetitVide videPoint = videPoints[offset]; - videPoint.kaasX21CodePointDisplay().ifPresent(v -> { + videPoint.kaasX21CodeSequence().ifPresent(v -> { v.codePointSequence().forEach(vv -> output.appendCodePoint(vv)); }); return; diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/FourCornerUnicodeImport.java index 55839fe..3e70a41 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 @@ -69,15 +69,15 @@ public class FourCornerUnicodeImport { } public List convertToX06(String text) { - return convertToXXX(text, 6).stream().map(v -> v.toX06()).toList(); + return convertToXXX(text, 6).stream().map(v -> v.kaasX06BaklavaSequence().get()).toList(); } public List convertToX08(String text) { - return convertToXXX(text, 8).stream().map(v -> v.toX08()).toList(); + return convertToXXX(text, 8).stream().map(v -> v.kaasX08MuffinSequence().get()).toList(); } public List convertToX18(String text) { - return convertToXXX(text, 18).stream().map(v -> v.toX18()).toList(); + return convertToXXX(text, 18).stream().map(v -> v.kaasX18CakeSequence().get()).toList(); } final private class ImportState { @@ -159,17 +159,17 @@ public class FourCornerUnicodeImport { return false; } if (ctx.bits == 6) { - if (chs.isX06()) { + if (chs.kaasX06BaklavaSequence().isPresent()) { ctx.output.add(chs); return true; } } else if (ctx.bits == 8) { - if (chs.isX08()) { + if (chs.kaasX08MuffinSequence().isPresent()) { ctx.output.add(chs); return true; } } else { - if (chs.isX18()) { + if (chs.kaasX18CakeSequence().isPresent()) { ctx.output.add(chs); return true; } 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 a8b116e..5e4265a 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 @@ -29,11 +29,13 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.PrimitiveIterator; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointDotIndex; import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash10; import org.x4o.fc18.cake2.pie9c.FCDotPIE9CDash11; @@ -66,15 +68,12 @@ public enum FourCornerUnicodeMapper { private void mapPointsX18(FourCornerX00PetitVide[] petitVides) { for (FourCornerX00PetitVide petitVide : petitVides) { - if (!petitVide.isX18()) { + Optional x18CakeDotIndex = petitVide.kaasX18CakeDotIndex(); + if (x18CakeDotIndex.isEmpty()) { continue; } - FourCornerX18CakePointSequence x18 = petitVide.toX18(); - if (x18.cakePointSequence().length > 1) { - continue; - } - int char18 = x18.cakePointSequence()[0]; - petitVide.kaasX21CodePointDisplay().ifPresent(v -> { + int char18 = x18CakeDotIndex.get().cakePointDotIndex(); + petitVide.kaasX21CodeSequence().ifPresent(v -> { int18To21.put(char18, v.codePointSequence()); }); } @@ -82,7 +81,7 @@ public enum FourCornerUnicodeMapper { private void mapPointsX21(FourCornerX00PetitVide[] petitVides) { for (FourCornerX00PetitVide petitVide : petitVides) { - petitVide.kaasX21CodePointImport().ifPresent(v -> { + petitVide.kaasX21CodeDotIndex().ifPresent(v -> { int codePoint = v.codePointDotIndex(); if (codePoint >= 0) { int21ToVide.put(codePoint, v); 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 cf7e0f5..8614435 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 @@ -22,6 +22,7 @@ */ package org.x4o.fc18.cake2; +import java.util.List; import java.util.Optional; import org.x4o.fc18.FourCornerUnicodeImport; @@ -51,4 +52,9 @@ public interface FourCornerX00PetitColleCLK extends FourCornerX18CakeWord { default FourCornerX18CakePointSequence[] nameDefault() { return FourCornerUnicodeImport.strict().convertToX18(name()).toArray(new FourCornerX18CakePointSequence[] {}); } + + @Override + default List cakePointSequence() { + return List.of(cakePointDotIndex()); + } } 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 31fb308..9535b69 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,7 +28,7 @@ import java.util.List; /// /// @author Willem Cazander /// @version 1.0 Jan 18, 2025 -public interface FourCornerX00PetitCollePie9 extends FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence, FourCornerX21CodePointSequence, FourCornerX21CodePointDotIndex { +public interface FourCornerX00PetitCollePie9 extends FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointDotIndex, FourCornerX21CodePointDotIndex { @Override default int codePointDotIndex() { @@ -45,4 +45,14 @@ public interface FourCornerX00PetitCollePie9 extends FourCornerX06BaklavaPointSe } return letter; } + + @Override + default List cakePointSequence() { + return List.of(cakePointDotIndex()); + } + + @Override + default List muffinPointSequence() { + return baklavaPointSequence(); + } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleZero33Gram.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleZero33Gram.java new file mode 100644 index 0000000..9f6838a --- /dev/null +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX00PetitColleZero33Gram.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2004-2014, Willem Cazander + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted provided + * that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.x4o.fc18.cake2; + +import java.util.List; + +/// Parent interface for all data gram enums. +/// +/// @author Willem Cazander +/// @version 1.0 Jan 19, 2025 +public interface FourCornerX00PetitColleZero33Gram extends FourCornerX18CakePointDotIndex { + + @Override + default List cakePointSequence() { + return List.of(cakePointDotIndex()); + } +} 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 af80b57..16135cd 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,20 @@ import java.util.List; /// /// @author Willem Cazander /// @version 1.0 Jan 19, 2025 -public interface FourCornerX00PetitColleZero33P8 extends FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence, FourCornerX21CodePointDotIndex, FourCornerX21CodePointSequence { +public interface FourCornerX00PetitColleZero33P8 extends FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointDotIndex, FourCornerX21CodePointDotIndex { @Override default List codePointSequence() { return List.of(codePointDotIndex()); } + + @Override + default List cakePointSequence() { + return List.of(cakePointDotIndex()); + } + + @Override + default List muffinPointSequence() { + return cakePointSequence(); + } } 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 60baa9f..fe7276e 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 @@ -30,39 +30,31 @@ import java.util.Optional; /// @version 1.0 Jan 1, 2025 public interface FourCornerX00PetitVide { - default boolean isX06() { - return this instanceof FourCornerX06BaklavaPointSequence; - } - - default boolean isX08() { - return this instanceof FourCornerX08MuffinPointSequence; - } - - default boolean isX18() { - return this instanceof FourCornerX18CakePointSequence; - } - default Optional kaasX00CoinCarne() { return this instanceof FourCornerX00PetitVideCoinCarne?Optional.of(FourCornerX00PetitVideCoinCarne.class.cast(this)):Optional.empty(); } - default Optional kaasX21CodePointImport() { + default Optional kaasX06BaklavaSequence() { + return this instanceof FourCornerX06BaklavaPointSequence?Optional.of(FourCornerX06BaklavaPointSequence.class.cast(this)):Optional.empty(); + } + + default Optional kaasX08MuffinSequence() { + return this instanceof FourCornerX08MuffinPointSequence?Optional.of(FourCornerX08MuffinPointSequence.class.cast(this)):Optional.empty(); + } + + default Optional kaasX18CakeDotIndex() { + return this instanceof FourCornerX18CakePointDotIndex?Optional.of(FourCornerX18CakePointDotIndex.class.cast(this)):Optional.empty(); + } + + default Optional kaasX18CakeSequence() { + return this instanceof FourCornerX18CakePointSequence?Optional.of(FourCornerX18CakePointSequence.class.cast(this)):Optional.empty(); + } + + default Optional kaasX21CodeDotIndex() { return this instanceof FourCornerX21CodePointDotIndex?Optional.of(FourCornerX21CodePointDotIndex.class.cast(this)):Optional.empty(); } - default Optional kaasX21CodePointDisplay() { + default Optional kaasX21CodeSequence() { return this instanceof FourCornerX21CodePointSequence?Optional.of(FourCornerX21CodePointSequence.class.cast(this)):Optional.empty(); } - - default FourCornerX06BaklavaPointSequence toX06() { - return FourCornerX06BaklavaPointSequence.class.cast(this); - } - - default FourCornerX08MuffinPointSequence toX08() { - return FourCornerX08MuffinPointSequence.class.cast(this); - } - - default FourCornerX18CakePointSequence toX18() { - return FourCornerX18CakePointSequence.class.cast(this); - } } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPointSequence.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPointSequence.java index d65ed49..8656d96 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPointSequence.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX06BaklavaPointSequence.java @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2; +import java.util.List; + /// Number index retriever for four corner baklava points. /// /// @author Willem Cazander @@ -29,5 +31,5 @@ package org.x4o.fc18.cake2; public interface FourCornerX06BaklavaPointSequence extends FourCornerX00PetitVide { /// One baklava piece weights 52 gram - int[] baklavaPointSequence(); + List baklavaPointSequence(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPointSequence.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPointSequence.java index bda8138..47740f8 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPointSequence.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX08MuffinPointSequence.java @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2; +import java.util.List; + /// Number index retriever for four corner muffin points. /// /// @author Willem Cazander @@ -29,5 +31,5 @@ package org.x4o.fc18.cake2; public interface FourCornerX08MuffinPointSequence extends FourCornerX00PetitVide { /// One muffin piece weights 111 gram - int[] muffinPointSequence(); + List muffinPointSequence(); } diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointDotIndex.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointDotIndex.java index f4ba0ee..8887322 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointDotIndex.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX18CakePointDotIndex.java @@ -26,7 +26,7 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 19, 2025 -public interface FourCornerX18CakePointDotIndex extends FourCornerX00PetitVide { +public interface FourCornerX18CakePointDotIndex extends FourCornerX18CakePointSequence { /// One cake piece weights 800 gram 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 index dc57b7d..fa591c4 100644 --- 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2; +import java.util.List; + /// Number sequence for four corner cake points. /// /// @author Willem Cazander @@ -29,5 +31,5 @@ package org.x4o.fc18.cake2; public interface FourCornerX18CakePointSequence extends FourCornerX00PetitVide { /// One cake piece weights 800 gram - int[] cakePointSequence(); + List 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 bf0d9a9..63df29c 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,7 +26,7 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 11, 2025 -public interface FourCornerX18CakeWord extends FourCornerX18CakePointSequence { +public interface FourCornerX18CakeWord extends FourCornerX18CakePointDotIndex { /// Default word provider FourCornerX18CakePointSequence[] nameDefault(); diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDotIndex.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDotIndex.java index a37e521..d3b65bd 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDotIndex.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerX21CodePointDotIndex.java @@ -26,7 +26,7 @@ package org.x4o.fc18.cake2; /// /// @author Willem Cazander /// @version 1.0 Jan 1, 2025 -public interface FourCornerX21CodePointDotIndex extends FourCornerX00PetitVide { +public interface FourCornerX21CodePointDotIndex extends FourCornerX21CodePointSequence { /// One code point weights ~1234 gram int codePointDotIndex(); 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 9d30cb1..71fd75a 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_A.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 7d635a1..1ec9ca2 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_B.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 4fac437..bfa9437 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_C.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 34ce369..ad91ce9 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_D.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 2be0401..36a4e34 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_E.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 b7820f8..9b5d642 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_F.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 d6960fc..78f920d 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_G.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 160365f..2d23e68 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_H.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 433d9b7..29949f1 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_I.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 a63a97c..5246b00 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_J.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 71c1d8f..88ba857 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_K.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 430802d..7ff2dff 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_L.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 d316a59..81bd404 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_M.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 62e08de..7af5313 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_N.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 3508fda..2a4c24e 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_O.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 96b8eea..5832063 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_P.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 29bb86d..a11ec42 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_Q.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 447219e..4ad7d98 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_R.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 8d63c63..02b90a7 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_S.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 2bb0171..7642cc4 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_T.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 b288d1c..09ee049 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_U.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 defca3d..1bb7fdd 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_V.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 883cbd9..4eeb1d8 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_W.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 f3a7b48..7e67bf2 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_X.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 cb7cd88..6776656 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_Y.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 322bbd7..131f559 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[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_CLK1K_Z.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 6c97035..3e7d163 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,18 +47,13 @@ public enum FCDotPIE9CDash01 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX01_A, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_01.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_01.getStart() + ordinal(); } @Override 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 f41d7ee..7b9533a 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,18 +48,13 @@ public enum FCDotPIE9CDash02 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX02_B, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_02.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_02.getStart() + ordinal(); } @Override 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 2613e13..4003510 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,18 +49,13 @@ public enum FCDotPIE9CDash03 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX03_C, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_03.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_03.getStart() + ordinal(); } @Override 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 34e5d83..97a5d74 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,18 +50,13 @@ public enum FCDotPIE9CDash04 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX04_D, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_04.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_04.getStart() + ordinal(); } @Override 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 b0f1ee2..3a11ee6 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,18 +51,13 @@ public enum FCDotPIE9CDash05 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX05_E, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_05.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_05.getStart() + ordinal(); } @Override 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 04e3368..637669d 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,18 +52,13 @@ public enum FCDotPIE9CDash06 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX06_F, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_06.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_06.getStart() + ordinal(); } @Override 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 bd8ec13..deb62fe 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,18 +53,13 @@ public enum FCDotPIE9CDash07 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX07_G, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_07.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_07.getStart() + ordinal(); } @Override 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 989a128..04a3892 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,18 +54,13 @@ public enum FCDotPIE9CDash08 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX08_H, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_08.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_08.getStart() + ordinal(); } @Override 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 c2b4263..e522111 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,18 +55,13 @@ public enum FCDotPIE9CDash09 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX09_I, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_09.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_09.getStart() + ordinal(); } @Override 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 09eb70f..89e7dc0 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,18 +56,13 @@ public enum FCDotPIE9CDash10 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX10_J, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_10.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_10.getStart() + ordinal(); } @Override 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 477faee..217dcf5 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,18 +57,13 @@ public enum FCDotPIE9CDash11 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX11_K, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_11.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_11.getStart() + ordinal(); } @Override 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 2f185d2..418de58 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,18 +58,13 @@ public enum FCDotPIE9CDash12 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX12_L, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_12.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_12.getStart() + ordinal(); } @Override 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 49542c0..9ff707d 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,18 +59,13 @@ public enum FCDotPIE9CDash13 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX13_M, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_13.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_13.getStart() + ordinal(); } @Override 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 1f18e79..a369642 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,18 +60,13 @@ public enum FCDotPIE9CDash14 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX14_N, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_14.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_14.getStart() + ordinal(); } @Override 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 a0e360a..960bdc0 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,18 +61,13 @@ public enum FCDotPIE9CDash15 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX15_O, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_15.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_15.getStart() + ordinal(); } @Override 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 4f51913..028364e 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,18 +62,13 @@ public enum FCDotPIE9CDash16 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX16_P, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_16.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_16.getStart() + ordinal(); } @Override 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 07f6dc4..8de8cc1 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,18 +63,13 @@ public enum FCDotPIE9CDash17 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX17_Q, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_17.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_17.getStart() + ordinal(); } @Override 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 4a1f57f..accb10f 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,18 +65,13 @@ public enum FCDotPIE9CDash18 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX18_R, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_18.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_18.getStart() + ordinal(); } @Override 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 5f607df..a826509 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,18 +65,13 @@ public enum FCDotPIE9CDash19 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX19_S, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_19.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_19.getStart() + ordinal(); } @Override 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 3f22837..aa5086e 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,18 +66,13 @@ public enum FCDotPIE9CDash20 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX20_T, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_20.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_20.getStart() + ordinal(); } @Override 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 8ebb30e..e6b40f3 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,18 +67,13 @@ public enum FCDotPIE9CDash21 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX21_U, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_21.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_21.getStart() + ordinal(); } @Override 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 f57fb85..66dbdac 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,18 +68,13 @@ public enum FCDotPIE9CDash22 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX22_V, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_22.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_22.getStart() + ordinal(); } @Override 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 259057a..9eb01c0 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,18 +69,13 @@ public enum FCDotPIE9CDash23 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX23_W, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_23.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_23.getStart() + ordinal(); } @Override 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 d7d633c..d3fa1f4 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,18 +70,13 @@ public enum FCDotPIE9CDash24 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX24_X, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_24.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_24.getStart() + ordinal(); } @Override 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 1c56349..2fcb429 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,18 +73,13 @@ public enum FCDotPIE9CDash25 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX25_Y, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_25.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_25.getStart() + ordinal(); } @Override 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 f95561d..deaa02b 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,18 +72,13 @@ public enum FCDotPIE9CDash26 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX26_Z, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_26.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_26.getStart() + ordinal(); } @Override 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 10bdfa8..6049ab9 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,18 +73,13 @@ public enum FCDotPIE9CDash27 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9C(FCDotCDC1604DashP6.NX27_AMPERSAND, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9C_27.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9C_27.getStart() + ordinal(); } @Override 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 aec1eb6..a33d0ed 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,18 +47,13 @@ public enum FCDotPIE9DDash01 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY01_AT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_01.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_01.getStart() + ordinal(); } @Override 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 41bd25a..55e6952 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,18 +50,13 @@ public enum FCDotPIE9DDash02 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_02.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_02.getStart() + ordinal(); } @Override 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 29594fa..222906d 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,18 +49,13 @@ public enum FCDotPIE9DDash03 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY03_BAR_V_LEFT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_03.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_03.getStart() + ordinal(); } @Override 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 3eab735..3ef1771 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,18 +50,13 @@ public enum FCDotPIE9DDash04 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY04_BAR_UNDER, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_04.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_04.getStart() + ordinal(); } @Override 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 f58829d..cbc705e 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,18 +57,13 @@ public enum FCDotPIE9DDash05 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY05_BAR_VERTICAL, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_05.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_05.getStart() + ordinal(); } @Override 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 31870da..905cfd1 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,18 +52,13 @@ public enum FCDotPIE9DDash06 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY06_PERCENT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_06.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_06.getStart() + ordinal(); } @Override 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 72831c9..533120f 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,18 +53,13 @@ public enum FCDotPIE9DDash07 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY07_DOLLAR, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_07.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_07.getStart() + ordinal(); } @Override 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 133d966..7a583f6 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,18 +54,13 @@ public enum FCDotPIE9DDash08 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY08_HASH, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_08.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_08.getStart() + ordinal(); } @Override 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 7fbcf02..de3aaf8 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,18 +55,13 @@ public enum FCDotPIE9DDash09 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY09_EQUALS, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_09.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_09.getStart() + ordinal(); } @Override 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 b645c80..38a81dd 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,18 +57,13 @@ public enum FCDotPIE9DDash10 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY10_CARET, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_10.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_10.getStart() + ordinal(); } @Override 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 692dbed..958c40b 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,18 +57,13 @@ public enum FCDotPIE9DDash11 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY11_BACKTICK, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_11.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_11.getStart() + ordinal(); } @Override 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 d44e688..d889521 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,18 +58,13 @@ public enum FCDotPIE9DDash12 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY12_QUOTATION, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_12.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_12.getStart() + ordinal(); } @Override 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 024695c..7d40c66 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,18 +59,13 @@ public enum FCDotPIE9DDash13 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY13_APOSTROPHE, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_13.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_13.getStart() + ordinal(); } @Override 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 37f12a7..710c35d 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,18 +60,13 @@ public enum FCDotPIE9DDash14 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY14_SEMICOLON, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_14.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_14.getStart() + ordinal(); } @Override 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 c281ad6..ef4da84 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,18 +61,13 @@ public enum FCDotPIE9DDash15 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY15_COLON, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_15.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_15.getStart() + ordinal(); } @Override 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 c7855ff..ff5df05 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,18 +62,13 @@ public enum FCDotPIE9DDash16 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY16_DOT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_16.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_16.getStart() + ordinal(); } @Override 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 8ae66ed..11de167 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,18 +63,13 @@ public enum FCDotPIE9DDash17 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY17_COMMA, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_17.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_17.getStart() + ordinal(); } @Override 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 a631fca..e8144c8 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,18 +65,13 @@ public enum FCDotPIE9DDash18 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY18_ASTERISK, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_18.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_18.getStart() + ordinal(); } @Override 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 85ba1fb..32724ef 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,18 +65,13 @@ public enum FCDotPIE9DDash19 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY19_MINUS, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_19.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_19.getStart() + ordinal(); } @Override 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 bca3053..1fc3233 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,18 +66,13 @@ public enum FCDotPIE9DDash20 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY20_PLUS, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_20.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_20.getStart() + ordinal(); } @Override 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 f10d8fe..e1b0273 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,18 +67,13 @@ public enum FCDotPIE9DDash21 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY21_TILDE, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_21.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_21.getStart() + ordinal(); } @Override 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 78ccfe0..ffb92ca 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,18 +68,13 @@ public enum FCDotPIE9DDash22 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY22_TAG_CURLY_RIGHT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_22.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_22.getStart() + ordinal(); } @Override 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 1d5cfc0..d8f87d1 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,18 +69,13 @@ public enum FCDotPIE9DDash23 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY23_TAG_CURLY_LEFT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_23.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_23.getStart() + ordinal(); } @Override 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 7692d45..03f9235 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,18 +70,13 @@ public enum FCDotPIE9DDash24 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY24_TAG_ROUND_RIGHT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_24.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_24.getStart() + ordinal(); } @Override 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 f1d59c1..a65bdd3 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,18 +73,13 @@ public enum FCDotPIE9DDash25 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY25_TAG_ROUND_LEFT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_25.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_25.getStart() + ordinal(); } @Override 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 aaa0a62..a9139c4 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,18 +72,13 @@ public enum FCDotPIE9DDash26 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY26_TAG_SQUARE_RIGHT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_26.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_26.getStart() + ordinal(); } @Override 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 31c1c28..61f0175 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,18 +79,13 @@ public enum FCDotPIE9DDash27 implements FourCornerX00PetitCollePie9 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC68_PIE.baklavaPointsPIE9D(FCDotCDC1604DashP6.NY27_TAG_SQUARE_LEFT, ordinal()); } @Override - public int[] muffinPointSequence() { - return baklavaPointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_PIE9D_27.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_PIE9D_27.getStart() + ordinal(); } @Override 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 9406e70..e88df6c 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "FC.AMD0110-SA" Four Corner Application Methodoums Decimals @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Dec 31, 2024 */ -public enum FCDotAMD0110DashSA implements FourCornerX18CakePointSequence { +public enum FCDotAMD0110DashSA implements FourCornerX00PetitColleZero33Gram { /// End-user defined rendering for zero T010_NXX_001, /// End-user defined rendering for one @@ -48,7 +48,7 @@ public enum FCDotAMD0110DashSA implements FourCornerX18CakePointSequence { ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_AMD0110_SA.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 b72cdf9..b54f36f 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; @@ -111,18 +113,13 @@ public enum FCDotAPL0127DashP7A implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_APL0127_P7A.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPointSequence() { - return cakePointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_APL0127_P7A.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_APL0127_P7A.getStart() + ordinal(); } @Override 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 8fda2b6..e7328d2 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; @@ -115,18 +117,13 @@ public enum FCDotAPL0127DashP7B implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_APL0127_P7B.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPointSequence() { - return cakePointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_APL0127_P7B.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_APL0127_P7B.getStart() + ordinal(); } @Override 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 897e6a4..81274da 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; @@ -117,18 +119,13 @@ public enum FCDotAPL0127DashP7C implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_APL0127_P7A.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPointSequence() { - return cakePointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_APL0127_P7C.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_APL0127_P7C.getStart() + ordinal(); } @Override 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 c5fa64d..148c684 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "FC.BMW0102-S2" Four Corner Binary Model Word encoding. @@ -31,13 +31,13 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Dec 31, 2024 */ -public enum FCDotBMW0102DashS2 implements FourCornerX18CakePointSequence { +public enum FCDotBMW0102DashS2 implements FourCornerX00PetitColleZero33Gram { T002_NXX_001, T002_NXX_002, ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_BMW0102_S2.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 3ce2710..44cd49c 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; @@ -73,18 +75,13 @@ public enum FCDotBYD0127DashP7D implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_BYD0127_P7D.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPointSequence() { - return cakePointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_BYD0127_P7D.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_BYD0127_P7D.getStart() + ordinal(); } @Override 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 e137eab..354122c 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; @@ -73,18 +75,13 @@ public enum FCDotBYD0127DashP7E implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_BYD0127_P7E.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPointSequence() { - return cakePointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_BYD0127_P7E.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_BYD0127_P7E.getStart() + ordinal(); } @Override 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 8aa6b69..5b11e21 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; @@ -72,18 +74,13 @@ public enum FCDotBYD0127DashP7F implements FourCornerX00PetitColleZero33P8 { } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC6_BYD0127_P7F.baklavaPointsP7(ordinal()); } @Override - public int[] muffinPointSequence() { - return cakePointSequence(); - } - - @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_BYD0127_P7F.getStart() + ordinal()}; + public int cakePointDotIndex() { + return FourCornerDotCake.FC_BYD0127_P7F.getStart() + ordinal(); } @Override 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 12e1929..2fcb302 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/zero33/FCDotCDC1604DashP6.java @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33P8; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarne; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarneFrapper; @@ -122,24 +124,21 @@ public enum FCDotCDC1604DashP6 implements FourCornerX00PetitColleZero33P8, FourC static final private FCDotCDC1604DashP6[] VALUES = values(); // values() is slow method private final int codePoint; + private final List baklavaSequence; private FCDotCDC1604DashP6(int codePoint) { this.codePoint = codePoint; + this.baklavaSequence = List.of(ordinal()); } @Override - public int[] baklavaPointSequence() { - return new int[] {ordinal()}; + public List baklavaPointSequence() { + return baklavaSequence; } @Override - public int[] muffinPointSequence() { - return new int[] {ordinal()}; - } - - @Override - public int[] cakePointSequence() { - return new int[] {ordinal()}; + public int cakePointDotIndex() { + return ordinal(); } @Override 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 ae150b7..55ac82a 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 @@ -28,7 +28,7 @@ import java.util.List; import org.x4o.fc18.cake2.FourCornerDotCake; import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; -import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointDotIndex; /** * "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.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Dec 24, 2024 */ -public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointSequence { +public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPointSequence, FourCornerX08MuffinPointSequence, FourCornerX18CakePointDotIndex { // =========== External argumented escape sequence, always has closed ending. (MUST terminate with ESC_SEQ_SALAH) @@ -224,63 +224,76 @@ public enum FCDotDEC0127DashPX0 implements FourCornerX06BaklavaPointSequence, Fo return result; } - public int[] baklavaPointsPIE9C(FCDotCDC1604DashP6 letter, int offset) { - return new int[] { + public List baklavaPointsPIE9C(FCDotCDC1604DashP6 letter, int offset) { + return List.of( FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() / 9), FCDotCDC1604DashP6._ESC6_X1.ordinal() + ((ordinal() / 3) % 3), FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() % 3), letter.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + offset - }; + ); } - public int[] baklavaPointsPIE9D(FCDotCDC1604DashP6 letter, int offset) { - return new int[] { + public List baklavaPointsPIE9D(FCDotCDC1604DashP6 letter, int offset) { + return List.of( FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() / 9), FCDotCDC1604DashP6._ESC6_X1.ordinal() + ((ordinal() / 3) % 3), FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() % 3), letter.ordinal(), FCDotCDC1604DashP6.NY01_AT.ordinal() - offset - }; + ); } - public int[] baklavaPointsP7(int offset) { - return new int[] { + public List baklavaPointsP7(int offset) { + return List.of( FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() / 9), FCDotCDC1604DashP6._ESC6_X1.ordinal() + ((ordinal() / 3) % 3), FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() % 3), FCDotCDC1604DashP6.NX01_A.ordinal() + offset - }; + ); } // FIXME move - public int[] baklavaPointsVT06Action(FCDotCDC1604DashP6 group, FCDotCDC1604DashP6 action) { - return new int[] { + public List baklavaPointsVT06Action(FCDotCDC1604DashP6 group, FCDotCDC1604DashP6 action) { + return List.of( FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() / 9), FCDotCDC1604DashP6._ESC6_X1.ordinal() + ((ordinal() / 3) % 3), FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() % 3), group.ordinal(), action.ordinal() - }; + ); + } + + public List cakePointsVT06Action(FCDotCDC1604DashP6 group, FCDotCDC1604DashP6 action) { + return List.of( + ESC_VT06.cakePointDotIndex(), + group.cakePointDotIndex(), + action.cakePointDotIndex() + ); } @Override - public int[] baklavaPointSequence() { - return new int[] { + public List baklavaPointSequence() { + return List.of( FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() / 9), FCDotCDC1604DashP6._ESC6_X1.ordinal() + ((ordinal() / 3) % 3), - FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() % 3), - }; + FCDotCDC1604DashP6._ESC6_X1.ordinal() + (ordinal() % 3) + ); } @Override - public int[] muffinPointSequence() { + public List muffinPointSequence() { return cakePointSequence(); } @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_DEC0127_PX0.getStart() + ordinal()}; + public List cakePointSequence() { + return List.of(cakePointDotIndex()); + } + + @Override + public int cakePointDotIndex() { + return FourCornerDotCake.FC_DEC0127_PX0.getStart() + ordinal(); } static public int valuesLength() { 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 4523066..a53e0ad 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "FC.DNA0104-S4" Four Corner Application Direct Nuclear Air strike for quadratonic values. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Jan 07, 2024 */ -public enum FCDotDNA0104DashS4 implements FourCornerX18CakePointSequence { +public enum FCDotDNA0104DashS4 implements FourCornerX00PetitColleZero33Gram { NXX_001, NXX_002, NXX_003, @@ -40,7 +40,7 @@ public enum FCDotDNA0104DashS4 implements FourCornerX18CakePointSequence { ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_DNA0104_S4.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 1019e04..fe03295 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "FC.IBM1616-H8" Four Corner Interim Byte Mode, embed raw 8 bit Data @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotIBM1616DashH8 implements FourCornerX18CakePointSequence { +public enum FCDotIBM1616DashH8 implements FourCornerX00PetitColleZero33Gram { NXX_001, NXX_002, NXX_003, @@ -292,7 +292,7 @@ public enum FCDotIBM1616DashH8 implements FourCornerX18CakePointSequence { ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_IBM1616_H8.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 8c3dba8..17a54ab 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "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.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Jan 07, 2024 */ -public enum FCDotNXP0103DashS3 implements FourCornerX18CakePointSequence { +public enum FCDotNXP0103DashS3 implements FourCornerX00PetitColleZero33Gram { NXX_001, NXX_002, NXX_003, ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_NXP0103_S3.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 7920e1c..6939028 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "FC.OCE0801-H3" Four Corner Octal Character Encoding in Hinari 3 bit. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotOCE0801DashH3 implements FourCornerX18CakePointSequence { +public enum FCDotOCE0801DashH3 implements FourCornerX00PetitColleZero33Gram { NXX_001, NXX_002, NXX_003, @@ -44,7 +44,7 @@ public enum FCDotOCE0801DashH3 implements FourCornerX18CakePointSequence { ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_OCE0801_H3.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 bd9573d..009f958 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "FC.OCE0808-H6" Four Corner Octal Character Encoding in Hinari 6 bit. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotOCE0808DashH6 implements FourCornerX18CakePointSequence { +public enum FCDotOCE0808DashH6 implements FourCornerX00PetitColleZero33Gram { NXX_001, NXX_002, NXX_003, @@ -100,7 +100,7 @@ public enum FCDotOCE0808DashH6 implements FourCornerX18CakePointSequence { ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_OCE0808_H6.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 7debf3f..ddcc1c4 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.FourCornerX18CakePointSequence; +import org.x4o.fc18.cake2.FourCornerX00PetitColleZero33Gram; /** * "FC.OCE0864-H9" Four Corner Octal Character Encoding in Hinari 9 bit. @@ -32,7 +32,7 @@ import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; * @author Willem Cazander * @version 1.0 Dec 30, 2024 */ -public enum FCDotOCE0864DashH9 implements FourCornerX18CakePointSequence { +public enum FCDotOCE0864DashH9 implements FourCornerX00PetitColleZero33Gram { NXX_001, NXX_002, NXX_003, @@ -548,7 +548,7 @@ public enum FCDotOCE0864DashH9 implements FourCornerX18CakePointSequence { ; @Override - public int[] cakePointSequence() { - return new int[] {FourCornerDotCake.FC_OCE0864_H9.getStart() + ordinal()}; + public int cakePointDotIndex() { + return 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 ecdf2ac..a221aba 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 @@ -22,6 +22,7 @@ */ package org.x4o.fc18.cake2.zero33.vt06; +import java.util.List; import java.util.Objects; import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; @@ -63,17 +64,17 @@ public enum VTDash06DotZeroACursor implements FourCornerX06BaklavaPointSequence, } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC_VT06.baklavaPointsVT06Action(actionGroup, action); } @Override - public int[] muffinPointSequence() { + public List muffinPointSequence() { return cakePointSequence(); } @Override - public int[] cakePointSequence() { - return new int[] {FCDotDEC0127DashPX0.ESC_VT06.cakePointSequence()[0], actionGroup.ordinal(), action.ordinal()}; + public List cakePointSequence() { + return FCDotDEC0127DashPX0.ESC_VT06.cakePointsVT06Action(actionGroup, action); } } 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 940e1ac..1b506d5 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 @@ -22,6 +22,7 @@ */ package org.x4o.fc18.cake2.zero33.vt06; +import java.util.List; import java.util.Objects; import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; @@ -54,17 +55,17 @@ public enum VTDash06DotZeroCClear implements FourCornerX06BaklavaPointSequence, } @Override - public int[] baklavaPointSequence() { + public List baklavaPointSequence() { return FCDotDEC0127DashPX0.ESC_VT06.baklavaPointsVT06Action(actionGroup, action); } @Override - public int[] muffinPointSequence() { + public List muffinPointSequence() { return cakePointSequence(); } @Override - public int[] cakePointSequence() { - return new int[] {FCDotDEC0127DashPX0.ESC_VT06.cakePointSequence()[0], actionGroup.ordinal(), action.ordinal()}; + public List cakePointSequence() { + return FCDotDEC0127DashPX0.ESC_VT06.cakePointsVT06Action(actionGroup, action); } } 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 bfeaf88..e262b38 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,6 +28,9 @@ import java.util.List; import java.util.Optional; import org.x4o.fc18.cake2.FourCornerX00PetitVideCoinCarne; +import org.x4o.fc18.cake2.FourCornerX06BaklavaPointSequence; +import org.x4o.fc18.cake2.FourCornerX08MuffinPointSequence; +import org.x4o.fc18.cake2.FourCornerX18CakePointSequence; import org.x4o.fc18.cake2.FourCornerX21CodePointSequence; import org.x4o.fc18.cake2.FourCornerX00PetitVide; import org.x4o.o2o.io.ContentWriterHtml.Tag; @@ -57,19 +60,22 @@ 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 x21CodeDisplay = videPoint.kaasX21CodeSequence(); Optional x00CoinCarne = videPoint.kaasX00CoinCarne(); - if (videPoint.isX06()) { - writeSequence(writer, "X06", videPoint.toX06().baklavaPointSequence()); + Optional x06BaklavaSequence = videPoint.kaasX06BaklavaSequence(); + Optional x08MuffinSequence = videPoint.kaasX08MuffinSequence(); + Optional x18CakeSequence = videPoint.kaasX18CakeSequence(); + if (x06BaklavaSequence.isPresent()) { + writeSequence(writer, "X06", x06BaklavaSequence.get().baklavaPointSequence()); } - if (videPoint.isX08()) { - writeSequence(writer, "X08", videPoint.toX08().muffinPointSequence()); + if (x08MuffinSequence.isPresent()) { + writeSequence(writer, "X08", x08MuffinSequence.get().muffinPointSequence()); } - if (videPoint.isX18()) { - writeSequence(writer, "X18", videPoint.toX18().cakePointSequence()); + if (x18CakeSequence.isPresent()) { + writeSequence(writer, "X18", x18CakeSequence.get().cakePointSequence()); } - if (x21Display.isPresent()) { - writeSequence(writer, "X21", x21Display.get().codePointSequence()); + if (x21CodeDisplay.isPresent()) { + writeSequence(writer, "X21", x21CodeDisplay.get().codePointSequence()); } if (x00CoinCarne.isPresent()) { FourCornerX00PetitVideCoinCarne cornerKerning = x00CoinCarne.get(); @@ -106,7 +112,7 @@ public class FCDocSegmentWriterCakeWord implements FCDocSegmentWriter { } FourCornerX00PetitVide letter = videPoints[word.getOffset()]; StringBuilder buf = new StringBuilder(); - letter.kaasX21CodePointDisplay().ifPresent(v -> { + letter.kaasX21CodeSequence().ifPresent(v -> { v.codePointSequence().forEach(vv -> buf.appendCodePoint(vv)); }); writer.printTagStart(Tag.pre); 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 f6a6e7d..2e55dbc 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 @@ -22,6 +22,8 @@ */ package org.x4o.fc18.cake2.zero33; +import java.util.List; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -40,27 +42,27 @@ public class FCDotDEC0127DashPX0Test { @Test public void testBaklavaSequence() throws Exception { - int[] seq = null; + List seq = null; 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]); + Assertions.assertEquals(3, seq.size()); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(2)); 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]); + Assertions.assertEquals(3, seq.size()); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X1.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(2)); 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]); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X2.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(2)); 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]); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(0)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(1)); + Assertions.assertEquals(FCDotCDC1604DashP6._ESC6_X3.ordinal(), seq.get(2)); } }