Merge branch 'develop'

Author: jpsacha

build.sbt

@@ -2,15 +2,15 @@
 
 name := "ScalaFX Ensemble"
 
-version := "1.11.0"
+version := "1.12.0"
 
 organization := "org.scalafx"
 
-scalaVersion := "2.12.7"
+scalaVersion := "2.13.0"
 
 libraryDependencies ++= Seq(
-  "org.scalafx" %% "scalafx" % "11-R16",
-  "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
+  "org.scalafx" %% "scalafx" % "12.0.2-R18",
+  "org.scala-lang.modules" %% "scala-xml" % "1.2.0"
 )
 
 // Add OS specific JavaFX dependencies
@@ -21,7 +21,7 @@ val osName = System.getProperty("os.name") match {
   case n if n.startsWith("Windows") => "win"
   case _ => throw new Exception("Unknown platform!")
 }
-libraryDependencies ++= javafxModules.map(m => "org.openjfx" % s"javafx-$m" % "11" classifier osName)
+libraryDependencies ++= javafxModules.map(m => "org.openjfx" % s"javafx-$m" % "12.0.2" classifier osName)
 
 resolvers += Opts.resolver.sonatypeSnapshots
 

project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=1.2.4
+sbt.version=1.3.0
 

project/plugins.sbt

@@ -2,8 +2,8 @@ scalacOptions ++= Seq("-unchecked", "-deprecation")
 
 // assembly plugin to package and run the app
 // [https://github.com/sbt/sbt-assembly]
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
 
 // Plugin to create native installers
-addSbtPlugin("com.typesafe.sbt" %% "sbt-native-packager" % "1.3.10")
+addSbtPlugin("com.typesafe.sbt" %% "sbt-native-packager" % "1.4.1")
 

src/main/scala/scalafx/ensemble/EnsembleTree.scala

@@ -60,7 +60,7 @@ object EnsembleTree {
       }
       dirName -> leaves.toList.sortWith(SortUtils.treeItemSort)
     }
-    TreeMap(pairs: _*)
+    TreeMap(pairs.toIndexedSeq: _*)
   }
 
   private def loadExampleNames(): Array[(String, Array[String])] = {
@@ -107,7 +107,7 @@ object EnsembleTree {
       }
       dirName.capitalize -> thumbs.toList.sortWith(SortUtils.thumbNailsSort)
     }
-    TreeMap(pairs: _*)
+    TreeMap(pairs.toIndexedSeq: _*)
   }
 }
 

src/main/scala/scalafx/ensemble/example/charts/EnsembleAdvCandleStickChart.scala

@@ -40,8 +40,9 @@ import scalafx.scene.control.{Label, Tooltip}
 import scalafx.scene.layout.{GridPane, Region}
 import scalafx.scene.shape.{Line, LineTo, MoveTo, Path}
 
-import scala.collection.JavaConverters._
 import scala.collection.mutable
+import scala.jdk.CollectionConverters._
+import scala.language.postfixOps
 
 
 /**
@@ -147,13 +148,13 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
 
     def title: String = getTitle
 
-    def title_=(t: String) {
+    def title_=(t: String): Unit = {
       setTitle(t)
     }
 
     def data: ObservableBuffer[jfxsc.XYChart.Series[Number, Number]] = getData
 
-    def data_=(d: ObservableBuffer[jfxsc.XYChart.Series[Number, Number]]) {
+    def data_=(d: ObservableBuffer[jfxsc.XYChart.Series[Number, Number]]): Unit = {
       setData(d)
     }
 
@@ -162,7 +163,7 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
     def yAxis = getYAxis
 
     /** Called to update and layout the content for the plot */
-    override protected def layoutPlotChildren() {
+    override protected def layoutPlotChildren(): Unit = {
       if (data == null) {
         return
       }
@@ -211,10 +212,10 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
       }
     }
 
-    override protected def dataItemChanged(item: jfxsc.XYChart.Data[Number, Number]) {}
+    override protected def dataItemChanged(item: jfxsc.XYChart.Data[Number, Number]): Unit = {}
 
     override protected def dataItemAdded(series: jfxsc.XYChart.Series[Number, Number],
-                                         itemIndex: Int, item: jfxsc.XYChart.Data[Number, Number]) {
+                                         itemIndex: Int, item: jfxsc.XYChart.Data[Number, Number]): Unit = {
       val candle = Candle(getData.indexOf(series), item, itemIndex)
       if (shouldAnimate) {
         candle.opacity = 0
@@ -230,7 +231,7 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
       }
     }
 
-    override protected def dataItemRemoved(item: jfxsc.XYChart.Data[Number, Number], series: jfxsc.XYChart.Series[Number, Number]) {
+    override protected def dataItemRemoved(item: jfxsc.XYChart.Data[Number, Number], series: jfxsc.XYChart.Series[Number, Number]): Unit = {
       val candle = item.node()
       if (shouldAnimate) {
         new FadeTransition(500 ms, candle) {
@@ -244,7 +245,7 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
       }
     }
 
-    override protected def seriesAdded(series: jfxsc.XYChart.Series[Number, Number], seriesIndex: Int) {
+    override protected def seriesAdded(series: jfxsc.XYChart.Series[Number, Number], seriesIndex: Int): Unit = {
       for (j <- 0 until series.data().size) {
         val item = series.data()(j)
         val candle = Candle(seriesIndex, item, j)
@@ -267,7 +268,7 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
       plotChildren += seriesPath
     }
 
-    override protected def seriesRemoved(series: jfxsc.XYChart.Series[Number, Number]) {
+    override protected def seriesRemoved(series: jfxsc.XYChart.Series[Number, Number]): Unit = {
       for (d <- series.getData) {
         val candle = d.node()
         if (shouldAnimate) {
@@ -288,7 +289,7 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
       * ranging then we compile a list of all data that the given axis has to plot and call invalidateRange() on the
       * axis passing it that data.
       */
-    override protected def updateAxisRange() {
+    override protected def updateAxisRange(): Unit = {
 
       if (xAxis.isAutoRanging) {
         val xData = for (series <- data; seriesData <- series.data()) yield seriesData.XValue()
@@ -352,13 +353,13 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
     tooltip.graphic = new TooltipContent()
     Tooltip.install(bar, tooltip)
 
-    def setSeriesAndDataStyleClasses(seriesStyleClass: String, dataStyleClass: String) {
+    def setSeriesAndDataStyleClasses(seriesStyleClass: String, dataStyleClass: String): Unit = {
       this.seriesStyleClass = seriesStyleClass
       this.dataStyleClass = dataStyleClass
       updateStyleClasses()
     }
 
-    def update(closeOffset: Double, highOffset: Double, lowOffset: Double, candleWidth: Double) {
+    def update(closeOffset: Double, highOffset: Double, lowOffset: Double, candleWidth: Double): Unit = {
       openAboveClose = closeOffset > 0
       updateStyleClasses()
       highLowLine.startY = highOffset
@@ -376,12 +377,12 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
       }
     }
 
-    def updateTooltip(open: Double, close: Double, high: Double, low: Double) {
+    def updateTooltip(open: Double, close: Double, high: Double, low: Double): Unit = {
       val tooltipContent: TooltipContent = tooltip.graphic().asInstanceOf[TooltipContent]
       tooltipContent.update(open, close, high, low)
     }
 
-    private def updateStyleClasses() {
+    private def updateStyleClasses(): Unit = {
       val closeVsOpen = if (openAboveClose) "open-above-close" else "close-above-open"
 
       styleClass = Seq("candlestick-candle", seriesStyleClass, dataStyleClass)
@@ -420,7 +421,7 @@ class EnsembleAdvCandleStickChart extends EnsembleExample {
     GridPane.setConstraints(lowValue, 1, 3)
     getChildren.addAll(open, openValue, close, closeValue, high, highValue, low, lowValue)
 
-    def update(open: Double, close: Double, high: Double, low: Double) {
+    def update(open: Double, close: Double, high: Double, low: Double): Unit = {
       openValue.text = open.toString
       closeValue.text = close.toString
       highValue.text = high.toString

src/main/scala/scalafx/ensemble/example/charts/EnsembleBarChart.scala

@@ -27,33 +27,32 @@
 
 package scalafx.ensemble.example.charts
 
+import javafx.scene.{chart => jfxsc}
 import scalafx.collections.ObservableBuffer
 import scalafx.ensemble.commons.EnsembleExample
-import scalafx.scene.chart.BarChart
-import scalafx.scene.chart.CategoryAxis
-import scalafx.scene.chart.NumberAxis
-import scalafx.scene.chart.XYChart
+import scalafx.scene.chart.{BarChart, CategoryAxis, NumberAxis, XYChart}
 
 /**
- * A chart that displays rectangular bars with heights indicating data values
- * for categories. Used for displaying information when at least one axis has
- * discontinuous or discrete data.
- *
- * @see scalafx.scene.chart.BarChart
- * @see scalafx.scene.chart.Chart
- * @see scalafx.scene.chart.Axis
- * @see scalafx.scene.chart.CategoryAxis
- * @see scalafx.scene.chart.NumberAxis
- *
- */
+  * A chart that displays rectangular bars with heights indicating data values
+  * for categories. Used for displaying information when at least one axis has
+  * discontinuous or discrete data.
+  *
+  * @see scalafx.scene.chart.BarChart
+  * @see scalafx.scene.chart.Chart
+  * @see scalafx.scene.chart.Axis
+  * @see scalafx.scene.chart.CategoryAxis
+  * @see scalafx.scene.chart.NumberAxis
+  *
+  */
 class EnsembleBarChart extends EnsembleExample {
   def getContent = {
     val years = ObservableBuffer("2007", "2008", "2009")
 
     val xAxis = CategoryAxis(years)
     val yAxis = NumberAxis("Units Sold", 0.0d, 3000.0d, 1000.0d)
 
-    def xyData(ys: Seq[Number]) = ObservableBuffer(years zip ys map (xy => XYChart.Data(xy._1, xy._2)))
+    def xyData(ys: Seq[Number]): ObservableBuffer[jfxsc.XYChart.Data[String, Number]] =
+      ObservableBuffer((years zip ys map (xy => XYChart.Data(xy._1, xy._2))).toSeq)
 
     val series1 = XYChart.Series("Apples", xyData(Seq(567d, 1292d, 1292d)))
     val series2 = XYChart.Series("Lemons", xyData(Seq(956, 1665, 2559)))

src/main/scala/scalafx/ensemble/example/controls/EnsembleTreeView.scala

@@ -27,7 +27,6 @@
 
 package scalafx.ensemble.example.controls
 
-import scalafx.collections.ObservableBuffer
 import scalafx.ensemble.commons.EnsembleExample
 import scalafx.geometry.Insets
 import scalafx.scene.control.{TreeItem, TreeView}
@@ -43,7 +42,7 @@ class EnsembleTreeView extends EnsembleExample {
       showRoot = true
       root = new TreeItem[String]("Root Node") {
         expanded = true
-        children = ObservableBuffer(
+        children = Seq(
           new TreeItem[String] {
             value = "Node 1"
           },
@@ -52,9 +51,7 @@ class EnsembleTreeView extends EnsembleExample {
           },
           new TreeItem[String] {
             value = "Node 3"
-            children = ObservableBuffer(
-              (4 to 12).map(n => new TreeItem[String]("Child Node " + n))
-            )
+            children = (4 to 12).map(n => new TreeItem[String]("Child Node " + n))
           }
         )
       }

src/main/scala/scalafx/ensemble/sbt/SBTProjectBuilder.scala

@@ -58,7 +58,7 @@ object SBTProjectBuilder {
     * @throws java.nio.file.FileAlreadyExistsException - if `projectDir` exists but is not a directory
     * @throws IOException                              - if an I/O error occurs
     */
-  def createSampleProject(projectDir: File, sampleInfo: ExampleInfo) {
+  def createSampleProject(projectDir: File, sampleInfo: ExampleInfo): Unit = {
 
     // extract project name
     val projectName = {
@@ -92,7 +92,7 @@ object SBTProjectBuilder {
   /** Copy text resource from the classpath relative to this object to a `projectDir`.
     * Line ending will be changed to platform specific.
     */
-  private def copyText(projectDir: File, fileName: String, filters: List[(String, String)] = Nil) {
+  private def copyText(projectDir: File, fileName: String, filters: List[(String, String)] = Nil): Unit = {
     /** Apply all filters in turn. */
     def filter(string: String, filters: List[(String, String)]): String = {
       filters match {
@@ -116,7 +116,7 @@ object SBTProjectBuilder {
   }
 
   /** Copy a resource that may be an image or other binary file. */
-  private def copyResource(projectDir: File, fileName: String) {
+  private def copyResource(projectDir: File, fileName: String): Unit = {
     try {
       val is = this.getClass.getResourceAsStream(fileName)
       val dest = new File(projectDir, fileName).toPath