diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSex.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSex.java index 5b6acd6..495e2c5 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSex.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSex.java @@ -36,7 +36,7 @@ import java.util.List; import org.x4o.fc18.octal8.PrimordialOctal; import org.x4o.fc18.octal8.PrimordialOctalIterator; import org.x4o.fc18.octal8.PrimordialOctalOrangeJuice; -import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceCord; +import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceStraw; import org.x4o.fc18.octal8.PrimordialOctalOrangeSexWord; import org.x4o.fc18.octal8.PrimordialOctalSkullBait; @@ -54,11 +54,11 @@ public final class TLVChainOctalSex addFrame(type.ordinalFrameType(), data); } - public void addFrame(PrimordialOctalOrangeJuice type, PrimordialOctalOrangeJuiceCord data) { + public void addFrame(PrimordialOctalOrangeJuice type, PrimordialOctalOrangeJuiceStraw data) { addFrame(type, data.toJuiceArray()); } - public void addFrame(TLVChainOctalSexFrameType type, PrimordialOctalOrangeJuiceCord data) { + public void addFrame(TLVChainOctalSexFrameType type, PrimordialOctalOrangeJuiceStraw data) { addFrame(type.ordinalFrameType(), data.toJuiceArray()); } diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrame.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrame.java index c3ce7ae..ad836e5 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrame.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/octo/tlv/TLVChainOctalSexFrame.java @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.no2all.nostr.octo.tlv; import java.util.Objects; import org.x4o.fc18.octal8.PrimordialOctalOrangeJuice; -import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceCord; +import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceStraw; import org.x4o.fc18.octal8.PrimordialOctalOrangeString; /// @author للَّٰهِilLצسُو @@ -55,7 +55,7 @@ public final class TLVChainOctalSexFrame implements TLVChainAtomFrame { +public final class WarpManifestX18 implements WarpManifestX0 { private final List attributes; private final List sections; @@ -52,14 +52,14 @@ public final class WarpManifestX18 implements WarpManifestX0 { +public final class WarpManifestX18HeaderField implements WarpManifestX0HeaderField { - private PrimordialOctalOrangeJuiceCord name; - private PrimordialOctalOrangeJuiceCord body; - private final List remarks; + private PrimordialOctalOrangeJuiceStraw name; + private PrimordialOctalOrangeJuiceStraw body; + private final List remarks; public WarpManifestX18HeaderField() { this.remarks = new ArrayList<>(); } - public WarpManifestX18HeaderField(PrimordialOctalOrangeJuiceCord name, PrimordialOctalOrangeJuiceCord body) { + public WarpManifestX18HeaderField(PrimordialOctalOrangeJuiceStraw name, PrimordialOctalOrangeJuiceStraw body) { this(); this.name = name; this.body = body; } @Override - public PrimordialOctalOrangeJuiceCord getName() { + public PrimordialOctalOrangeJuiceStraw getName() { return this.name; } @Override - public void setName(PrimordialOctalOrangeJuiceCord name) { + public void setName(PrimordialOctalOrangeJuiceStraw name) { this.name = name; } @Override - public PrimordialOctalOrangeJuiceCord getBody() { + public PrimordialOctalOrangeJuiceStraw getBody() { return this.body; } @Override - public void setBody(PrimordialOctalOrangeJuiceCord body) { + public void setBody(PrimordialOctalOrangeJuiceStraw body) { this.body = body; } @Override - public List getRemarks() { + public List getRemarks() { return this.remarks; } @Override - public WarpManifestX18HeaderField withRemark(PrimordialOctalOrangeJuiceCord remark) { + public WarpManifestX18HeaderField withRemark(PrimordialOctalOrangeJuiceStraw remark) { this.remarks.add(remark); return this; } @Override - public WarpManifestX18HeaderField withRemarks(List remarks) { + public WarpManifestX18HeaderField withRemarks(List remarks) { this.remarks.addAll(remarks); return this; } diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java index 3a6b8aa..2679257 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Import.java @@ -28,7 +28,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import org.x4o.fc18.FourCornerUnicodeImport; -import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceCord; +import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceStraw; import org.x4o.fc18.octal8.PrimordialOctalOrangeString; /// Warp manifest 18 bit model importer from 8 bit model @@ -65,7 +65,7 @@ public final class WarpManifestX18Import { return result; } - static private PrimordialOctalOrangeJuiceCord toX8(String value) { + static private PrimordialOctalOrangeJuiceStraw toX8(String value) { return PrimordialOctalOrangeString.valueOfSmurfs(FourCornerUnicodeImport.lossy().convertToInt18(value)); } } diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Section.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Section.java index 7a5cb4f..20a16d3 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Section.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestX18Section.java @@ -30,35 +30,35 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.ArrayList; import java.util.List; -import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceCord; +import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceStraw; /// Warp manifest 18 bit section. /// /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 -public final class WarpManifestX18Section implements WarpManifestX0Section { +public final class WarpManifestX18Section implements WarpManifestX0Section { - private PrimordialOctalOrangeJuiceCord name; + private PrimordialOctalOrangeJuiceStraw name; private final List attributes; - private final List remarks; + private final List remarks; public WarpManifestX18Section() { this.attributes = new ArrayList<>(); this.remarks = new ArrayList<>(); } - public WarpManifestX18Section(PrimordialOctalOrangeJuiceCord name) { + public WarpManifestX18Section(PrimordialOctalOrangeJuiceStraw name) { this(); this.name = name; } @Override - public PrimordialOctalOrangeJuiceCord getName() { + public PrimordialOctalOrangeJuiceStraw getName() { return name; } @Override - public void setName(PrimordialOctalOrangeJuiceCord name) { + public void setName(PrimordialOctalOrangeJuiceStraw name) { this.name = name; } @@ -68,14 +68,14 @@ public final class WarpManifestX18Section implements WarpManifestX0Section getRemarks() { + public List getRemarks() { return this.remarks; } @Override - public WarpManifestX18Section withRemark(PrimordialOctalOrangeJuiceCord remark) { + public WarpManifestX18Section withRemark(PrimordialOctalOrangeJuiceStraw remark) { this.remarks.add(remark); return this; } @Override - public WarpManifestX18Section withRemarks(List remarks) { + public WarpManifestX18Section withRemarks(List remarks) { this.remarks.addAll(remarks); return this; } diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java index 04dd570..0db7df8 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf; import java.util.PrimitiveIterator; -import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceCord; +import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceStraw; import org.x4o.sax3.io.SAX3XMLConstants; /// Stroboscopic manifest 1 and 2 constants. @@ -152,7 +152,7 @@ public enum ScopicManifestConstants { return true; } - static public boolean isV4DataArraySizeLegal(PrimordialOctalOrangeJuiceCord value) { + static public boolean isV4DataArraySizeLegal(PrimordialOctalOrangeJuiceStraw value) { // Source; // 18 bit TLV length value if (value.length() > VERSION_4_MAX_DATA_LENGHT) { diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java index aaf36b8..4b08b07 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceCord; +import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceStraw; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX18; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestX18Section; @@ -43,11 +43,11 @@ import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestExcepti /// /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 -public class ScopicManifest4ContentHandler implements ScopicManifestContent { +public class ScopicManifest4ContentHandler implements ScopicManifestContent { private final WarpManifestX18 manifest; private WarpManifestX18Section currentSection; - private List remarks; + private List remarks; public ScopicManifest4ContentHandler(WarpManifestX18 manifest) { this.manifest = manifest; @@ -55,7 +55,7 @@ public class ScopicManifest4ContentHandler implements ScopicManifestContent handler; + private final ScopicManifestContent handler; - public ScopicManifest4ContentReader(ScopicManifestContent handler) { + public ScopicManifest4ContentReader(ScopicManifestContent handler) { this.handler = Objects.requireNonNull(handler); } @@ -61,7 +61,7 @@ public class ScopicManifest4ContentReader { if (!ScopicManifest4FrameTLV.META_DECLARATION_VERSION.ordinalFrameType().equals(frameVersion.getSegmentProlog())) { throw new ScopicManifestException("Wrong magic version: 0y" + frameVersion.getSegmentProlog()); } - PrimordialOctalOrangeJuiceCord fieldVersion = frameVersion.getSegmentChainAtoms(); + PrimordialOctalOrangeJuiceStraw fieldVersion = frameVersion.getSegmentChainAtoms(); if (!WarpManifestX0TheVersion.VERSION_4_0.equals(fieldVersion)) { throw new ScopicManifestException("Mismatched version: " + fieldVersion + " requested: " + WarpManifestX0TheVersion.VERSION_4_0); } diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java index 15cc17f..a79c3f8 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; -import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceCord; +import org.x4o.fc18.octal8.PrimordialOctalOrangeJuiceStraw; import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSex; import love.distributedrebirth.nx01.no2all.nostr.octo.tlv.TLVChainOctalSexFrameType; @@ -41,10 +41,10 @@ import love.distributedrebirth.nx01.warp.manifestor.scopic.iomf.ScopicManifestCo /// /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 -public class ScopicManifest4ContentWriter implements ScopicManifestContent { +public class ScopicManifest4ContentWriter implements ScopicManifestContent { private final TLVChainOctalSex chain; - private final ScopicManifestDuplicateDetector duplicateDetector; + private final ScopicManifestDuplicateDetector duplicateDetector; public ScopicManifest4ContentWriter(TLVChainOctalSex chain) { this.chain = chain; @@ -52,7 +52,7 @@ public class ScopicManifest4ContentWriter implements ScopicManifestContent ScopicManifestConstants.ATTR_MANIFEST_VERSION_MAX_LENGHT) { throw new ScopicManifestException("Declaration version too large: " + version.length()); } @@ -60,21 +60,21 @@ public class ScopicManifest4ContentWriter implements ScopicManifestContent