add properties support

Author: siordache

build.gradle

@@ -52,7 +52,7 @@ def pomConfig = {
     }
 }
 
-ext.groovyVersion = '2.4.7'
+ext.groovyVersion = '2.4.9'
 
 allprojects {
     group = 'org.beryx'

gradle.properties

@@ -1,5 +1,5 @@
-textIoVersionMajor = 1
-textIoVersionMinor = 10
+textIoVersionMajor = 2
+textIoVersionMinor = 0
 textIoVersionPatch = 0
 # textIoVersionLabel = rc-1
 textIoReleaseBuild = false

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Mon Apr 25 12:16:33 CEST 2016
+#Thu Mar 02 10:02:15 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

gradlew.bat

@@ -106,6 +106,7 @@ private static TextIO chooseTextIO() {
                 terminal.printf("\nCannot create a %s%s\n\n", terminalProvider, ((errMsg != null) ? (": " + errMsg) : "."));
                 continue;
             }
+            chosenTerminal.init();
             return new TextIO(chosenTerminal);
         }
     }

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

@@ -4,7 +4,6 @@
     <title>WebTextTerminal Demo</title>
     <link rel="stylesheet" href="textterm.css">
 </head>
-</head>
 <body>
 <h1>WebTextTerminal Demo</h1>
 

text-io-demo/src/main/resources/public-html/web-demo.html

@@ -16,11 +16,13 @@
 package org.beryx.textio.web;
 
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.beryx.textio.AbstractTextTerminal;
 import org.beryx.textio.TextTerminal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
@@ -32,11 +34,11 @@
 import static org.beryx.textio.web.TextTerminalData.Action.*;
 
 /**
- * A TextTerminal that allows accessing the application via a browser.
+ * A {@link TextTerminal} that allows accessing the application via a browser.
  * 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).
  */
-public class WebTextTerminal implements TextTerminal<WebTextTerminal>, DataApi {
+public class WebTextTerminal extends AbstractTextTerminal<WebTextTerminal> implements DataApi {
     private static final Logger logger =  LoggerFactory.getLogger(WebTextTerminal.class);
 
     public static final long DEFAULT_TIMEOUT_NOT_EMPTY = 5000L;
@@ -77,6 +79,10 @@ public void setTimeoutHasAction(long timeoutHasAction) {
     };
     private boolean abortRead = true;
 
+    public WebTextTerminal() {
+        addPropertyChangeListener(PROP_USER_INTERRUPT_KEY, (oldKey, newKey) -> setUserInterruptKey(newKey));
+    }
+
     public WebTextTerminal createCopy() {
         WebTextTerminal copy = new WebTextTerminal();
         copy.setOnDispose(this.onDispose);
@@ -257,6 +263,50 @@ public void postUserInterrupt(String partialInput) {
         postUserInput(partialInput, true);
     }
 
+
+    private static class KeyCombination {
+        final int code;
+        final boolean ctrl;
+        final boolean shift;
+        final boolean alt;
+
+        KeyCombination(int code, boolean ctrl, boolean shift, boolean alt) {
+            this.code = code;
+            this.ctrl = ctrl;
+            this.shift = shift;
+            this.alt = alt;
+        }
+    }
+
+    private KeyCombination getKeyCombination(String keyStroke) {
+        if(keyStroke == null) return null;
+        String[] parts = keyStroke.trim().split("\\s+");
+        if(parts.length < 2) return null;
+        String charPart = parts[parts.length - 1];
+        if(charPart.length() != 1) return null;
+        char code = Character.toUpperCase(charPart.charAt(0));
+        if(code < 'A' || code > 'Z')return null;
+        List<String> modifiers = Arrays.asList("ctrl", "shift", "alt");
+        int[] modCount = new int[3];
+        for(int i=0; i < parts.length - 1; i++) {
+            String part = parts[i].trim().toLowerCase();
+            int idx = modifiers.indexOf(part);
+            if(idx < 0) return null;
+            if(modCount[idx] > 0) return null;
+            modCount[idx]++;
+        }
+        return new KeyCombination(code, (modCount[0] > 0), (modCount[1] > 0), (modCount[2] > 0));
+    }
+
+    public void setUserInterruptKey(String keyStroke) {
+        KeyCombination kc = getKeyCombination(keyStroke);
+        if(kc == null) {
+            logger.warn("Invalid keyStroke: " + keyStroke);
+        } else {
+            setUserInterruptKey(kc.code, kc.ctrl, kc.shift, kc.alt);
+        }
+    }
+
     public void setUserInterruptKey(int code, boolean ctrl, boolean shift, boolean alt) {
         dataLock.lock();
         try {