Merge branch 'master' into release

Author: jpsacha

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.7.3
+version = 3.8.0
 
 runner.dialect = scala3
 fileOverride {

ReadMe.md

@@ -154,17 +154,14 @@ A complete example in Scala 3. Shows a pane with 2 directory selection fields an
 button is pressed values
 of the directory fields are printed
 
-[//]: # (@formatter:off)
-```scala
+```scala 3
+import org.scalafx.extras.generic_pane.GenericPane
 import scalafx.application.JFXApp3
 import scalafx.application.JFXApp3.PrimaryStage
 import scalafx.geometry.Insets
 import scalafx.scene.Scene
 import scalafx.scene.control.Button
 import scalafx.scene.layout.VBox
-import scalafx.scene.paint.*
-import scalafx.scene.paint.Color.*
-import scalafx.scene.text.Text
 
 object GenericPaneDemo extends JFXApp3:
 
@@ -189,7 +186,6 @@ object GenericPaneDemo extends JFXApp3:
                 println(s"Output dir: ${gp.nextString()}")
           )
 ```
-[//]: # (@formatter:off)
 
 ![GenericPane Demo](notes/assets/GenericPane.png)
 
@@ -292,12 +288,9 @@ new BusyWorker("Simple Task", parentWindow).doTask { () =>
 Here is a little more elaborated example. It updates a progress message and progress indicator.
 
 ```scala
-val buttonPane: Pane =
-...
-val progressLabel: Label =
-...
-val progressBar: ProgressBar =
-...
+val buttonPane: Pane = ???
+val progressLabel: Label = ???
+val progressBar: ProgressBar = ???
 
 val busyWorker = new BusyWorker("BusyWorker Demo", buttonPane) {
   progressLabel.text <== progressMessage

build.sbt

@@ -1,27 +1,35 @@
-import java.net.URL
+import xerial.sbt.Sonatype._
+
 import scala.xml.transform.{RewriteRule, RuleTransformer}
 import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
 
-// @formatter:off
-
 //
 // Environment variables used by the build:
 // GRAPHVIZ_DOT_PATH - Full path to Graphviz dot utility. If not defined Scaladocs will be build without diagrams.
 // JAR_BUILT_BY      - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
 //
 
-val projectVersion = "0.8.0"
+val projectVersion = "0.8.0.1-SNAPSHOT"
 val versionTagDir  = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
-val _scalaVersions = Seq("3.2.2", "2.13.10", "2.12.17")
+val _scalaVersions = Seq("3.3.3", "2.13.13", "2.12.19")
 val _scalaVersion  = _scalaVersions.head
 
-ThisBuild / version             := projectVersion
-ThisBuild / crossScalaVersions  := _scalaVersions
-ThisBuild / scalaVersion        := _scalaVersion
-ThisBuild / organization        := "org.scalafx"
+ThisBuild / version            := projectVersion
+ThisBuild / crossScalaVersions := _scalaVersions
+ThisBuild / scalaVersion       := _scalaVersion
+ThisBuild / organization       := "org.scalafx"
 
-publishArtifact     := false
-publish / skip      := true
+publishArtifact := false
+publish / skip  := true
+
+lazy val libEnumeratum     = "com.beachape"               %% "enumeratum"          % "1.7.3"
+lazy val libLogbackClassic = "ch.qos.logback"              % "logback-classic"     % "1.5.3"
+lazy val libParadise       = "org.scalamacros"             % "paradise"            % "2.1.1" cross CrossVersion.full
+lazy val libScalaLogging   = "com.typesafe.scala-logging" %% "scala-logging"       % "3.9.5"
+lazy val libScalaFX        = "org.scalafx"                %% "scalafx"             % "22.0.0-R33"
+lazy val libScalaFXML      = "org.scalafx"                %% "scalafxml-core-sfx8" % "0.5"
+lazy val libScalaTest      = "org.scalatest"              %% "scalatest"           % "3.2.18"
+lazy val libScalaReflect   = "org.scala-lang"              % "scala-reflect"
 
 def isScala2(scalaVersion: String): Boolean = {
   CrossVersion.partialVersion(scalaVersion) match {
@@ -63,7 +71,7 @@ lazy val scalaFXExtras = (project in file("scalafx-extras")).settings(
     baseDirectory.value.toString,
     "-doc-root-content",
     baseDirectory.value + "/src/main/scala/root-doc.creole"
-  ),
+  )
 )
 
 // ScalaFX Extras Demos project
@@ -77,8 +85,8 @@ lazy val scalaFXExtrasDemos = (project in file("scalafx-extras-demos")).settings
   ),
   publishArtifact := false,
   libraryDependencies ++= Seq(
-    "com.typesafe.scala-logging" %% "scala-logging"   % "3.9.5",
-    "ch.qos.logback"              % "logback-classic" % "1.4.7" % Runtime
+    libScalaLogging,
+    libLogbackClassic % Runtime
   )
 ).dependsOn(scalaFXExtras % "compile;test->test")
 
@@ -99,14 +107,15 @@ lazy val scalaFXExtrasSettings = Seq(
     "-encoding",
     "utf8",
     "-feature",
-    "-release", "8"
+    "-release",
+    "8"
   ) ++
     (
       if (isScala2(scalaVersion.value))
         Seq(
           "-explaintypes",
           "-Xcheckinit",
-          "-Xsource:3",
+          "-Xsource:3"
 //          "-Xlint",
 //          "-Xcheckinit",
 //          "-Xlint:missing-interpolator",
@@ -123,10 +132,11 @@ lazy val scalaFXExtrasSettings = Seq(
   Compile / doc / scalacOptions ++= Opts.doc.version(projectVersion),
   Compile / doc / scalacOptions ++= Seq("-doc-footer", s"ScalaFX Extras API v.$projectVersion"),
   Compile / doc / scalacOptions ++= (
-    if(isScala2(scalaVersion.value))
+    if (isScala2(scalaVersion.value))
       Seq(
         s"-doc-external-doc:${scalaInstance.value.libraryJars.head}#https://www.scala-lang.org/api/${scalaVersion.value}/",
-        "-doc-source-url", "https://github.com/SscalaFX-Extras/scalafx-extras/blob/" + versionTagDir + "/scalafx/€{FILE_PATH}.scala"
+        "-doc-source-url",
+        "https://github.com/SscalaFX-Extras/scalafx-extras/blob/" + versionTagDir + "/scalafx/€{FILE_PATH}.scala"
       ) ++ (
         Option(System.getenv("GRAPHVIZ_DOT_PATH")) match {
           case Some(path) => Seq("-diagrams", "-diagrams-dot-path", path)
@@ -141,40 +151,39 @@ lazy val scalaFXExtrasSettings = Seq(
   // If using Scala 2.12 or lower, enable macro processing through compiler plugin
   libraryDependencies ++= (
     if (isScala2_12(scalaVersion.value))
-      Seq(compilerPlugin(
-        "org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full
-      ))
+      Seq(compilerPlugin(libParadise))
     else
       Seq.empty[sbt.ModuleID]
   ),
   libraryDependencies ++= Seq(
-    "org.scalafx"   %% "scalafx"   % "20.0.0-R31",
-    "org.scalatest" %% "scalatest" % "3.2.15" % "test"
+    libScalaFX,
+    libScalaTest % "test"
   ),
   libraryDependencies ++= (
     if (isScala2(scalaVersion.value))
       Seq(
-        "com.beachape"  %% "enumeratum"          % "1.7.2",
-        "org.scala-lang" % "scala-reflect"       % scalaVersion.value,
-        "org.scalafx"   %% "scalafxml-core-sfx8" % "0.5"
+        libEnumeratum,
+        libScalaReflect % scalaVersion.value,
+        libScalaFXML
       )
     else
       Seq.empty[sbt.ModuleID]
   ),
   // Use `pomPostProcess` to remove dependencies marked as "provided" from publishing in POM
   // This is to avoid dependency on wrong OS version JavaFX libraries
   // See also [https://stackoverflow.com/questions/27835740/sbt-exclude-certain-dependency-only-during-publish]
-  pomPostProcess := { node: XmlNode =>
-    new RuleTransformer(new RewriteRule {
-      override def transform(node: XmlNode): XmlNodeSeq = node match {
-        case e: Elem if e.label == "dependency" && e.child.exists(c => c.label == "scope" && c.text == "provided") =>
-          val organization = e.child.filter(_.label == "groupId").flatMap(_.text).mkString
-          val artifact     = e.child.filter(_.label == "artifactId").flatMap(_.text).mkString
-          val version      = e.child.filter(_.label == "version").flatMap(_.text).mkString
-          Comment(s"provided dependency $organization#$artifact;$version has been omitted")
-        case _ => node
-      }
-    }).transform(node).head
+  pomPostProcess := {
+    node: XmlNode =>
+      new RuleTransformer(new RewriteRule {
+        override def transform(node: XmlNode): XmlNodeSeq = node match {
+          case e: Elem if e.label == "dependency" && e.child.exists(c => c.label == "scope" && c.text == "provided") =>
+            val organization = e.child.filter(_.label == "groupId").flatMap(_.text).mkString
+            val artifact     = e.child.filter(_.label == "artifactId").flatMap(_.text).mkString
+            val version      = e.child.filter(_.label == "version").flatMap(_.text).mkString
+            Comment(s"provided dependency $organization#$artifact;$version has been omitted")
+          case _ => node
+        }
+      }).transform(node).head
   },
   autoAPIMappings := true,
   manifestSetting,
@@ -204,14 +213,12 @@ lazy val manifestSetting = packageOptions += {
   )
 }
 
-import xerial.sbt.Sonatype.*
-
 // Metadata needed by Maven Central
 // See also http://maven.apache.org/pom.html#Developers
 lazy val mavenCentralSettings = Seq(
-  homepage               := Some(new URL("https://www.scalafx.org/")),
-  startYear              := Some(2016),
-  licenses               := Seq(("BSD", new URL("https://github.com/scalafx/scalafx-extras/blob/master/LICENSE.txt"))),
+  homepage  := Some(new URI("https://www.scalafx.org/").toURL),
+  startYear := Some(2016),
+  licenses  := Seq(("BSD", new URI("https://github.com/scalafx/scalafx-extras/blob/master/LICENSE.txt").toURL)),
   sonatypeProfileName    := "org.scalafx",
   sonatypeProjectHosting := Some(GitHubHosting("org.scalafx", "scalafx-extras", "[email protected]")),
   publishMavenStyle      := true,

notes/0.9.0.md

@@ -0,0 +1,34 @@
+## ScalaFX-Extras Release v.0.9.0
+
+This release of [ScalaFX-Extras]  is mostly a bug fix release. Some small tweak to `BusyWorker` was required to resolve
+the issue with double error dialogs.
+
+### New features
+
+* Add helper method for finding parent windows for nodes [[#29]]
+
+### Bug fixes
+
+* FileSelectionField - editing text field is difficult - cursor jumps to the end after each keystroke [[#27]]
+* Error handling implemented in `SimpleTask` is disabled in `BusyWorker#_doTask` [[#28]]
+
+### Breaking Changes
+
+* `org.scalafx.extras.BusyWorker.SimpleTask` API changed to respect overrides
+  of `onSucceeded`, `onCancelled`, `onFailed` that were ignored. Issue [[#28]].
+
+To post questions, please use [Project Discussions][Discussions] or [ScalaFX Users Group][scalafx-users]
+
+[ScalaFX-Extras]: https://github.com/scalafx/scalafx-extras
+
+[Discussions]: https://github.com/scalafx/scalafx-extras/discussions
+
+[scalafx-users]: https://groups.google.com/forum/#!forum/scalafx-users
+
+
+[#27]: https://github.com/scalafx/scalafx-extras/issues/27
+
+[#28]: https://github.com/scalafx/scalafx-extras/issues/28
+
+[#29]: https://github.com/scalafx/scalafx-extras/issues/29
+

project/build.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011-2023, ScalaFX Project
+# Copyright (c) 2011-2024, ScalaFX Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -24,5 +24,5 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-sbt.version=1.8.2
+sbt.version=1.9.9
 

project/sbt-sonatype.sbt

@@ -1,3 +1,3 @@
 // [https://github.com/xerial/sbt-sonatype]
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
 addSbtPlugin("com.github.sbt" % "sbt-pgp"      % "2.2.1")

scalafx-extras-demos/src/main/scala/org/scalafx/extras/BusyWorkerDemo.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2021, ScalaFX Project
+ * Copyright (c) 2011-2024, ScalaFX Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -139,7 +139,7 @@ object BusyWorkerDemo extends JFXApp3 {
       ).map(_.delegate)
     }
 
-    lazy val busyWorker: BusyWorker = new BusyWorker("BusyWorker Demo", buttonPane) {
+    lazy val busyWorker: BusyWorker = new BusyWorker(title = "BusyWorker Demo", disabledNode = buttonPane) {
       progressLabel.text <== progressMessage
       progressBar.progress <== progressValue
     }