Dotty 3.0.0-M1 support

.gitignore

@@ -30,3 +30,5 @@ scala-swing.iml
 .DS_Store
 
 target/
+/.bloop/
+/.bsp/

build.sbt

@@ -1,29 +1,40 @@
+lazy val scalaTestVersion = "3.2.3"
+
+lazy val commonSettings = Seq(
+  crossScalaVersions += "3.0.0-M1",
+  scalaVersion       := "2.13.3",
+  scalacOptions     ++= Seq("-deprecation", "-feature"),
+)
+
 lazy val swing = project.in(file("."))
   .settings(ScalaModulePlugin.scalaModuleSettings)
   .settings(ScalaModulePlugin.scalaModuleOsgiSettings)
+  .settings(commonSettings)
   .settings(
     name := "scala-swing",
     OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}"),
     scalaModuleMimaPreviousVersion := Some("2.1.0"),
     // set the prompt (for this build) to include the project id.
     ThisBuild / shellPrompt := { state => Project.extract(state).currentRef.project + "> " },
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest-flatspec" % "3.2.0" % Test,
-      "org.scalatest" %% "scalatest-shouldmatchers" % "3.2.0" % Test,
+      "org.scalatest" %% "scalatest-flatspec"       % scalaTestVersion % Test,
+      "org.scalatest" %% "scalatest-shouldmatchers" % scalaTestVersion % Test,
     ),
     // Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
     // and  a `src/main/scala-2.13-` source directory for Scala version older than 2.13
     Compile / unmanagedSourceDirectories += {
       val sourceDir = (Compile / sourceDirectory).value
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, n)) if n >= 13 => sourceDir / "scala-2.13+"
+        case Some((3, _))            => sourceDir / "scala-2.13+" // Dotty
         case _                       => sourceDir / "scala-2.13-"
       }
     }
   )
 
 lazy val examples = project.in(file("examples"))
   .dependsOn(swing)
+  .settings(commonSettings)
   .settings(
     scalaVersion := (swing / scalaVersion).value,
     run / fork := true,
@@ -32,6 +43,7 @@ lazy val examples = project.in(file("examples"))
 
 lazy val uitest = project.in(file("uitest"))
   .dependsOn(swing)
+  .settings(commonSettings)
   .settings(
     scalaVersion := (swing / scalaVersion).value,
     run / fork := true,

examples/src/main/scala/scala/swing/examples/LinePainting.scala

@@ -47,11 +47,11 @@ object LinePainting extends SimpleSwingApplication {
     var path = new geom.GeneralPath
 
     def lineTo(p: Point): Unit = {
-      path.lineTo(p.x, p.y); repaint()
+      path.lineTo(p.x.toFloat, p.y.toFloat); repaint()
     }
 
     def moveTo(p: Point): Unit = {
-      path.moveTo(p.x, p.y); repaint()
+      path.moveTo(p.x.toFloat, p.y.toFloat); repaint()
     }
 
     override def paintComponent(g: Graphics2D): Unit = {

examples/src/main/scala/scala/swing/examples/tutorials/components/ButtonHtmlDemo.scala

@@ -88,19 +88,19 @@ class ButtonHtmlDemo extends FlowPanel {
   listenTo(enable)
 
   reactions += {
-    case ButtonClicked(`enable`) => enableMiddle
-    case ButtonClicked(`disable`) => disableMiddle
+    case ButtonClicked(`enable`)  => enableMiddle()
+    case ButtonClicked(`disable`) => disableMiddle()
   }
 
   def enableMiddle(): Unit = {
-    enable.enabled = false
-    middle.enabled = true
-    disable.enabled = true
+    enable  .enabled = false
+    middle  .enabled = true
+    disable .enabled = true
   }
   def disableMiddle(): Unit = {
-    enable.enabled = true
-    middle.enabled = false
-    disable.enabled = false
+    enable  .enabled = true
+    middle  .enabled = false
+    disable .enabled = false
   }
   def createImageIcon(path: String): Option[javax.swing.ImageIcon] = {
     val imgURL: java.net.URL = getClass().getResource(path)

examples/src/main/scala/scala/swing/examples/tutorials/components/FrameDemo2.scala

@@ -28,15 +28,18 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package scala.swing.examples.tutorials.components
 
-import scala.swing._
-import scala.swing.event.ButtonClicked
-import javax.swing.{ Box, BoxLayout, JDialog, JFrame, ImageIcon, UIManager }
-import java.awt.{ BorderLayout, Color, Component, Dimension, Graphics, Image, Point, Toolkit }
 import java.awt.image.BufferedImage
+import java.awt.{Color, Dimension, Graphics, Image, Point, Toolkit}
 import java.net.URL
 
+import javax.swing.{ImageIcon, JDialog, JFrame, UIManager}
+
+import scala.swing._
+import scala.swing.event.ButtonClicked
+
 /*
  * Tutorial: How to Make Frames (Main Windows)
  * http://docs.oracle.com/javase/tutorial/uiswing/components/frame.html
@@ -49,75 +52,75 @@ import java.net.URL
  * setIconImage. It uses the file /scala/swing/examples/tutorials/images/FD.jpg.
  */
 class FrameDemo2 {
-  private var lastLocation: Point = null
-  private var defaultButton: Button = null
-  //  private val maxX = 500
-  //  private val maxY = 500
-  //constants for action commands
-  val NO_DECORATIONS = "no_dec";
-  val LF_DECORATIONS = "laf_dec";
-  val WS_DECORATIONS = "ws_dec";
-  val CREATE_WINDOW = "new_win";
-  val DEFAULT_ICON = "def_icon";
-  val FILE_ICON = "file_icon";
-  val PAINT_ICON = "paint_icon";
-
-  //true if the next frame created should have no window decorations
-  var noDecorations = false;
-
-  //true if the next frame created should have setIconImage called
-  var specifyIcon = false;
-
-  //true if the next frame created should have a custom painted icon
-  var createIcon = false;
-
-  val screenSize: Dimension = Toolkit.getDefaultToolkit().getScreenSize()
-  val maxX = screenSize.width - 50
-  val maxY = screenSize.height - 50
-
-  //Create a new MyFrame object and show it.
+  private var lastLocation  : Point   = null
+  private var defaultButton : Button  = null
+
+  // constants for action commands
+  val NO_DECORATIONS  = "no_dec"
+  val LF_DECORATIONS  = "laf_dec"
+  val WS_DECORATIONS  = "ws_dec"
+  val CREATE_WINDOW   = "new_win"
+  val DEFAULT_ICON    = "def_icon"
+  val FILE_ICON       = "file_icon"
+  val PAINT_ICON      = "paint_icon"
+
+  // true if the next frame created should have no window decorations
+  var noDecorations = false
+
+  // true if the next frame created should have setIconImage called
+  var specifyIcon = false
+
+  // true if the next frame created should have a custom painted icon
+  var createIcon = false
+
+  val screenSize: Dimension = Toolkit.getDefaultToolkit.getScreenSize
+
+  val maxX: Int = screenSize.width  - 50
+  val maxY: Int = screenSize.height - 50
+
+  // Creates a new MyFrame object and show it.
   def showNewWindow(): Unit = {
-    //Take care of the no window decorations case.
-    //NOTE: Unless you really need the functionality
-    //provided by JFrame, you would usually use a
-    //Window or JWindow instead of an undecorated JFrame.
+    // Take care of the no window decorations case.
+    // NOTE: Unless you really need the functionality
+    // provided by JFrame, you would usually use a
+    // Window or JWindow instead of an undecorated JFrame.
     val frame: Option[Frame] = if (noDecorations) Some(new MyFrameUndecorated()) else Some(new MyFrame())
-    //Set window location.
+    // Set window location.
     if (frame.isDefined) {
       val f = frame.get
       if (lastLocation != null) {
         //Move the window over and down 40 pixels.
-        lastLocation.translate(40, 40);
+        lastLocation.translate(40, 40)
         if ((lastLocation.x > maxX) || (lastLocation.y > maxY)) {
-          lastLocation.setLocation(0, 0);
+          lastLocation.setLocation(0, 0)
         }
         f.location = lastLocation
       } else {
         lastLocation = f.location
       }
 
-      //Calling setIconImage sets the icon displayed when the window
-      //is minimized.  Most window systems (or look and feels, if
-      //decorations are provided by the look and feel) also use this
-      //icon in the window decorations.
+      // Calling setIconImage sets the icon displayed when the window
+      // is minimized.  Most window systems (or look and feels, if
+      // decorations are provided by the look and feel) also use this
+      // icon in the window decorations.
       if (specifyIcon) {
         if (createIcon) {
-          //create an icon from scratch
+          // create an icon from scratch
           f.iconImage = FrameDemo2.createFDImage()
         } else {
-          //get the icon from a file
+          // get the icon from a file
           f.iconImage = FrameDemo2.getFDImage().get
         }
       }
     }
   }
 
-  // Create the window-creation controls that go in the main window.
+  // Creates the window-creation controls that go in the main window.
   def createOptionControls(frame: Frame): BoxPanel = {
-    val label1 = new Label("Decoration options for subsequently created frames:")
-    val bg1 = new ButtonGroup()
-    val label2 = new Label("Icon options:")
-    val bg2 = new ButtonGroup()
+    val label1  = new Label("Decoration options for subsequently created frames:")
+    val bg1     = new ButtonGroup()
+    val label2  = new Label("Icon options:")
+    val bg2     = new ButtonGroup()
 
     //Create the buttons
     val rb1 = new RadioButton() {
@@ -197,7 +200,7 @@ class FrameDemo2 {
     box
   }
 
-  //Create the button that goes in the main window.
+  // Creates the button that goes in the main window.
   def createButtonPane(frame: Frame): FlowPanel = {
     val button = new Button("New window")
     defaultButton = button
@@ -207,7 +210,7 @@ class FrameDemo2 {
       case ButtonClicked(`button`) => showNewWindow()
     }
 
-    //Center the button in a panel with some space around it.
+    // Center the button in a panel with some space around it.
     val pane = new FlowPanel() {
       border = Swing.EmptyBorder(5, 5, 5, 5)
       contents += button
@@ -220,12 +223,12 @@ class FrameDemo2 {
 class MyFrame extends Frame {
   title = "A window"
 
-  //This button lets you close even an undecorated window.
-  val button = new Button("Close window") {
+  // This button lets you close even an undecorated window.
+  val button: Button = new Button("Close window") {
     xLayoutAlignment = java.awt.Component.CENTER_ALIGNMENT
   }
 
-  //Place the button near the bottom of the window.
+  // Place the button near the bottom of the window.
   contents = new BoxPanel(Orientation.Vertical) {
     contents += Swing.VGlue
     contents += button
@@ -241,20 +244,19 @@ class MyFrame extends Frame {
   preferredSize = new Dimension(150, 150)
   pack()
   visible = true
-  override def closeOperation() = {
-    close
-  }
+
+  override def closeOperation(): Unit = close()
 }
 
 class MyFrameUndecorated extends Frame with RichWindow.Undecorated {
   visible = false
-    //This button lets you close even an undecorated window.
-  val button = new Button("Close window") {
+  // This button lets you close even an undecorated window.
+  val button: Button = new Button("Close window") {
     xLayoutAlignment = java.awt.Component.CENTER_ALIGNMENT
   }
 
-  //Place the button near the bottom of the window.
-  //Undecorated windows are not supported in scala swing.
+  // Place the button near the bottom of the window.
+  // Undecorated windows are not supported in scala swing.
   contents = new BoxPanel(Orientation.Vertical) {
     contents += Swing.VGlue
     contents += button
@@ -270,55 +272,54 @@ class MyFrameUndecorated extends Frame with RichWindow.Undecorated {
   preferredSize = new Dimension(150, 150)
   pack()
   visible = true
-  override def closeOperation() = {
-    close
-  }
+
+  override def closeOperation(): Unit = close()
 }
 
 object FrameDemo2 extends SimpleSwingApplication {
-  //Creates an icon-worthy Image from scratch.
+  // Creates an icon-worthy Image from scratch.
   def createFDImage(): Image = {
-    //Create a 16x16 pixel image.
+    // Create a 16x16 pixel image.
     val bi = new BufferedImage(16, 16, BufferedImage.TYPE_INT_RGB)
-    //Draw into it.
-    val g: Graphics = bi.getGraphics()
-    g.setColor(Color.BLACK);
+    // Draw into it.
+    val g: Graphics = bi.getGraphics
+    g.setColor(Color.BLACK)
     g.fillRect(0, 0, 15, 15)
     g.setColor(Color.RED)
     g.fillOval(5, 3, 6, 6)
 
-    //Clean up.
+    // Clean up.
     g.dispose()
 
-    //Return it.
+    // Return it.
     bi
   }
 
   // Returns an Image Option or None.
   def getFDImage(): Option[Image] = {
-    val imgURL: URL = getClass().getResource("/scala/swing/examples/tutorials/images/FD.jpg");
+    val imgURL: URL = getClass.getResource("/scala/swing/examples/tutorials/images/FD.jpg")
     if (imgURL != null) {
-      return Some(new ImageIcon(imgURL).getImage)
+      Some(new ImageIcon(imgURL).getImage)
     } else {
-      return None
+      None
     }
   }
 
-  lazy val top: Frame { val demo: FrameDemo2 } = new Frame() {
+  object top extends Frame {
     title = "FrameDemo2"
-    //Use the Java look and feel.  This needs to be done before the frame is created
-    //so the companion object FrameDemo2 cannot simply extend SimpleSwingApplcation.
+    // Use the Java look and feel.  This needs to be done before the frame is created
+    // so the companion object FrameDemo2 cannot simply extend SimpleSwingApplication.
     try {
       UIManager.setLookAndFeel(
-        UIManager.getCrossPlatformLookAndFeelClassName());
+        UIManager.getCrossPlatformLookAndFeelClassName)
     } catch {
-      case e: Exception => ;
+      case _: Exception => ()
     }
-    //Make sure we have nice window decorations.
-    JFrame.setDefaultLookAndFeelDecorated(true);
-    JDialog.setDefaultLookAndFeelDecorated(true);
-    //Create and set up the content pane.
-    val demo = new FrameDemo2();
+    // Make sure we have nice window decorations.
+    JFrame .setDefaultLookAndFeelDecorated(true)
+    JDialog.setDefaultLookAndFeelDecorated(true)
+    // Create and set up the content pane.
+    val demo = new FrameDemo2()
   }
   val bp: BorderPanel = new BorderPanel() {
       layout(top.demo.createOptionControls(top)) = BorderPanel.Position.Center