add color support to JLineTextTerminal

build.gradle

@@ -295,13 +295,18 @@ project('text-io-demo') {
     applicationName = "textio-demo"
 
     startScripts {
-        defaultJvmOpts = ['-Dlogback.configurationFile=../logback.xml']
+        defaultJvmOpts = ['-Dlogback.configurationFile=logback.xml']
     }
 
     applicationDistribution.from("${rootProject.projectDir}/dist") {
+        exclude 'xbin'
         filter(ReplaceTokens, tokens:[textIoVersion : textIoVersion])
     }
 
+    applicationDistribution.from("${rootProject.projectDir}/dist/xbin") {
+        into 'bin'
+    }
+
     applicationDistribution.from("${rootProject.projectDir}/..") {
         include('LICENSE', 'NOTICE')
     }

dist/README

@@ -1,5 +1,7 @@
 =======================================================================
- Text IO @textIoVersion@
+ Text IO @textIoVersion@ Demo
 =======================================================================
 
+Start the demo by executing 'textio-demo' or 'textio-demo.bat' in the bin directory.
+
 Visit the Text IO site for the latest news and downloads: https://github.com/beryx/text-io

dist/xbin/logback.xml

@@ -0,0 +1,18 @@
+<configuration>
+    <appender name="STDOUT"
+              class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>
+                %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+    <root level="OFF">
+        <appender-ref ref="STDOUT"/>
+    </root>
+<!--
+    <logger name="org.beryx.textio" level="trace" additivity="false">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+-->
+</configuration>

dist/xbin/textio.properties

@@ -0,0 +1,13 @@
+# swing.user.interrupt.key = ctrl Q
+# web.user.interrupt.key = ctrl Q
+
+textio.user.interrupt.key = ctrl Q
+
+textio.prompt.color = green
+# textio.prompt.bgcolor = yellow
+# textio.prompt.bold = true
+
+
+textio.input.color = yellow
+# textio.input.bgcolor = blue
+# textio.input.bold = true

text-io-demo/src/main/java/org/beryx/textio/demo/TextIoDemo.java

@@ -20,9 +20,7 @@
 import org.beryx.textio.TextTerminal;
 import org.beryx.textio.TextTerminalProvider;
 import org.beryx.textio.console.ConsoleTextTerminalProvider;
-import org.beryx.textio.jline.AnsiTextTerminal;
 import org.beryx.textio.jline.JLineTextTerminalProvider;
-import org.beryx.textio.swing.SwingTextTerminal;
 import org.beryx.textio.swing.SwingTextTerminalProvider;
 import org.beryx.textio.system.SystemTextTerminal;
 import org.beryx.textio.system.SystemTextTerminalProvider;
@@ -89,7 +87,6 @@ private static TextIO chooseTextIO() {
                             new SystemTextTerminalProvider(),
                             new ConsoleTextTerminalProvider(),
                             new JLineTextTerminalProvider(),
-                            new NamedProvider("ANSI terminal", () -> createAnsiTextTerminal(textIO)),
                             new SwingTextTerminalProvider(),
                             new NamedProvider("Web terminal", () -> createWebTextTerminal(textIO))
                     )
@@ -111,29 +108,6 @@ private static TextIO chooseTextIO() {
         }
     }
 
-    private static AnsiTextTerminal createAnsiTextTerminal(TextIO textIO) {
-        boolean bold = textIO.newBooleanInputReader()
-                .withDefaultValue(false)
-                .read("Bold text?");
-
-        String[] colors = AnsiTextTerminal.ANSI_COLOR_MAP.keySet().toArray(new String[0]);
-        String color = textIO.newStringInputReader()
-                .withNumberedPossibleValues(colors)
-                .withDefaultValue("yellow")
-                .read("Text color");
-
-        String bgColor = textIO.newStringInputReader()
-                .withNumberedPossibleValues(colors)
-                .withDefaultValue("blue")
-                .read("Background color");
-
-        AnsiTextTerminal terminal = new AnsiTextTerminal();
-        terminal.withBold(bold);
-        terminal.withColor(color);
-        terminal.withBackgroundColor(bgColor);
-        return terminal;
-    }
-
     private static WebTextTerminal createWebTextTerminal(TextIO textIO) {
         webServerPort = textIO.newIntInputReader()
                 .withDefaultValue(Service.SPARK_DEFAULT_PORT)

text-io-web/src/main/java/org/beryx/textio/web/WebTextTerminal.java

@@ -17,6 +17,7 @@
 
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.beryx.textio.AbstractTextTerminal;
+import org.beryx.textio.PropertiesPrefixes;
 import org.beryx.textio.TextTerminal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +39,7 @@
  * It works only in conjunction with a web server supporting the {@link DataApi} (such as {@link SparkDataServer})
  * and a web component that accesses this API (typically via textterm.js).
  */
+@PropertiesPrefixes({"web"})
 public class WebTextTerminal extends AbstractTextTerminal<WebTextTerminal> implements DataApi {
     private static final Logger logger =  LoggerFactory.getLogger(WebTextTerminal.class);
 

text-io/src/main/java/org/beryx/textio/AbstractTextTerminal.java

@@ -79,7 +79,7 @@ public final String addDefaultProperty(String key, String value) {
     }
 
     public void initProperties() {
-        getPropertiesReader().ifPresent(reader -> initProperties(reader));
+        initProperties(getPropertiesReader().orElse(null));
     }
 
     public Optional<Reader> getPropertiesReader() {
@@ -113,15 +113,18 @@ public Optional<Reader> getPropertiesReader() {
         } else {
             logger.debug("No terminal properties file found in classpath.");
         }
+        logger.debug("Using only default properties.");
         return Optional.empty();
     }
 
     public void initProperties(Reader propsReader) {
         Properties rawProps = new Properties();
-        try {
-            rawProps.load(propsReader);
-        } catch (IOException e) {
-            logger.warn("Failed to read terminal properties.", e);
+        if(propsReader != null) {
+            try {
+                rawProps.load(propsReader);
+            } catch (IOException e) {
+                logger.warn("Failed to read terminal properties.", e);
+            }
         }
         initProperties(rawProps);
     }

text-io/src/main/java/org/beryx/textio/console/ConsoleTextTerminal.java

@@ -16,6 +16,7 @@
 package org.beryx.textio.console;
 
 import org.beryx.textio.AbstractTextTerminal;
+import org.beryx.textio.PropertiesPrefixes;
 import org.beryx.textio.TextTerminal;
 
 import java.io.Console;
@@ -24,6 +25,7 @@
 /**
  * A {@link TextTerminal} backed by a {@link Console}.
  */
+@PropertiesPrefixes({"console"})
 public class ConsoleTextTerminal extends AbstractTextTerminal<ConsoleTextTerminal> {
     private final Console console;