diff --git a/README.md b/README.md index 477bca9..d6479b4 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,13 @@ a smurf village and lego bricks. * Gives order [JediTempleBase8InfinityOne](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᒢᓫᑊᐣᑊ/JediTempleBase8InfinityOne.java) * Uses order [V144Tocta](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᒢᓫᑊᐣᑊ/ᔿᓫᒻᓫᓫ/V144Tocta.java) * Terminator pie [T008ᖟ](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ/T008ᖟ.java) -* Elevators of babel[SoepLepelԲᴬᵖᶦ](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᔆʸᔆᐪᓫᔿ/ᒻᐤᕐᕐᓫᣗ/SoepLepelԲᴬᵖᶦ.java) +* Elevators of babel [SoepLepelԲᴬᵖᶦ](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᔆʸᔆᐪᓫᔿ/ᒻᐤᕐᕐᓫᣗ/SoepLepelԲᴬᵖᶦ.java) * Body from the void [ᒢꞱSkeletorObject](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᒢꞱSkeletorObject.java) * Flying coffins [BãßBȍőnIconOfSinCube𓄯ᶠˡʸ](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒃᣔᔆᔆᒃᐤᐤᣕ/ᒼᒻᣔᙆᙆ/BãßBȍőnIconOfSinCube𓄯ᶠˡʸ.java) * Local laser pointers [BãßBȍőnSpiderTest](nx01-jpp-base/src/test/java/ᒢᐩᐩ/ᒃᣔᔆᔆᒃᐤᐤᣕ/ᒄᓫᣔᐪᑋ/ᔆᣖᑊᒄᓫᣗ/BãßBȍőnSpiderTest.java) +* Lego stair way [LegoBrickStairWay](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᒢᓫᑊᐣᑊ/LegoBrickStairWay.java) +* LegoᐧBrickᐧTapeᐧReplicatorᐧχ3 [LegoBrickTapeStudio](nx01-jpp-base/src/main/java/ᒢᐩᐩ/ᒡᒢᑊᒻᒻᓫᔿ/ᣳᣝᐤᣜᣳ/ᒢᓫᑊᐣᑊ/LegoBrickTapeStudio.java) +* Enterprise mainframe text [CDC1604DashP6](nx01-x4o-o2o/src/main/java/org/x4o/o2o/CDC1604DashP6.java) ## Code of Conduct diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java index 4c81ba5..ca3ef17 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java @@ -30,13 +30,13 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.ArrayList; import java.util.List; -import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; /// Warp manifest4 model. /// /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 -public final class WarpManifest4 implements WarpManifest2 { +public final class WarpManifest4 implements WarpManifest2 { private final List attributes; private final List sections; @@ -52,14 +52,14 @@ public final class WarpManifest4 implements WarpManifest2 { +public final class WarpManifest4HeaderField implements WarpManifest2HeaderField { - private PrimordialOctalOrangeJuiceAtoms name; - private PrimordialOctalOrangeJuiceAtoms body; - private final List remarks; + private PrimordialOctalOrangeJuiceCord name; + private PrimordialOctalOrangeJuiceCord body; + private final List remarks; public WarpManifest4HeaderField() { this.remarks = new ArrayList<>(); } - public WarpManifest4HeaderField(PrimordialOctalOrangeJuiceAtoms name, PrimordialOctalOrangeJuiceAtoms body) { + public WarpManifest4HeaderField(PrimordialOctalOrangeJuiceCord name, PrimordialOctalOrangeJuiceCord body) { this(); this.name = name; this.body = body; } @Override - public PrimordialOctalOrangeJuiceAtoms getName() { + public PrimordialOctalOrangeJuiceCord getName() { return this.name; } @Override - public void setName(PrimordialOctalOrangeJuiceAtoms name) { + public void setName(PrimordialOctalOrangeJuiceCord name) { this.name = name; } @Override - public PrimordialOctalOrangeJuiceAtoms getBody() { + public PrimordialOctalOrangeJuiceCord getBody() { return this.body; } @Override - public void setBody(PrimordialOctalOrangeJuiceAtoms body) { + public void setBody(PrimordialOctalOrangeJuiceCord body) { this.body = body; } @Override - public List getRemarks() { + public List getRemarks() { return this.remarks; } @Override - public WarpManifest4HeaderField withRemark(PrimordialOctalOrangeJuiceAtoms remark) { + public WarpManifest4HeaderField withRemark(PrimordialOctalOrangeJuiceCord remark) { this.remarks.add(remark); return this; } @Override - public WarpManifest4HeaderField withRemarks(List remarks) { + public WarpManifest4HeaderField withRemarks(List remarks) { this.remarks.addAll(remarks); return this; } diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java index 577bb7d..2e0e790 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java @@ -30,35 +30,35 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.ArrayList; import java.util.List; -import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; /// Warp manifest4 section. /// /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 -public final class WarpManifest4Section implements WarpManifest2Section { +public final class WarpManifest4Section implements WarpManifest2Section { - private PrimordialOctalOrangeJuiceAtoms name; + private PrimordialOctalOrangeJuiceCord name; private final List attributes; - private final List remarks; + private final List remarks; public WarpManifest4Section() { this.attributes = new ArrayList<>(); this.remarks = new ArrayList<>(); } - public WarpManifest4Section(PrimordialOctalOrangeJuiceAtoms name) { + public WarpManifest4Section(PrimordialOctalOrangeJuiceCord name) { this(); this.name = name; } @Override - public PrimordialOctalOrangeJuiceAtoms getName() { + public PrimordialOctalOrangeJuiceCord getName() { return name; } @Override - public void setName(PrimordialOctalOrangeJuiceAtoms name) { + public void setName(PrimordialOctalOrangeJuiceCord name) { this.name = name; } @@ -68,14 +68,14 @@ public final class WarpManifest4Section implements WarpManifest2Section getRemarks() { + public List getRemarks() { return this.remarks; } @Override - public WarpManifest4Section withRemark(PrimordialOctalOrangeJuiceAtoms remark) { + public WarpManifest4Section withRemark(PrimordialOctalOrangeJuiceCord remark) { this.remarks.add(remark); return this; } @Override - public WarpManifest4Section withRemarks(List remarks) { + public WarpManifest4Section withRemarks(List remarks) { this.remarks.addAll(remarks); return this; } 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 8274708..6dfad9e 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 @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.Arrays; import java.util.Optional; -import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; import org.x4o.o2o.octal.PrimordialOctalOrangeString; /// Warp manifest schema of the version. @@ -49,7 +49,7 @@ public enum WarpManifestTheVersion { VERSION_3_0("3.0"), ; /// Format: binary-hinari (18 bit or 6 octals) - public static final PrimordialOctalOrangeJuiceAtoms VERSION_4_0 = PrimordialOctalOrangeString.valueOfSmurfs(Arrays.asList(4, 0)); + public static final PrimordialOctalOrangeJuiceCord VERSION_4_0 = PrimordialOctalOrangeString.valueOfSmurfs(Arrays.asList(4, 0)); private final String qName; 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 51c8648..7a801ae 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 @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf; import java.util.PrimitiveIterator; import org.x4o.o2o.io.sax3.XMLConstants; -import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; /// Stroboscopic manifest 1 and 2 constants. /// @@ -152,7 +152,7 @@ public enum ScopicManifestConstants { return true; } - static public boolean isV4DataArraySizeLegal(PrimordialOctalOrangeJuiceAtoms value) { + static public boolean isV4DataArraySizeLegal(PrimordialOctalOrangeJuiceCord 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 b896c9a..480e33d 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.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest4; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest4Section; @@ -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 WarpManifest4 manifest; private WarpManifest4Section currentSection; - private List remarks; + private List remarks; public ScopicManifest4ContentHandler(WarpManifest4 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()); } - PrimordialOctalOrangeJuiceAtoms fieldVersion = frameVersion.getSegmentChainAtoms(); + PrimordialOctalOrangeJuiceCord fieldVersion = frameVersion.getSegmentChainAtoms(); if (!WarpManifestTheVersion.VERSION_4_0.equals(fieldVersion)) { throw new ScopicManifestException("Mismatched version: " + fieldVersion + " requested: " + WarpManifestTheVersion.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 f07b034..9af178a 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 @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; import org.x4o.o2o.io.tlv.TLVChainOctalSex; import org.x4o.o2o.io.tlv.TLVChainOctalSexFrameType; -import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicateDetector; @@ -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 defaultValue) { + PrimordialOctalOrangeJuiceCord result = getPropertyString18(key); + if (result != null) { + return result; + } + return defaultValue.get(); + } + public final void copyParentProperties(PropertyConfig config) { for (String key:getPropertyKeys()) { Object value = config.getProperty(key); @@ -455,6 +486,10 @@ public final class PropertyConfig implements Cloneable { result.put(mKey, mValue); return; } + if (PrimordialOctalOrangeJuiceCord.class.equals(valueType)) { + setProperty(key, PrimordialOctalOrangeString.valueOfHinari(value)); + return; + } } /** diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.java index 96981b5..44fbb5f 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.java @@ -123,7 +123,7 @@ public class AbstractContentWriterHandler implements ContentHandler { return propertyConfig; } - // TODO: check location of this. (add to api?) + @Deprecated public void closeWriter() throws IOException { if (out==null) { return; @@ -131,6 +131,7 @@ public class AbstractContentWriterHandler implements ContentHandler { out.close(); } + @Deprecated public void closeWriterSafe() { try { closeWriter(); diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java index 009c061..8166a00 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java @@ -20,10 +20,10 @@ * 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. */ + /** * The SAX Extended classes and interfaces. * * @since 1.0 */ - package org.x4o.o2o.io.sax3; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.java index e5f496c..3cb0945 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.java @@ -47,7 +47,7 @@ public enum XDBXContentTag { ATTRIBUTE_III('y'), ATTRIBUTE_III_FAST('b'), // no CR,AMP,GT,LT,',",\t,\n TEXT_T('T'), - TEXT_UNESCAPED('U'), // no CR,AMP,GT,LT in text node + TEXT_T_FAST('U'), // no CR,AMP,GT,LT in text node TEXT_CDATA('C'), TEXT_WHITE_SPACE('W'), COMMENT('c'), diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java index 50f1ec8..1883c4c 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java @@ -20,10 +20,10 @@ * 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. */ + /** * The SAX XDBX classes and interfaces. * * @since 1.0 */ - package org.x4o.o2o.io.sax3.xdbx; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java index 5dbcab8..bc43f0d 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java @@ -36,7 +36,7 @@ import java.util.List; import org.x4o.o2o.octal.PrimordialOctal; import org.x4o.o2o.octal.PrimordialOctalIterator; import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; -import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord; /// @author للَّٰهِilLצسُو @@ -53,11 +53,11 @@ public final class TLVChainOctalSex addFrame(type.ordinalFrameType(), data); } - public void addFrame(PrimordialOctalOrangeJuice type, PrimordialOctalOrangeJuiceAtoms data) { + public void addFrame(PrimordialOctalOrangeJuice type, PrimordialOctalOrangeJuiceCord data) { addFrame(type, data.toJuiceArray()); } - public void addFrame(TLVChainOctalSexFrameType type, PrimordialOctalOrangeJuiceAtoms data) { + public void addFrame(TLVChainOctalSexFrameType type, PrimordialOctalOrangeJuiceCord data) { addFrame(type.ordinalFrameType(), data.toJuiceArray()); } diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java index 08e339d..f0f1e68 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java @@ -30,7 +30,7 @@ package org.x4o.o2o.io.tlv; import java.util.Objects; import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; -import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceCord; import org.x4o.o2o.octal.PrimordialOctalOrangeString; /// @author للَّٰهِilLצسُو @@ -55,7 +55,7 @@ public final class TLVChainOctalSexFrame implements TLVChainAtomFrame action) { + for (int i=0;i