From 8ed89c8a9dbb2b085ec171d34990dd1745864d1e Mon Sep 17 00:00:00 2001
From: aNNiMON <annimon119@gmail.com>
Date: Mon, 28 Aug 2023 15:55:04 +0300
Subject: [PATCH] Fix canvasfx module with Java FX 17

---
 modules/canvasfx/build.gradle                 | 23 +++++++++++++++++++
 .../ownlang/modules/canvasfx/canvasfx.java    | 10 ++++----
 ownlang-desktop/build.gradle                  |  1 +
 settings.gradle                               |  4 +++-
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 modules/canvasfx/build.gradle
 rename modules/{main => canvasfx}/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java (99%)

diff --git a/modules/canvasfx/build.gradle b/modules/canvasfx/build.gradle
new file mode 100644
index 0000000..827791a
--- /dev/null
+++ b/modules/canvasfx/build.gradle
@@ -0,0 +1,23 @@
+plugins {
+    id 'java-library'
+    id 'org.openjfx.javafxplugin' version '0.0.14'
+}
+
+group = 'com.annimon.module'
+version = '2.0-SNAPSHOT'
+
+javafx {
+    version = "17"
+    modules = [ 'javafx.controls', 'javafx.swing' ]
+}
+
+dependencies {
+    api project(":ownlang-core")
+
+    testImplementation platform("org.junit:junit-bom:${versions.junit}")
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+}
+
+test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/modules/main/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java b/modules/canvasfx/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java
similarity index 99%
rename from modules/main/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java
rename to modules/canvasfx/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java
index 6c57041..e156802 100644
--- a/modules/main/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java
+++ b/modules/canvasfx/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java
@@ -1,6 +1,6 @@
 package com.annimon.ownlang.modules.canvasfx;
 
-/*import com.annimon.ownlang.exceptions.TypeException;
+import com.annimon.ownlang.exceptions.TypeException;
 import com.annimon.ownlang.lib.*;
 import com.annimon.ownlang.modules.Module;
 import static com.annimon.ownlang.lib.Converters.*;
@@ -37,15 +37,15 @@ import javafx.scene.shape.FillRule;
 import javafx.scene.shape.StrokeLineCap;
 import javafx.scene.shape.StrokeLineJoin;
 import javafx.scene.text.TextAlignment;
-import javax.swing.JFrame;*/
+import javax.swing.JFrame;
 
 /**
  *
  * @author aNNiMON
  */
-public final class canvasfx /*implements Module*/ {
+public final class canvasfx implements Module {
     
-    /*private static final int FX_EFFECT_TYPE = 5301;
+    private static final int FX_EFFECT_TYPE = 5301;
     private static final int FX_COLOR_TYPE = 5302;
     
     private static JFrame frame;
@@ -1112,6 +1112,6 @@ public final class canvasfx /*implements Module*/ {
         map.set("isConsumed", NumberValue.fromBoolean(e.isConsumed()));
         map.set("isDropCompleted", NumberValue.fromBoolean(e.isDropCompleted()));
         handler.execute(map);
-    }*/
+    }
     
 }
diff --git a/ownlang-desktop/build.gradle b/ownlang-desktop/build.gradle
index ae54add..d13ebda 100644
--- a/ownlang-desktop/build.gradle
+++ b/ownlang-desktop/build.gradle
@@ -17,6 +17,7 @@ dependencies {
     implementation project(":ownlang-parser")
     implementation project(":ownlang-utils")
     implementation project(":modules:main")
+    implementation project(":modules:canvasfx")
 
     testImplementation platform("org.junit:junit-bom:${versions.junit}")
     testImplementation 'org.junit.jupiter:junit-jupiter'
diff --git a/settings.gradle b/settings.gradle
index bd2b452..28d1286 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,4 +6,6 @@ include 'ownlang-desktop'
 include 'ownlang-utils'
 
 include 'modules:main'
-findProject(':modules:main')?.name = 'main'
\ No newline at end of file
+findProject(':modules:main')?.name = 'main'
+include 'modules:canvasfx'
+findProject(':modules:canvasfx')?.name = 'canvasfx'
\ No newline at end of file