remove all JavaFX dependencies

Author: siordache

build.gradle

@@ -201,7 +201,6 @@ subprojects {
             file {
                 whenMerged {
                     def jre = entries.find { it.path.contains 'org.eclipse.jdt.launching.JRE_CONTAINER' }
-                    jre.accessRules.add(new org.gradle.plugins.ide.eclipse.model.AccessRule('0', 'javafx/**'))
                 }
             }
             plusConfigurations << configurations.provided
@@ -286,6 +285,7 @@ gitPublish {
 project('text-io') {
     dependencies {
       compile 'jline:jline:2.14.5'
+      compile 'org.beryx:awt-color-factory:1.0.0'
     }
 }
 

doc/getting_started.adoc

@@ -1,7 +1,7 @@
 [[getting_started]]
 = Getting Started
 
-CAUTION: You need Java 8 or newer and JavaFX in order to use Text-IO.
+CAUTION: You need Java 8 or newer in order to use Text-IO.
 
 Text-IO is available in Maven Central and JCenter.
 

doc/user_guide.adoc

@@ -309,7 +309,7 @@ Default value: `Ctrl C`.
 
 
 The values of the color properties are interpreted using the
-https://docs.oracle.com/javase/8/javafx/api/javafx/scene/paint/Color.html#web-java.lang.String-[Color.web(String colorString)].
+https://static.javadoc.io/org.beryx/awt-color-factory/1.0.0/org/beryx/awt/color/ColorFactory.html#web(java.lang.String)[ColorFactory.web(String colorString)].
 method.
 This means that you can specify colors in various ways, such as: `red`, `#aa38e0`, `0x40A8CC`, `rgba(112,36,228,0.9)`, `hsla(270,100%,100%,1.0)` etc.
 
@@ -323,7 +323,7 @@ Using this TerminalProperties, you can dynamically configure properties by calli
 link:javadoc/org/beryx/textio/TerminalProperties.html#put-java.lang.String-java.lang.Object-['put(String key, Object value)'] method.
 Additionally, convenience methods are available for frequently used properties (for example:
 link:javadoc/org/beryx/textio/TerminalProperties.html#setInputBold-boolean-[setInputBold(boolean bold)] or
-link:javadoc/org/beryx/textio/TerminalProperties.html#setPromptColor-javafx.scene.paint.Color-[setPromptColor(Color color)]).
+link:javadoc/org/beryx/textio/TerminalProperties.html#setPromptColor-java.awt.Color-[setPromptColor(Color color)]).
 
 
 TIP: You can learn how to configure and use terminal properties by looking at the

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

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

@@ -15,7 +15,7 @@
  */
 package org.beryx.textio;
 
-import javafx.scene.paint.Color;
+import java.awt.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -323,10 +323,7 @@ public void addBooleanListener(String key, boolean defaultValue, BooleanChangeLi
 
 
     private static String toHex(Color color) {
-        int r = (int)Math.round(color.getRed() * 255.0);
-        int g = (int)Math.round(color.getGreen() * 255.0);
-        int b = (int)Math.round(color.getBlue() * 255.0);
-        return String.format("#%02x%02x%02x", r, g, b);
+        return String.format("#%02x%02x%02x", color.getRed(), color.getGreen(), color.getBlue());
     }
 
     /** Convenience method that associates the specified {@code color} with the key {@value PropertiesConstants#PROP_PROMPT_COLOR} */

text-io/src/main/java/org/beryx/textio/jline/JLineTextTerminal.java

@@ -15,10 +15,11 @@
  */
 package org.beryx.textio.jline;
 
-import javafx.scene.paint.Color;
+import java.awt.Color;
 import jline.console.ConsoleReader;
 import jline.console.CursorBuffer;
 import jline.console.UserInterruptException;
+import org.beryx.awt.color.ColorFactory;
 import org.beryx.textio.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,12 +124,12 @@ private static String getStandardColorCode(Color color) {
     }
 
     private static double getColorDistance(Color col1, Color col2) {
-        double r1 = col1.getRed();
-        double g1 = col1.getGreen();
-        double b1 = col1.getBlue();
-        double r2 = col2.getRed();
-        double g2 = col2.getGreen();
-        double b2 = col2.getBlue();
+        double r1 = col1.getRed() / 255.0;
+        double g1 = col1.getGreen() / 255.0;
+        double b1 = col1.getBlue() / 255.0;
+        double r2 = col2.getRed() / 255.0;
+        double g2 = col2.getGreen() / 255.0;
+        double b2 = col2.getBlue() / 255.0;
 
         double rmean = (r1 + r2) / 2;
         double dr = r1 - r2;
@@ -139,17 +140,17 @@ private static double getColorDistance(Color col1, Color col2) {
     }
 
     private static String getIndexedColorCode(Color color) {
-        double r = 255 * color.getRed();
-        double g = 255 * color.getGreen();
-        double b = 255 * color.getBlue();
+        double r = color.getRed();
+        double g = color.getGreen();
+        double b = color.getBlue();
         int val = 16 + 36 * mapTo6(r) + 6 * mapTo6(g) + mapTo6(b);
         return "8;5;" + val;
     }
 
     private static String getRGBColorCode(Color color) {
-        int r = (int)(255 * color.getRed());
-        int g = (int)(255 * color.getGreen());
-        int b = (int)(255 * color.getBlue());
+        int r = color.getRed();
+        int g = color.getGreen();
+        int b = color.getBlue();
         return "8;2;" + r + ";" + g + ";" + b;
     }
 
@@ -164,7 +165,7 @@ public Optional<String> getColorCode(String colorName) {
             if(code >= 0) {
                 return Optional.of("" + code);
             }
-            Color color = Color.web(colorName);
+            Color color = ColorFactory.web(colorName);
             return Optional.of(ansiColorMode.getAnsiColorCode(color));
         } catch (Exception e) {
             // the error will be logged below

text-io/src/main/java/org/beryx/textio/jline/JLineTextTerminalProvider.java

@@ -25,7 +25,6 @@ public class JLineTextTerminalProvider implements TextTerminalProvider {
     public JLineTextTerminal getTextTerminal() {
         if(System.console() == null) return null;
         try {
-            getClass().getClassLoader().loadClass("javafx.scene.paint.Color");
             ConsoleReader reader = new ConsoleReader();
             return new JLineTextTerminal(reader);
         } catch (Exception e) {

text-io/src/main/java/org/beryx/textio/swing/SwingTextTerminal.java

@@ -15,6 +15,7 @@
  */
 package org.beryx.textio.swing;
 
+import org.beryx.awt.color.ColorFactory;
 import org.beryx.textio.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -704,8 +705,7 @@ protected void updateScrollPaneSize(boolean pack) {
     public static Optional<Color> getColor(String colorName) {
         if(colorName == null || colorName.isEmpty()) return Optional.empty();
         try {
-            javafx.scene.paint.Color fxColor = javafx.scene.paint.Color.web(colorName);
-            return Optional.of(new Color((float)fxColor.getRed(), (float)fxColor.getGreen(), (float)fxColor.getBlue(), (float)fxColor.getOpacity()));
+            return Optional.of(ColorFactory.web(colorName));
         } catch (Exception e) {
             logger.warn("Invalid color: {}", colorName);
             return Optional.empty();

text-io/src/main/java/org/beryx/textio/swing/SwingTextTerminalProvider.java

@@ -26,7 +26,6 @@ public class SwingTextTerminalProvider implements TextTerminalProvider {
     public SwingTextTerminal getTextTerminal() {
         if (isHeadless()) return null;
         try {
-            getClass().getClassLoader().loadClass("javafx.scene.paint.Color");
             return new SwingTextTerminal();
         } catch(Exception e) {
             return null;