Update JavaFX version in canvasfx module

aNNiMON · Oct 9, 2024 · 7166478 · 7166478
1 parent e263de5
commit 7166478
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/docs/docs/en/changelog.md b/docs/docs/en/changelog.md
@@ -14,6 +14,7 @@
 
 ### Modules
 - [okhttp] Added `okhttp.newClient()` and `HttpClientBuilderValue`.
+- [canvasfx] Updated JavaFX version.
 
 
 ## 2.0.0

diff --git a/docs/docs/ru/changelog.md b/docs/docs/ru/changelog.md
@@ -13,7 +13,8 @@
 - Исправлен visitor и проверки линтера внутри функций.
 
 ### Modules
-- [okhttp] Добавлен `okhttp.newClient()` и `HttpClientBuilderValue`
+- [okhttp] Добавлен `okhttp.newClient()` и `HttpClientBuilderValue`.
+- [canvasfx] Обновлена версия JavaFX.
 
 
 ## 2.0.0

diff --git a/modules/canvasfx/build.gradle b/modules/canvasfx/build.gradle
@@ -5,10 +5,10 @@ plugins {
 }
 
 group = 'com.annimon.module'
-version = '1.0.0'
+version = '1.1.0'
 
 javafx {
-    version = "17"
+    version = "21"
     modules = [ 'javafx.controls', 'javafx.swing' ]
 }
 

diff --git a/modules/canvasfx/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java b/modules/canvasfx/src/main/java/com/annimon/ownlang/modules/canvasfx/canvasfx.java
@@ -1019,12 +1019,12 @@ public Value execute(Value[] args) {
     }
 
     private static void handleEvent(Event event, final Function handler) {
-        if (event instanceof MouseEvent) {
-            handleMouseEvent((MouseEvent) event, handler);
-        } else if (event instanceof KeyEvent) {
-            handleKeyEvent((KeyEvent) event, handler);
-        } else if (event instanceof DragEvent) {
-            handleDragEvent((DragEvent) event, handler);
+        if (event instanceof MouseEvent me) {
+            handleMouseEvent(me, handler);
+        } else if (event instanceof KeyEvent ke) {
+            handleKeyEvent(ke, handler);
+        } else if (event instanceof DragEvent de) {
+            handleDragEvent(de, handler);
         }
     }