Merge remote-tracking branch 'origin/master' into stable

Author: jpsacha

.travis.yml

@@ -2,9 +2,8 @@ sudo: false
 
 language: scala
 scala:
-- 2.10.7
-- 2.11.12
-- 2.12.6
+#- 2.11.12
+- 2.12.7
 
 before_install:
   - "export DISPLAY=:99.0"

ReadMe.md

@@ -112,7 +112,7 @@ It will also change the cursor in the root pane to busy.
 When task is done, the cursor will be changed back to default and root pane will enabled back.
 
 ```scala
-new BusyWorker("Simple Task", parentWindow).doTask {
+new BusyWorker("Simple Task", parentWindow).doTask { () =>
   Thread.sleep(1000)
   print(1 + 1)
 }

build.sbt

@@ -8,12 +8,13 @@ import java.net.URL
 // JAR_BUILT_BY      - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
 //
 
-val projectVersion = "0.2.1"
+val projectVersion = "0.2.2-SNAPSHOT"
 val versionTagDir  = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v" + projectVersion
-val scalaVersions  = Seq("2.11.12", "2.12.7")
+val _scalaVersions = Seq("2.12.7")
+val _scalaVersion = _scalaVersions.head
 
-crossScalaVersions := scalaVersions
-scalaVersion       := crossScalaVersions { versions => versions.head }.value
+crossScalaVersions := _scalaVersions
+scalaVersion := _scalaVersion
 
 lazy val OSName = System.getProperty("os.name") match {
   case n if n.startsWith("Linux")   => "linux"
@@ -31,23 +32,21 @@ lazy val scalaFXExtras = (project in file("scalafx-extras")).settings(
   scalaFXExtrasSettings,
   name        := "scalafx-extras",
   description := "The ScalaFX Extras",
-  fork in run := true,
   scalacOptions in(Compile, doc) ++= Seq(
     "-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]
-  }) ++ (if(scalaVersion.value.startsWith("2.11")) Seq("-Xexperimental") else Seq.empty[String])
+  }) ++ (if (_scalaVersion.startsWith("2.11")) Seq("-Xexperimental") else Seq.empty[String])
 )
 
 // ScalaFX Extras Demos project
 lazy val scalaFXExtrasDemos = (project in file("scalafx-extras-demos")).settings(
   scalaFXExtrasSettings,
   name        := "scalafx-extras-demos",
   description := "The ScalaFX Extras demonstrations",
-  fork in run := true,
   javaOptions ++= Seq(
     "-Xmx512M",
     "-Djavafx.verbose"
@@ -69,16 +68,17 @@ resolvers += Resolver.sonatypeRepo("snapshots")
 lazy val scalaFXExtrasSettings = Seq(
   organization       := "org.scalafx",
   version            := projectVersion,
-  crossScalaVersions := scalaVersions,
-  scalaVersion       := crossScalaVersions { versions => versions.head }.value,
+  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}/",
   scalacOptions in(Compile, doc) ++= Seq("-doc-footer", s"ScalaFX Extras API v.$projectVersion"),
   javacOptions ++= Seq(
-    "-target", "1.8",
-    "-source", "1.8",
+    //    "-target", "1.8",
+    //    "-source", "1.8",
     "-Xlint:deprecation"),
   libraryDependencies ++= Seq(
     "com.beachape"   %% "enumeratum"          % "1.5.13",
@@ -90,6 +90,7 @@ lazy val scalaFXExtrasSettings = Seq(
   autoAPIMappings := true,
   manifestSetting,
   publishSetting,
+  fork in run := true,
   fork in Test := true,
   parallelExecution in Test := false,
   resolvers += Resolver.sonatypeRepo("snapshots"),

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

@@ -86,14 +86,14 @@ object BusyWorkerDemo extends JFXApp {
         maxWidth = Double.MaxValue
       },
       new Button("Task with simple progress indicator") {
-        onAction = () => busyWorker.doTask("Task 2") {
+        onAction = () => busyWorker.doTask("Task 2") { () =>
           println("Task 2")
           Thread.sleep(3000)
         }
         maxWidth = Double.MaxValue
       },
       new Button("Task failing with exception (on 7)") {
-        onAction = () => busyWorker.doTask("Task 1")(
+        onAction = () => busyWorker.doTask("Task 3")(
           new SimpleTask[String] {
             override def call(): String = {
               val maxItems = 10
@@ -120,6 +120,15 @@ object BusyWorkerDemo extends JFXApp {
           }
         )
         maxWidth = Double.MaxValue
+      },
+      new Button("Print execution thread") {
+        onAction = () => busyWorker.doTask("Task 4") { () =>
+          println("1: Thread '" + Thread.currentThread().getName + "'")
+          println("2: Thread '" + Thread.currentThread().getName + "'")
+          println("3: Thread '" + Thread.currentThread().getName + "'")
+          println("4: Thread '" + Thread.currentThread().getName + "'")
+        }
+        maxWidth = Double.MaxValue
       }
     ).map(_.delegate)
   }

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

@@ -43,11 +43,6 @@ import scala.runtime.NonLocalReturnControl
 
 object BusyWorker {
 
-  //noinspection ConvertExpressionToSAM
-  implicit def apply[R](op: => R): SimpleTask[R] = new SimpleTask[R] {
-    def call(): R = op
-  }
-
   implicit def apply(nodes: Seq[Node]): Seq[jfxs.Node] = nodes.map(_.delegate)
 
   /**
@@ -252,7 +247,7 @@ class BusyWorker private(val title: String,
     *
     * Example of running a task without waiting to complete, using a lambda
     * {{{
-    *   worker.doTask{
+    *   worker.doTask{ () =>
     *      // Some workload code, does not produce value ot it is discard
     *      Thread.sleep(1000)
     *      print(1 + 1)
@@ -262,7 +257,7 @@ class BusyWorker private(val title: String,
     * Example of stating a task (with a lambda) and waiting till it finishes and returns a result
     * {{{
     *   // This code will return before workload is completed
-    *   val future = worker.doTask{
+    *   val future = worker.doTask{ () =>
     *      // Some workload code producing final value
     *      Thread.sleep(1000)
     *      1 + 1
@@ -294,7 +289,7 @@ class BusyWorker private(val title: String,
     * @param task actions to perform, can be provided a as a lambda op: => R, see examples above.
     * @return `Future` that can be used to retrieve result produced the workload, if any.
     */
-  def doTask[R](implicit task: SimpleTask[R]): Future[R] = {
+  def doTask[R](task: SimpleTask[R]): Future[R] = {
     doTask(title)(task)
   }
 
@@ -305,7 +300,7 @@ class BusyWorker private(val title: String,
     *
     * Example of running a task without waiting to complete, using a lambda
     * {{{
-    *   worker.doTask("My Task") {
+    *   worker.doTask("My Task") { () =>
     *      // Some workload code, does not produce value ot it is discard
     *      Thread.sleep(1000)
     *      print(1 + 1)
@@ -315,7 +310,7 @@ class BusyWorker private(val title: String,
     * Example of stating a task (with a lambda) and waiting till it finishes and returns a result
     * {{{
     *   // This code will return before workload is completed
-    *   val future = worker.doTask("My Task") {
+    *   val future = worker.doTask("My Task") { () =>
     *      // Some workload code producing final value
     *      Thread.sleep(1000)
     *      1 + 1
@@ -348,7 +343,7 @@ class BusyWorker private(val title: String,
     * @param task actions to perform, can be provided a as a lambda op: => R, see examples above.
     * @return `Future` that can be used to retrieve result produced the workload, if any.
     */
-  def doTask[R](name: String)(implicit task: SimpleTask[R]): Future[R] = {
+  def doTask[R](name: String)(task: SimpleTask[R]): Future[R] = {
     val jfxTask = new javafx.concurrent.Task[R] {
       override def call(): R = {
         task.call()