Clean a bit TerminalBuilder

Author: gnodet

terminal-ffm/src/main/java/org/jline/terminal/impl/ffm/FfmTerminalProvider.java

@@ -17,6 +17,7 @@
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
 import org.jline.terminal.impl.PosixPtyTerminal;
 import org.jline.terminal.impl.PosixSysTerminal;
 import org.jline.terminal.spi.Pty;
@@ -35,7 +36,7 @@ public FfmTerminalProvider() {
 
     @Override
     public String name() {
-        return "ffm";
+        return TerminalBuilder.PROP_PROVIDER_FFM;
     }
 
     @Override

terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/JansiTerminalProvider.java

@@ -20,6 +20,7 @@
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
 import org.jline.terminal.impl.PosixPtyTerminal;
 import org.jline.terminal.impl.PosixSysTerminal;
 import org.jline.terminal.impl.jansi.freebsd.FreeBsdNativePty;
@@ -80,7 +81,7 @@ public static boolean isAtLeast(int major, int minor) {
 
     @Override
     public String name() {
-        return "jansi";
+        return TerminalBuilder.PROP_PROVIDER_JANSI;
     }
 
     public Pty current(SystemStream systemStream) throws IOException {

terminal-jna/src/main/java/org/jline/terminal/impl/jna/JnaTerminalProvider.java

@@ -16,6 +16,7 @@
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
 import org.jline.terminal.impl.PosixPtyTerminal;
 import org.jline.terminal.impl.PosixSysTerminal;
 import org.jline.terminal.impl.jna.win.JnaWinSysTerminal;
@@ -27,7 +28,7 @@
 public class JnaTerminalProvider implements TerminalProvider {
     @Override
     public String name() {
-        return "jna";
+        return TerminalBuilder.PROP_PROVIDER_JNA;
     }
 
     public Pty current(SystemStream systemStream) throws IOException {

terminal/src/main/java/org/jline/terminal/TerminalBuilder.java

@@ -26,34 +26,38 @@
 
 public class DumbTerminal extends AbstractTerminal {
 
+    private final TerminalProvider provider;
+    private final SystemStream systemStream;
     private final NonBlockingInputStream input;
     private final OutputStream output;
     private final NonBlockingReader reader;
     private final PrintWriter writer;
     private final Attributes attributes;
     private final Size size;
-    private final SystemStream systemStream;
 
     public DumbTerminal(InputStream in, OutputStream out) throws IOException {
         this(TYPE_DUMB, TYPE_DUMB, in, out, null);
     }
 
     public DumbTerminal(String name, String type, InputStream in, OutputStream out, Charset encoding)
             throws IOException {
-        this(name, type, in, out, encoding, SignalHandler.SIG_DFL, null);
+        this(null, null, name, type, in, out, encoding, SignalHandler.SIG_DFL);
     }
 
     @SuppressWarnings("this-escape")
     public DumbTerminal(
+            TerminalProvider provider,
+            SystemStream systemStream,
             String name,
             String type,
             InputStream in,
             OutputStream out,
             Charset encoding,
-            SignalHandler signalHandler,
-            SystemStream systemStream)
+            SignalHandler signalHandler)
             throws IOException {
         super(name, type, encoding, signalHandler);
+        this.provider = provider;
+        this.systemStream = systemStream;
         NonBlockingInputStream nbis = NonBlocking.nonBlocking(getName(), in);
         this.input = new NonBlockingInputStream() {
             @Override
@@ -98,7 +102,6 @@ public int read(long timeout, boolean isPeek) throws IOException {
         this.attributes.setControlChar(ControlChar.VKILL, (char) 21);
         this.attributes.setControlChar(ControlChar.VLNEXT, (char) 22);
         this.size = new Size();
-        this.systemStream = systemStream;
         parseInfoCmp();
     }
 
@@ -140,7 +143,7 @@ public void setSize(Size sz) {
 
     @Override
     public TerminalProvider getProvider() {
-        return null;
+        return provider;
     }
 
     @Override

terminal/src/main/java/org/jline/terminal/impl/DumbTerminal.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2023, the original author(s).
+ *
+ * This software is distributable under the BSD license. See the terms of the
+ * BSD license in the documentation provided with this software.
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ */
+package org.jline.terminal.impl;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+
+import org.jline.terminal.Attributes;
+import org.jline.terminal.Size;
+import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
+import org.jline.terminal.spi.SystemStream;
+import org.jline.terminal.spi.TerminalProvider;
+
+public class DumbTerminalProvider implements TerminalProvider {
+
+    @Override
+    public String name() {
+        return TerminalBuilder.PROP_PROVIDER_DUMB;
+    }
+
+    @Override
+    public Terminal sysTerminal(
+            String name,
+            String type,
+            boolean ansiPassThrough,
+            Charset encoding,
+            boolean nativeSignals,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            SystemStream systemStream)
+            throws IOException {
+        return new DumbTerminal(
+                this,
+                systemStream,
+                name,
+                type,
+                new FileInputStream(FileDescriptor.in),
+                new FileOutputStream(systemStream == SystemStream.Error ? FileDescriptor.err : FileDescriptor.out),
+                encoding,
+                signalHandler);
+    }
+
+    @Override
+    public Terminal newTerminal(
+            String name,
+            String type,
+            InputStream masterInput,
+            OutputStream masterOutput,
+            Charset encoding,
+            Terminal.SignalHandler signalHandler,
+            boolean paused,
+            Attributes attributes,
+            Size size)
+            throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isSystemStream(SystemStream stream) {
+        return false;
+    }
+
+    @Override
+    public String systemStreamName(SystemStream stream) {
+        return null;
+    }
+
+    @Override
+    public int systemStreamWidth(SystemStream stream) {
+        return 0;
+    }
+}

terminal/src/main/java/org/jline/terminal/impl/DumbTerminalProvider.java

@@ -21,6 +21,7 @@
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
+import org.jline.terminal.TerminalBuilder;
 import org.jline.terminal.impl.ExternalTerminal;
 import org.jline.terminal.impl.PosixSysTerminal;
 import org.jline.terminal.spi.Pty;
@@ -40,7 +41,7 @@ public class ExecTerminalProvider implements TerminalProvider {
     private static boolean warned;
 
     public String name() {
-        return "exec";
+        return TerminalBuilder.PROP_PROVIDER_EXEC;
     }
 
     public Pty current(SystemStream systemStream) throws IOException {