cross-compiles Scala 2.11, 2.12, 2.13.0-M5.

- introduce SetWrapper and MapWrapper, similar to @som-snytt 's shims
  (seems we can't do without)
- clean up code
- add scala.swing.Seq alias (as in @som-snytt 's version)
- TODO: ListView#selection.items is still `???`

Author: Sciss

README.md

@@ -5,12 +5,12 @@
 [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-swing_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-swing_2.12)
 [![Stories in Ready](https://badge.waffle.io/scala/scala-swing.svg?label=ready&title=Ready)](http://waffle.io/scala/scala-swing)
 
-This is now community maintained by @benhutchison & @Sciss. If you're interested in helping then contact them or @adriaanm.
+This is now community maintained by @benhutchison & @Sciss. If you are interested in helping then contact them or @adriaanm.
 
 This is a UI library that will wrap most of Java Swing for Scala in a straightforward manner. 
 The widget class hierarchy loosely resembles that of Java Swing. The main differences are:
 
-- In Java Swing all components are containers per default. This doesn't make much sense for
+- In Java Swing all components are containers per default. This does not make much sense for
   a number of components, like TextField, CheckBox, RadioButton, and so on. Our guess is that 
   this architecture was chosen because Java lacks multiple inheritance. 
   In scala-swing, components that can have child components extend the Container trait.
@@ -43,21 +43,21 @@ $ sbt examples/run
 Multiple main classes detected, select one to run:
 
  [1] scala.swing.examples.ButtonApp
- [2] scala.swing.examples.Dialogs
- [3] scala.swing.examples.ComboBoxes
- [4] scala.swing.examples.CelsiusConverter2
- [5] scala.swing.examples.ListViewDemo
- [6] scala.swing.examples.HelloWorld
- [7] scala.swing.examples.LabelTest
- [8] scala.swing.examples.PopupDemo
- [9] scala.swing.examples.ColorChooserDemo
- [10] scala.swing.examples.LinePainting
- [11] scala.swing.examples.GridBagDemo
- [12] scala.swing.examples.UIDemo
- [13] scala.swing.examples.TableSelection
- [14] scala.swing.examples.CelsiusConverter
- [15] scala.swing.examples.SwingApp
- [16] scala.swing.examples.CountButton
+ [2] scala.swing.examples.CelsiusConverter
+ [3] scala.swing.examples.CelsiusConverter2
+ [4] scala.swing.examples.ColorChooserDemo
+ [5] scala.swing.examples.ComboBoxes
+ [6] scala.swing.examples.CountButton
+ [7] scala.swing.examples.Dialogs
+ [8] scala.swing.examples.GridBagDemo
+ [9] scala.swing.examples.HelloWorld
+ [10] scala.swing.examples.LabelTest
+ [11] scala.swing.examples.LinePainting
+ [12] scala.swing.examples.ListViewDemo
+ [13] scala.swing.examples.PopupDemo
+ [14] scala.swing.examples.SwingApp
+ [15] scala.swing.examples.TableSelection
+ [16] scala.swing.examples.UIDemo
 
 Enter number:
 ```
@@ -70,7 +70,7 @@ Enter number:
   - When using Scala 2.11, you can use the Scala swing 2.0.x releases on JDK 6 or newer.
   - Scala 2.12 requires you to use JDK 8 (that has nothing to do with scala-swing).
 
-The reason to have two versions is to allow for binary incompatible changes. Also, some java-swing classes were generified in JDK 7 (see [SI-3634](https://issues.scala-lang.org/browse/SI-3634)) and require the scala-swing soruces to be adjusted.
+The reason to have two versions is to allow for binary incompatible changes. Also, some java-swing classes were generified in JDK 7 (see [SI-3634](https://issues.scala-lang.org/browse/SI-3634)) and require the scala-swing sources to be adjusted.
 
 
 ## API documentation (Scaladoc)

build.sbt

@@ -6,17 +6,17 @@ name               := "scala-swing"
 
 version            := "2.1.0-SNAPSHOT"
 
-scalacOptions      ++= Seq("-deprecation", "-feature")
+scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")
 
 // Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
 scalaVersionsByJvm in ThisBuild := Map(
-   8 -> List("2.11.12", "2.12.6", "2.13.0-M5").map(_ -> true),
-   9 -> List("2.11.12", "2.12.6", "2.13.0-M5").map(_ -> false),
-  10 -> List("2.11.12", "2.12.6", "2.13.0-M5").map(_ -> false),
-  11 -> List("2.11.12", "2.12.6", "2.13.0-M5").map(_ -> false)
+   8 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> true),
+   9 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
+  10 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
+  11 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false)
 )
 
-scalaVersion in ThisBuild := "2.12.8"  // for testing
+scalaVersion in ThisBuild := "2.13.0-M5"  // for testing
 
 OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
 

examples/src/main/scala/scala/swing/examples/ButtonApp.scala

@@ -12,7 +12,7 @@ import scala.swing._
 import scala.swing.event._
 
 object ButtonApp extends SimpleSwingApplication {
-  def top = new MainFrame {
+  def top: Frame = new MainFrame {
     title = "My Frame"
     contents = new GridPanel(2, 2) {
       hGap = 3
@@ -27,4 +27,3 @@ object ButtonApp extends SimpleSwingApplication {
     size = new Dimension(300, 80)
   }
 }
-

examples/src/main/scala/scala/swing/examples/CelsiusConverter.scala

@@ -15,7 +15,7 @@ import scala.swing.event._
  * A GUI app to convert celsius to centigrade
  */
 object CelsiusConverter extends SimpleSwingApplication {
-  def top = new MainFrame {
+  def top: Frame = new MainFrame {
     title = "Convert Celsius to Fahrenheit"
     val tempCelsius = new TextField
     val celsiusLabel = new Label {
@@ -42,7 +42,7 @@ object CelsiusConverter extends SimpleSwingApplication {
       }
     }
     contents = new GridPanel(2, 2) {
-      contents.append(tempCelsius, celsiusLabel, convertButton, fahrenheitLabel)
+      contents ++= Seq(tempCelsius, celsiusLabel, convertButton, fahrenheitLabel)
       border = Swing.EmptyBorder(10, 10, 10, 10)
     }
     //defaultButton = Some(convertButton)

examples/src/main/scala/scala/swing/examples/CelsiusConverter2.scala

@@ -12,14 +12,14 @@ import scala.swing._
 import scala.swing.event._
 
 object CelsiusConverter2 extends SimpleSwingApplication {
-  def newField = new TextField {
+  def newField: TextField = new TextField {
     text = "0"
     columns = 5
     horizontalAlignment = Alignment.Right
   }
 
-  val celsius = newField
-  val fahrenheit = newField
+  val celsius     = newField
+  val fahrenheit  = newField
 
   listenTo(fahrenheit, celsius)
   reactions += {
@@ -38,7 +38,7 @@ object CelsiusConverter2 extends SimpleSwingApplication {
     border = Swing.EmptyBorder(15, 10, 10, 10)
   }
 
-  def top = new MainFrame {
+  def top: Frame = new MainFrame {
     title = "Convert Celsius / Fahrenheit"
     contents = ui
   }

examples/src/main/scala/scala/swing/examples/ColorChooserDemo.scala

@@ -9,10 +9,11 @@
 package scala.swing.examples
 
 import java.awt.{Color, Font}
+
+import scala.swing.BorderPanel._
+import scala.swing.Swing._
 import scala.swing._
 import scala.swing.event._
-import scala.swing.Swing._
-import scala.swing.BorderPanel._
 
 /**
  * Demo for ColorChooser.
@@ -21,23 +22,23 @@ import scala.swing.BorderPanel._
  * @author andy@hicks.net
  */
 object ColorChooserDemo extends SimpleSwingApplication {
-  def top = new MainFrame {
+  def top: Frame = new MainFrame {
     title = "ColorChooser Demo"
     size = new Dimension(400, 400)
 
     contents = ui
   }
 
-  val banner = new Label("Welcome to Scala Swing") {
+  val banner: Label = new Label("Welcome to Scala Swing") {
     horizontalAlignment = Alignment.Center
     foreground = Color.yellow
     background = Color.blue
     opaque = true
     font = new Font("SansSerif", Font.BOLD, 24)
   }
 
-  def ui = new BorderPanel {
-    val colorChooser = new ColorChooser {
+  def ui: BorderPanel = new BorderPanel {
+    val colorChooser: ColorChooser = new ColorChooser {
       reactions += {
         case ColorChanged(_, c) =>
           banner.foreground = c
@@ -46,13 +47,13 @@ object ColorChooserDemo extends SimpleSwingApplication {
 
     colorChooser.border = TitledBorder(EtchedBorder, "Choose Text Color")
 
-    val bannerArea = new BorderPanel {
+    val bannerArea: BorderPanel = new BorderPanel {
       layout(banner) = Position.Center
       border = TitledBorder(EtchedBorder, "Banner")
     }
 
     // Display a color selection dialog when button pressed 
-    val selectColor = new Button("Choose Background Color") {
+    val selectColor: Button = new Button("Choose Background Color") {
       reactions += {
         case ButtonClicked(_) =>
           ColorChooser.showDialog(this, "Test", Color.red) match {
@@ -62,8 +63,8 @@ object ColorChooserDemo extends SimpleSwingApplication {
       }
     }
 
-    layout(bannerArea) = Position.North
-    layout(colorChooser) = Position.Center
-    layout(selectColor) = Position.South
+    layout(bannerArea)    = Position.North
+    layout(colorChooser)  = Position.Center
+    layout(selectColor)   = Position.South
   }
 }

examples/src/main/scala/scala/swing/examples/ComboBoxes.scala

@@ -8,13 +8,15 @@
 
 package scala.swing.examples
 
-import scala.swing._
-import scala.swing.event._
-import java.util.Date
 import java.awt.Color
 import java.text.SimpleDateFormat
+import java.util.Date
+
 import javax.swing.{Icon, ImageIcon}
 
+import scala.swing._
+import scala.swing.event._
+
 /**
  * Demonstrates how to use combo boxes and custom item renderers.
  *
@@ -24,7 +26,7 @@ object ComboBoxes extends SimpleSwingApplication {
 
   import ComboBox._
 
-  lazy val ui = new FlowPanel {
+  lazy val ui: FlowPanel = new FlowPanel {
     contents += new ComboBox(List(1, 2, 3, 4))
 
     val patterns = List(
@@ -100,10 +102,9 @@ object ComboBoxes extends SimpleSwingApplication {
     contents += iconBox
   }
 
-  def top = new MainFrame {
+  def top: Frame = new MainFrame {
     title = "ComboBoxes Demo"
     contents = ui
   }
-
 }
 

examples/src/main/scala/scala/swing/examples/CountButton.scala

@@ -12,7 +12,7 @@ import scala.swing._
 import scala.swing.event._
 
 object CountButton extends SimpleSwingApplication {
-  def top = new MainFrame {
+  def top: Frame = new MainFrame {
     title = "My Frame"
     contents = new GridPanel(2, 2) {
       hGap = 3
@@ -27,11 +27,11 @@ object CountButton extends SimpleSwingApplication {
       contents += label
 
       listenTo(button)
-      var nclicks = 0
+      var nClicks = 0
       reactions += {
-        case ButtonClicked(b) =>
-          nclicks += 1
-          label.text = "Number of button clicks: " + nclicks
+        case ButtonClicked(_) =>
+          nClicks += 1
+          label.text = "Number of button clicks: " + nClicks
       }
     }
   }

examples/src/main/scala/scala/swing/examples/Dialogs.scala

@@ -56,10 +56,10 @@ object Dialogs extends SimpleSwingApplication {
       import BorderPanel._
 
       val mutex = new ButtonGroup
-      val ok = new RadioButton("OK (in the L&F's words)")
-      val ynlf = new RadioButton("Yes/No (in the L&F's words)")
-      val ynp = new RadioButton("Yes/No (in the programmer's words)")
-      val yncp = new RadioButton("Yes/No/Cancel (in the programmer's words)")
+      val ok    = new RadioButton("OK (in the L&F's words)")
+      val ynlf  = new RadioButton("Yes/No (in the L&F's words)")
+      val ynp   = new RadioButton("Yes/No (in the programmer's words)")
+      val yncp  = new RadioButton("Yes/No/Cancel (in the programmer's words)")
       val radios = List(ok, ynlf, ynp, yncp)
       mutex.buttons ++= radios
       mutex.select(ok)
@@ -76,10 +76,10 @@ object Dialogs extends SimpleSwingApplication {
             label.text = showConfirmation(buttons,
               "Would you like green eggs and ham?",
               "An Inane Question") match {
-              case Result.Yes => "Ewww!"
-              case Result.No => "Me neither!"
-              case _ => "Come on -- tell me!"
-            }
+                case Result.Yes => "Ewww!"
+                case Result.No  => "Me neither!"
+                case _          => "Come on -- tell me!"
+              }
           case `ynp` =>
             val options = List("Yes, please",
               "No, thanks",
@@ -89,10 +89,10 @@ object Dialogs extends SimpleSwingApplication {
               "A Silly Question",
               entries = options,
               initial = 2) match {
-              case Result.Yes => "You're kidding!"
-              case Result.No => "I don't like them, either."
-              case _ => "Come on -- 'fess up!"
-            }
+                case Result.Yes => "You're kidding!"
+                case Result.No  => "I don't like them, either."
+                case _          => "Come on -- 'fess up!"
+              }
           case `yncp` =>
             val options = List("Yes, please",
               "No, thanks",
@@ -102,24 +102,24 @@ object Dialogs extends SimpleSwingApplication {
               title = "A Silly Question",
               entries = options,
               initial = 2) match {
-              case Result.Yes => "Here you go: green eggs and ham!"
-              case Result.No => "OK, just the ham, then."
-              case Result.Cancel => "Well, I'm certainly not going to eat them!"
-              case _ => "Please tell me what you want!"
-            }
+                case Result.Yes     => "Here you go: green eggs and ham!"
+                case Result.No      => "OK, just the ham, then."
+                case Result.Cancel  => "Well, I'm certainly not going to eat them!"
+                case _              => "Please tell me what you want!"
+              }
         }
       })) = Position.South
     })
     pages += new Page("More Dialogs", new BorderPanel {
 
       import BorderPanel._
 
-      val mutex = new ButtonGroup
-      val pick = new RadioButton("Pick one of several choices")
-      val enter = new RadioButton("Enter some text")
-      val custom = new RadioButton("Custom")
+      val mutex       = new ButtonGroup
+      val pick        = new RadioButton("Pick one of several choices")
+      val enter       = new RadioButton("Enter some text")
+      val custom      = new RadioButton("Custom")
       val customUndec = new RadioButton("Custom undecorated")
-      val custom2 = new RadioButton("2 custom dialogs")
+      val custom2     = new RadioButton("2 custom dialogs")
       val radios = List(pick, enter, custom, customUndec, custom2)
       mutex.buttons ++= radios
       mutex.select(pick)
@@ -140,7 +140,7 @@ object Dialogs extends SimpleSwingApplication {
               possibilities, "ham")
 
             //If a string was returned, say so.
-            label.text = if ((s != None) && (s.get.length > 0))
+            label.text = if (s.isDefined && (s.get.length > 0))
               "Green eggs and... " + s.get + "!"
             else
               "Come on, finish the sentence!"
@@ -153,7 +153,7 @@ object Dialogs extends SimpleSwingApplication {
               Nil, "ham")
 
             //If a string was returned, say so.
-            label.text = if ((s != None) && (s.get.length > 0))
+            label.text = if (s.isDefined && (s.get.length > 0))
               "Green eggs and... " + s.get + "!"
             else
               "Come on, finish the sentence!"
@@ -191,7 +191,7 @@ object Dialogs extends SimpleSwingApplication {
   }
 
 
-  lazy val top = new MainFrame {
+  lazy val top: Frame = new MainFrame {
     title = "Dialog Demo"
     contents = ui
   }