From 4fa44098102d39ce6b4dc7f1277f032a04f32b9e Mon Sep 17 00:00:00 2001 From: Willem Date: Thu, 26 Dec 2024 14:29:50 +0100 Subject: [PATCH] Added TODO for manifest version 5,6 and 7 --- .../manifestor/manifest/WarpManifestTheMimeType.java | 6 ++++++ .../manifestor/manifest/WarpManifestTheVersion.java | 11 ++++++++++- .../java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java | 8 +++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheMimeType.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheMimeType.java index 13b7f00..77b32a7 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheMimeType.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheMimeType.java @@ -46,10 +46,16 @@ public enum WarpManifestTheMimeType { MANIFEST_2 ("application/manifest2", "MF2", null), MANIFEST_3 ("application/manifest3", "MF3", new byte[] {0x4d,0x53,0x58,0x33,0x4d,0x46,0x30,0x42}), + @Deprecated /// TODO: remove gz version because IBM said so. MANIFEST_3_GZ ("application/manifest3-gz", "MF3Z", new byte[] {0x4d,0x53,0x58,0x33,0x4d,0x46,0x5a,0x42}), MANIFEST_4 ("application/manifest4", "MF4", new byte[] {0x4d,0x53,0x58,0x34,0x4d,0x53,0x58,0x34,0x2d,0x2d,0x4d,0x46,0x31,0x38,0x4d,0x46,0x31,0x38}), + @Deprecated /// TODO: remove gz version because IBM said so. MANIFEST_4_GZ ("application/manifest4-gz", "MF4Z", new byte[] {0x4d,0x53,0x58,0x34,0x4d,0x53,0x58,0x34,0x2d,0x2d,0x4d,0x46,0x5a,0x38,0x4d,0x46,0x5a,0x38}), + + //MANIFEST_5 ("application/manifest5", "MF5", null), + //MANIFEST_6 ("application/manifest6", "MF6", null), + //MANIFEST_7 ("application/manifest7", "MF7", null), ; static public final int MARKER_3_LENGTH = 8; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java index 6dfad9e..4e032b0 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java @@ -48,9 +48,18 @@ public enum WarpManifestTheVersion { /// Format: binary-unicode VERSION_3_0("3.0"), ; - /// Format: binary-hinari (18 bit or 6 octals) + /// Format: Custom TLV 18 bit binary (18 bit or 6 octals as byte replacement) public static final PrimordialOctalOrangeJuiceCord VERSION_4_0 = PrimordialOctalOrangeString.valueOfSmurfs(Arrays.asList(4, 0)); + // TODO: Format: SAX3 binary 8 bit XDBX XML with unicode manifest data + // VERSION_5_0 + + // TODO: Format: SAX4 binary adult 18 bit XML with manifest in 4C, but tags/attr in CDC1604DashP6 + // VERSION_6_0 + + // TODO: Format: SAX4 binary adult 18 bit XML with manifest data and XML structure in 4C + // VERSION_7_0 + private final String qName; private WarpManifestTheVersion(String qName) { diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java index 1ea261d..43997ee 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax4/X4ContentFrameTag.java @@ -22,6 +22,8 @@ */ package org.x4o.o2o.io.sax4; +import java.util.Objects; + import org.x4o.o2o.CDC1604DashP6; import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord; @@ -55,11 +57,11 @@ public enum X4ContentFrameTag { private final PrimordialOctalOrangeJuice tagNumber; private X4ContentFrameTag(CDC1604DashP6 tag) { - this(tag.ordinal()); + this(PrimordialOctalOrangeSexWord.valueOfSmurf(tag.ordinal())); } - private X4ContentFrameTag(int tag) { - tagNumber = PrimordialOctalOrangeSexWord.valueOfSmurf(tag); + private X4ContentFrameTag(PrimordialOctalOrangeJuice tagNumber) { + this.tagNumber = Objects.requireNonNull(tagNumber); } public PrimordialOctalOrangeJuice getTagNumber() {