Update All Streams

Author: mintUI9976

src/main/java/de/mint/consoleline/event/error/ErrorPrintStream.java

@@ -2,7 +2,6 @@
 
 import de.mint.consoleline.service.JlineUtils;
 import de.mint.consoleline.write.LogWriter;
-import org.jetbrains.annotations.Nullable;
 import org.jline.reader.LineReader;
 
 import java.io.PrintStream;
@@ -12,20 +11,52 @@ public record ErrorPrintStream(Charset charset) {
 
   public void stream(final boolean log, final LineReader lineReader, final LogWriter logWriter) {
 
-    System.setErr(
-        new PrintStream(System.err, false, this.charset) {
-          @Override
-          public void println(@Nullable final String message) {
-            assert message != null;
-            final String temp = message + "\n";
-            lineReader.printAbove(temp);
+    PrintStream jlineErr =
+        new PrintStream(System.err, false, charset) {
+
+          private void jlinePrint(String msg) {
+            lineReader.printAbove(msg);
             lineReader.getTerminal().writer().flush();
-            if (log) {
-              if (logWriter != null) {
-                logWriter.insert(JlineUtils.cleanAnsiString(message));
-              }
+
+            if (log && logWriter != null) {
+              logWriter.insert(JlineUtils.cleanAnsiString(msg));
             }
           }
-        });
+
+          @Override
+          public void println(String x) {
+            jlinePrint(x);
+          }
+
+          @Override
+          public void println() {
+            jlinePrint("");
+          }
+
+          @Override
+          public void print(String s) {
+            jlinePrint(s);
+          }
+
+          @Override
+          public PrintStream printf(String format, Object... args) {
+            jlinePrint(String.format(format, args));
+            return this;
+          }
+
+          @Override
+          public PrintStream format(String format, Object... args) {
+            jlinePrint(String.format(format, args));
+            return this;
+          }
+
+          @Override
+          public void write(byte[] buf, int off, int len) {
+            String s = new String(buf, off, len, charset);
+            jlinePrint(s);
+          }
+        };
+
+    System.setErr(jlineErr);
   }
 }

src/main/java/de/mint/consoleline/event/input/InputRunnable.java

@@ -53,9 +53,9 @@ public void run() {
             } else {
 
               if (this.commandArgumentNotAvailableFormat() != null) {
-                String[] formatData = this.commandArgumentNotAvailableFormat();
-                Object[] args = Arrays.copyOfRange(formatData, 1, formatData.length);
-                System.out.println(String.format(formatData[0], args));
+                final String[] formatData = this.commandArgumentNotAvailableFormat();
+                final Object[] args = Arrays.copyOfRange(formatData, 1, formatData.length);
+                System.out.printf((formatData[0]) + "%n", args);
               } else {
                 if (this.commandArgumentNotAvailable() != null) {
                   System.out.println(this.commandArgumentNotAvailable());
@@ -65,9 +65,9 @@ public void run() {
           } else {
 
             if (this.commandNotAvailableFormat() != null) {
-              String[] formatData = this.commandNotAvailableFormat();
-              Object[] args = Arrays.copyOfRange(formatData, 1, formatData.length);
-              System.out.println(String.format(formatData[0], args));
+              final String[] formatData = this.commandNotAvailableFormat();
+              final Object[] args = Arrays.copyOfRange(formatData, 1, formatData.length);
+              System.out.printf((formatData[0]) + "%n", args);
             } else {
               if (this.commandNotAvailable() != null) {
                 System.out.println(this.commandNotAvailable());

src/main/java/de/mint/consoleline/event/output/OutputPrintStream.java

@@ -9,22 +9,55 @@
 
 public record OutputPrintStream(Charset charset) {
 
-    // A method that is used to override the standard output stream.
     public void stream(final boolean log, final LineReader lineReader, final LogWriter logWriter) {
-        System.setOut(
-                new PrintStream(System.out, false, this.charset) {
-                    @Override
-                    public void println(final String message) {
-                        assert message != null;
-                        final String temp = message + "\n";
-                        lineReader.printAbove(temp);
-                        lineReader.getTerminal().writer().flush();
-                        if (log) {
-                            if (logWriter != null) {
-                                logWriter.insert(JlineUtils.cleanAnsiString(message));
-                            }
-                        }
-                    }
-                });
-    }
+
+    final PrintStream jlineOut =
+        new PrintStream(System.out, false, charset) {
+
+          private void jlinePrint(String msg) {
+            lineReader.printAbove(msg);
+            lineReader.getTerminal().writer().flush();
+
+            if (log && logWriter != null) {
+              logWriter.insert(JlineUtils.cleanAnsiString(msg));
+            }
+          }
+
+          @Override
+          public void println(String x) {
+            jlinePrint(x);
+          }
+
+          @Override
+          public void println() {
+            jlinePrint("");
+          }
+
+          @Override
+          public void print(String s) {
+            jlinePrint(s);
+          }
+
+          @Override
+          public PrintStream printf(String format, Object... args) {
+            jlinePrint(String.format(format, args));
+            return this;
+          }
+
+          @Override
+          public PrintStream format(String format, Object... args) {
+            jlinePrint(String.format(format, args));
+            return this;
+          }
+
+          @Override
+          public void write(byte[] buf, int off, int len) {
+            String s = new String(buf, off, len, charset);
+            jlinePrint(s);
+          }
+        };
+
+    System.setOut(jlineOut);
+    System.setErr(jlineOut);
+  }
 }