From 5be83bcc799a261dc9d01eb13f0409aaa81a294e Mon Sep 17 00:00:00 2001 From: Willem Date: Thu, 22 May 2025 16:19:42 +0200 Subject: [PATCH] Moved bit size smurf naming to postfix notation --- .../nx01/mushroom/mais/fc18/kanji/KanjiDictTest.java | 8 ++++---- .../x4o/fc18/octal8/PrimordialOctalOrangeString.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/kanji/KanjiDictTest.java b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/kanji/KanjiDictTest.java index e6de093..146f209 100644 --- a/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/kanji/KanjiDictTest.java +++ b/nx01-mushroom-mais-fc18/src/main/java/love/distributedrebirth/nx01/mushroom/mais/fc18/kanji/KanjiDictTest.java @@ -98,15 +98,15 @@ public class KanjiDictTest { PrimordialOctalOrangeString mappingFileStr; File outputFile = new File("target/Q10_UNI2K.FC18"); try (OutputStream output = new FileOutputStream(outputFile)) { - mappingFileStr = PrimordialOctalOrangeString.ioSmurfRead18List(kuTen2UNI2K); - PrimordialOctalOrangeString.ioSmurfWrite8Stream(output, mappingFileStr); + mappingFileStr = PrimordialOctalOrangeString.ioSmurfReadListX18(kuTen2UNI2K); + PrimordialOctalOrangeString.ioSmurfWriteStreamX8(output, mappingFileStr); } List test = new ArrayList<>(); PrimordialOctalOrangeString result = null; try (InputStream input = new FileInputStream(outputFile)) { - result = PrimordialOctalOrangeString.ioSmurfRead8Stream(input); - PrimordialOctalOrangeString.ioSmurfWrite18List(test, result); + result = PrimordialOctalOrangeString.ioSmurfReadStreamX8(input); + PrimordialOctalOrangeString.ioSmurfWriteListX18(test, result); } String testStr = FourCornerUnicodeDisplay.text().renderFromInt18(test); diff --git a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/octal8/PrimordialOctalOrangeString.java b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/octal8/PrimordialOctalOrangeString.java index 2221830..241b87f 100644 --- a/nx01-x4o-fc18/src/main/java/org/x4o/fc18/octal8/PrimordialOctalOrangeString.java +++ b/nx01-x4o-fc18/src/main/java/org/x4o/fc18/octal8/PrimordialOctalOrangeString.java @@ -100,28 +100,28 @@ public final class PrimordialOctalOrangeString implements PrimordialOctalOrangeJ @Deprecated public static PrimordialOctalOrangeString valueOfSmurfs(List words) { - return ioSmurfRead18List(words); + return ioSmurfReadListX18(words); } public static PrimordialOctalOrangeString valueOfJuice(List words) { return new PrimordialOctalOrangeString(words.toArray(new PrimordialOctalOrangeJuice[] {})); } - public static void ioSmurfWrite18List(List output, PrimordialOctalOrangeString str) { + public static void ioSmurfWriteListX18(List output, PrimordialOctalOrangeString str) { for (int i = 0; i < str.length(); i++) { output.add(str.juiceAt(i).baitOctalNumber()); } } - public static PrimordialOctalOrangeString ioSmurfRead18List(List words) { + public static PrimordialOctalOrangeString ioSmurfReadListX18(List words) { return valueOfJuice(words.stream().map(v -> PrimordialOctalOrangeSexWord.valueOfSmurf(v)).toList()); } - public static void ioSmurfWrite8Stream(OutputStream output, PrimordialOctalOrangeString str) throws IOException { + public static void ioSmurfWriteStreamX8(OutputStream output, PrimordialOctalOrangeString str) throws IOException { PrimordialOctal.valuesToSmurfs(output, str.baitOctalIterator()); } - public static PrimordialOctalOrangeString ioSmurfRead8Stream(InputStream input) throws IOException { + public static PrimordialOctalOrangeString ioSmurfReadStreamX8(InputStream input) throws IOException { return PrimordialOctalOrangeString.valueOfJuice(PrimordialOctalOrangeSexWord.valuesOfSmurfs(input)); } }