Merge branch 'master' into stable

Author: jpsacha

build.sbt

@@ -11,13 +11,17 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
 // JAR_BUILT_BY      - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
 //
 
-val projectVersion = "0.3.1"
-val versionTagDir  = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v" + projectVersion
+val projectVersion = "0.3.2.1-SNAPSHOT"
+val versionTagDir  = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
 val _scalaVersions = Seq("2.13.0", "2.12.9")
-val _scalaVersion = _scalaVersions.head
+val _scalaVersion  = _scalaVersions.head
 
-crossScalaVersions := _scalaVersions
-scalaVersion := _scalaVersion
+version             := projectVersion
+crossScalaVersions  := _scalaVersions
+scalaVersion        := _scalaVersion
+publishArtifact     := false
+skip in publish     := true
+sonatypeProfileName := "org.scalafx"
 
 lazy val OSName = System.getProperty("os.name") match {
   case n if n.startsWith("Linux")   => "linux"
@@ -28,7 +32,7 @@ lazy val OSName = System.getProperty("os.name") match {
 
 lazy val JavaFXModuleNames = Seq("base", "controls", "fxml", "graphics", "media", "swing", "web")
 lazy val JavaFXModuleLibs: Seq[ModuleID] =
-  JavaFXModuleNames.map(m => "org.openjfx" % s"javafx-$m" % "12.0.2" classifier OSName)
+  JavaFXModuleNames.map(m => "org.openjfx" % s"javafx-$m" % "12.0.2" % "provided" classifier OSName)
 
 def isScala2_13plus(scalaVersion: String): Boolean = {
   CrossVersion.partialVersion(scalaVersion) match {
@@ -46,10 +50,12 @@ lazy val scalaFXExtras = (project in file("scalafx-extras")).settings(
     "-sourcepath", baseDirectory.value.toString,
     "-doc-root-content", baseDirectory.value + "/src/main/scala/root-doc.creole",
     "-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)
-    case None => Seq.empty[String]
-  })
+  ),
+  scalacOptions in(Compile, doc) ++= (
+    Option(System.getenv("GRAPHVIZ_DOT_PATH")) match {
+      case Some(path) => Seq("-diagrams", "-diagrams-dot-path", path)
+      case None => Seq.empty[String]
+    })
 )
 
 // ScalaFX Extras Demos project
@@ -81,7 +87,6 @@ lazy val scalaFXExtrasSettings = Seq(
   crossScalaVersions := _scalaVersions,
   scalaVersion := _scalaVersion,
   scalacOptions ++= Seq("-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8", "-feature"),
-  scalacOptions in(Compile, doc) ++= (if (_scalaVersion.startsWith("2.11")) Seq("-Xexperimental") else Seq.empty[String]),
   scalacOptions in(Compile, doc) ++= Opts.doc.title("ScalaFX Extras API"),
   scalacOptions in(Compile, doc) ++= Opts.doc.version(projectVersion),
   scalacOptions in(Compile, doc) += s"-doc-external-doc:${scalaInstance.value.libraryJar}#http://www.scala-lang.org/api/${scalaVersion.value}/",

notes/0.3.2.md

@@ -0,0 +1,16 @@
+### ScalaFX-Extras Release v.0.3.2
+
+Enhancements:
+
+* [Issue #5][5] Do not include JavaFX as transitive dependency
+* [Issue #6][6] SimpleTask - add more flexibility in handling tasks states
+
+
+To post questions please use [ScalaFX Users Group][scalafx-users] of [StackOverflow ScalaFX][scalafx-overflow]  
+
+[scalafx-users]: https://groups.google.com/forum/#!forum/scalafx-users
+[scalafx-overflow]: https://stackoverflow.com/questions/tagged/scalafx
+
+[5]: https://github.com/scalafx/scalafx-extras/issues/5
+[6]: https://github.com/scalafx/scalafx-extras/issues/6
+

scalafx-extras/src/main/scala/org/scalafx/extras/BusyWorker.scala

@@ -46,13 +46,47 @@ object BusyWorker {
   implicit def apply(nodes: Seq[Node]): Seq[jfxs.Node] = nodes.map(_.delegate)
 
   /**
-    * A simple wrapper for a task that mas a status message property and a progress property.
+    * A simple wrapper for a task that has a status message property and a progress property.
     * Intended for use with [[org.scalafx.extras.BusyWorker#doTask(java.lang.String, org.scalafx.extras.BusyWorker.SimpleTask) BusyWorker#doTask]] method
     *
     * @tparam R returned value type.
     */
   trait SimpleTask[R] {
 
+
+    /**
+      * Method called whenever the state of the Task has transitioned to the SCHEDULED state.
+      * This method is invoked on the FX Application Thread after any listeners of the state property and after the
+      * Task has been fully transitioned to the new state.
+      */
+    def onScheduled(): Unit = {}
+
+    /**
+      * Method called whenever the state of the Task has transitioned to the RUNNING state.
+      * This method is invoked on the FX Application Thread after any listeners of the state property and after the
+      * Task has been fully transitioned to the new state.
+      */
+    def onRunning(): Unit = {}
+
+    /**
+      * called whenever the state of the Task has transitioned to the SUCCEEDED state. This method is invoked on the FX Application Thread after any listeners of the state property and after the Task has been fully transitioned to the new state.
+      */
+    def onSucceeded(): Unit = {}
+
+    /**
+      * Method called whenever the state of the Task has transitioned to the CANCELLED state.
+      * This method is invoked on the FX Application Thread after any listeners of the state property and after the
+      * Task has been fully transitioned to the new state.
+      */
+    def onCancelled(): Unit = {}
+
+    /**
+      * Method called whenever the state of the Task has transitioned to the FAILED state.
+      * This method is invoked on the FX Application Thread after any listeners of the state property and after the
+      * Task has been fully transitioned to the new state.
+      */
+    def onFailed(): Unit = {}
+
     /**
       * Message that can be updated while task is executed.
       */
@@ -199,6 +233,7 @@ class BusyWorker private(val title: String,
     this(title, _parentWindow = None, _disabledNodes = disabledNodes)
 
   def disabledNodes: Seq[jfxs.Node] = _disabledNodes
+
   def disabledNodes_=(implicit v: Seq[jfxs.Node]): Unit = _disabledNodes = v
 
   override def parentWindow: Option[Window] = _parentWindow match {
@@ -218,6 +253,7 @@ class BusyWorker private(val title: String,
   def parentWindow_=(v: Option[Window]): Unit = {
     _parentWindow = v
   }
+
   def parentWindow_=(v: Window): Unit = {
     _parentWindow = Option(v)
   }
@@ -345,12 +381,21 @@ class BusyWorker private(val title: String,
     */
   def doTask[R](name: String)(task: SimpleTask[R]): Future[R] = {
     val jfxTask = new javafx.concurrent.Task[R] {
-      override def call(): R = {
-        task.call()
-      }
+      override def call(): R = task.call()
+
+      override def scheduled(): Unit = task.onScheduled()
+
+      override def running(): Unit = task.onRunning()
+
+      override def succeeded(): Unit = task.onSucceeded()
+
+      override def cancelled(): Unit = task.onCancelled()
+
+      override def failed(): Unit = task.onFailed()
 
       task.message.onChange((_, _, newValue) => updateMessage(newValue))
       task.progress.onChange((_, _, newValue) => updateProgress(newValue.doubleValue(), 1.0))
+
     }
     _doTask(jfxTask, task.onFinish, name)
   }