Updated SimpleFX and Scala version (#80)

* Updated SimpleFX and Scala version

* Refactor context management and remove old dependencies

* added workaround

Author: FlorianKirmaier

gradle.properties

@@ -3,9 +3,8 @@ JPRO_PLATFORM_VERSION = 0.6.0-SNAPSHOT
 JPRO_VERSION = 2025.3.1
 JAVAFX_BUILD_VERSION = 17.0.18
 JAVAFX_EXAMPLES_VERSION = 23.0.2
-SIMPLEFX_VERSION = 3.2.40
+SIMPLEFX_VERSION = 3.3.0
 JMEMORYBUDDY_VERSION = 0.5.6
-JNODES_VERSION = 0.8.3
 SCENIC_VIEW_VERSION = 11.0.3-SNAPSHOT-FORK
 
 JAVAFX_PLUGIN_VERSION = 0.1.0

jpro-routing/build.gradle

@@ -22,7 +22,6 @@ configure([project(':jpro-routing:core'), project(':jpro-routing:dev'), project(
 configure([project(':jpro-routing:core'), project(':jpro-routing:dev'), project(':jpro-routing:popup')]) {
     dependencies {
         api "one.jpro:jpro-webapi:$JPRO_VERSION"
-        api "SANDEC:jnodes:$JNODES_VERSION"
         api "one.jpro:jmemorybuddy:$JMEMORYBUDDY_VERSION"
         api "org.slf4j:slf4j-api:$SLF4J_API_VERSION"
     }
@@ -32,7 +31,8 @@ configure([project(':jpro-routing:core')]) {
     dependencies {
         api project(":jpro-utils")
         api project(":jpro-scenegraph")
-        api "SANDEC:simplefx_2.12:$SIMPLEFX_VERSION"
+        api "SANDEC:simplefx_2.13:$SIMPLEFX_VERSION"
+        api "org.scala-lang:scala-library:2.13.18"
     }
 
     publishing {

jpro-routing/core-test/src/test/scala/one/jpro/platform/routing/TestRouteApp.scala

@@ -2,9 +2,17 @@ package one.jpro.platform.routing
 
 import javafx.scene.layout.StackPane
 import javafx.stage.Stage
-import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.{BeforeAll, Test}
 import simplefx.core._
 
+import scala.concurrent.Await
+
+object TestRouteApp {
+    @BeforeAll
+    def setup(): Unit = {
+        Await.result(simplefx.cores.initializeCore(), (second))
+    }
+}
 class TestRouteApp {
 
     @Test

jpro-routing/core/src/main/java/module-info.java

@@ -2,7 +2,6 @@
     requires transitive javafx.controls;
     requires transitive org.slf4j;
 
-    requires transitive de.sandec.jnodes;
     requires transitive one.jpro.jmemorybuddy;
     requires transitive one.jpro.platform.utils;
     requires transitive jpro.webapi;
@@ -13,6 +12,7 @@
     requires transitive scala.library;
 
     exports one.jpro.platform.routing;
+    exports one.jpro.platform.routing.context;
     exports one.jpro.platform.routing.crawl;
     exports one.jpro.platform.routing.performance;
     exports one.jpro.platform.routing.filter.container;

jpro-routing/core/src/main/java/one/jpro/platform/routing/context/IgnoreMe.java

@@ -0,0 +1,3 @@
+package one.jpro.platform.routing.context;
+
+class IgnoreMe {}

jpro-routing/core/src/main/scala/one/jpro/platform/routing/RouteUtils.scala

@@ -1,6 +1,7 @@
 package one.jpro.platform.routing
 
 import one.jpro.platform.routing.filter.container.ContainerFactory
+import scala.language.postfixOps
 import simplefx.all
 import simplefx.all._
 import simplefx.core._

jpro-routing/core/src/main/scala/one/jpro/platform/routing/SessionManagerContext.scala

@@ -2,5 +2,5 @@ package one.jpro.platform.routing
 
 import one.jpro.platform.routing.sessionmanager.SessionManager
 
-object SessionManagerContext extends de.sandec.jnodes.context.ContextManager[SessionManager]
+object SessionManagerContext extends one.jpro.platform.routing.context.ContextManager[SessionManager]
 

jpro-routing/core/src/main/scala/one/jpro/platform/routing/context/ContextManager.scala

@@ -0,0 +1,41 @@
+package one.jpro.platform.routing.context
+
+import simplefx.core._
+import simplefx.all._
+import simplefx.util.Predef.extension
+import javafx.css.Styleable
+
+class ContextManager[A] {
+
+  @extension class ExtWithSession(x: Node) {
+    @Bind private[context] var context: A = null
+
+    private def printDebugInfo(): Unit = {
+      println(" - ")
+      println(s"getContext for node: $x")
+      println(s"getParent: ${x.getParent}")
+      println(s"getStyleableParent: ${x.getStyleableParent}")
+    }
+
+    private[context] def getContext: A = {
+      //printDebugInfo()
+      if(context != null) context
+      else getStyleableParentContext(x).getOrElse(throw new Exception("Couldn't find SessionManager!"))
+    }
+
+    private def getStyleableParentContext(styleable: Styleable): Option[A] = {
+      styleable.getStyleableParent match {
+        case null => None
+        case node: Node =>
+          val nodeContext = node.getContext
+          if(nodeContext != null) Some(nodeContext)
+          else getStyleableParentContext(node)
+        case _ => getStyleableParentContext(styleable.getStyleableParent)
+      }
+    }
+  }
+
+  def setContext(x: Node, y: A): Unit = x.context = y
+
+  def getContext(x: Node): A = x.getContext
+}

jpro-routing/dev/src/main/scala/one/jpro/platform/routing/dev/DevFilter.scala

@@ -8,6 +8,7 @@ import one.jpro.platform.routing.{Filter, LinkUtil, RouteUtils}
 import org.kordamp.ikonli.javafx.FontIcon
 import org.scenicview.ScenicView
 import org.slf4j.{Logger, LoggerFactory}
+import scala.language.postfixOps
 import simplefx.all._
 import simplefx.core._
 import simplefx.experimental._

jpro-routing/dev/src/main/scala/one/jpro/platform/routing/dev/StatisticsFilter.scala

@@ -7,6 +7,7 @@ import one.jpro.platform.routing.{Filter, LinkUtil, RouteUtils}
 import org.kordamp.ikonli.javafx.FontIcon
 import org.scenicview.ScenicView
 import org.slf4j.{Logger, LoggerFactory}
+import scala.language.postfixOps
 import simplefx.all._
 import simplefx.core._
 import simplefx.experimental._