Move system properties name to TerminalBuilder for easier reference

jline · Mar 26, 2018 · 81c428c · 81c428c
1 parent 1517046
commit 81c428c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java
@@ -50,6 +50,13 @@ public final class TerminalBuilder {
     public static final String PROP_EXEC = "org.jline.terminal.exec";
     public static final String PROP_DUMB = "org.jline.terminal.dumb";
 
+    //
+    // Other system properties controlling various jline parts
+    //
+
+    public static final String PROP_NON_BLOCKING_READS = "org.jline.terminal.pty.nonBlockingReads";
+    public static final String PROP_COLOR_DISTANCE = "org.jline.utils.colorDistance";
+
     /**
      * Returns the default system terminal.
      * Terminals should be closed properly using the {@link Terminal#close()}

diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractPty.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractPty.java
@@ -9,6 +9,8 @@
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 
+import static org.jline.terminal.TerminalBuilder.PROP_NON_BLOCKING_READS;
+
 public abstract class AbstractPty implements Pty {
 
     private Attributes current;
@@ -22,7 +24,7 @@ public void setAttr(Attributes attr) throws IOException {
     @Override
     public InputStream getSlaveInput() throws IOException {
         InputStream si = doGetSlaveInput();
-        if (Boolean.parseBoolean(System.getProperty("org.jline.terminal.pty.nonBlockingReads", "true"))) {
+        if (Boolean.parseBoolean(System.getProperty(PROP_NON_BLOCKING_READS, "true"))) {
             return new PtyInputStream(si);
         } else {
             return si;

diff --git a/terminal/src/main/java/org/jline/utils/Colors.java b/terminal/src/main/java/org/jline/utils/Colors.java
@@ -17,6 +17,8 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
+import static org.jline.terminal.TerminalBuilder.PROP_COLOR_DISTANCE;
+
 public class Colors {
 
     /**
@@ -151,7 +153,7 @@ private static int roundColor(int color, int[] colors, int max, Distance distanc
 
     private static Distance getDistance(String dist) {
         if (dist == null) {
-            dist = System.getProperty("org.jline.utils.color.distance", "cie76");
+            dist = System.getProperty(PROP_COLOR_DISTANCE, "cie76");
         }
         return doGetDistance(dist);
     }