clean up; bump to 2.1.0-SNAPSHOT

- add explicit return types (e.g. Proxy's self now is Any)
- fully qualify imports, avoid wildcard imports
- remove dummy class Matrix

Author: Sciss

build.sbt

@@ -4,30 +4,32 @@ scalaModuleSettings
 
 name               := "scala-swing"
 
-version            := "2.0.4-SNAPSHOT"
+version            := "2.1.0-SNAPSHOT"
 
 scalacOptions      ++= Seq("-deprecation", "-feature")
 
 // Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
 scalaVersionsByJvm in ThisBuild := Map(
-   8 -> List("2.11.12", "2.12.6", "2.13.0-M3").map(_ -> true),
-   9 -> List("2.11.12", "2.12.6", "2.13.0-M3").map(_ -> false),
-  10 -> List("2.11.12", "2.12.6", "2.13.0-M3").map(_ -> false),
-  11 -> List("2.11.12", "2.12.6", "2.13.0-M3").map(_ -> false)
+   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)
 )
 
+scalaVersion in ThisBuild := "2.12.8"  // for testing
+
 OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
 
-mimaPreviousVersion := Some("2.0.0")
+mimaPreviousVersion := None // Some("2.0.0")
 
 // set the prompt (for this build) to include the project id.
 shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project + "> " }
 
 lazy val swing = project.in(file("."))
   .settings(
     libraryDependencies += {
-      val v = if (scalaVersion.value == "2.13.0-M3") "3.0.5-M1" else "3.0.5"
-      "org.scalatest" %% "scalatest" % v % "test"
+      val v = if (scalaVersion.value == "2.13.0-M5") "3.0.6-SNAP5" else "3.0.5"
+      "org.scalatest" %% "scalatest" % v % Test
     }
   )
 

src/main/scala/scala/swing/AbstractButton.scala

@@ -10,8 +10,9 @@
 
 package scala.swing
 
-import event._
-import javax.swing.{AbstractButton => JAbstractButton, Icon}
+import javax.swing.{Icon, AbstractButton => JAbstractButton}
+
+import scala.swing.event.{ButtonClicked, Key}
 
 /**
  * Base class of all button-like widgets, such as push buttons,

src/main/scala/scala/swing/Action.scala

@@ -10,9 +10,10 @@
 
 package scala.swing
 
-import javax.swing.{KeyStroke, Icon}
 import java.awt.event.ActionListener
 
+import javax.swing.{Icon, KeyStroke}
+
 object Action {
   /**
    * Special action that has an empty title and all default properties and does nothing.
@@ -29,7 +30,7 @@ object Action {
         def addActionListener(a: ActionListener): Unit
         def removeActionListener(a: ActionListener): Unit
         def setAction(a: javax.swing.Action): Unit
-        def getAction(): javax.swing.Action
+        def getAction(): javax.swing.Action // note: must keep empty parentheses for Java compatibility
       }
 
       // TODO: we need an action cache

src/main/scala/scala/swing/BoxPanel.scala

@@ -17,7 +17,7 @@ package scala.swing
  * @see javax.swing.BoxLayout
  */
 class BoxPanel(orientation: Orientation.Value) extends Panel with SequentialContainer.Wrapper {
-  override lazy val peer = {
+  override lazy val peer: javax.swing.JPanel = {
     val p = new javax.swing.JPanel with SuperMixin
     val l = new javax.swing.BoxLayout(p, orientation.id)
     p.setLayout(l)

src/main/scala/scala/swing/Button.scala

@@ -8,10 +8,10 @@
 
 package scala.swing
 
-import javax.swing._
+import javax.swing.JButton
 
 object Button {
-  def apply(text0: String)(op: => Unit) = new Button(Action(text0)(op))
+  def apply(text0: String)(op: => Unit): Button = new Button(Action(text0)(op))
 }
 
 /**

src/main/scala/scala/swing/ButtonGroup.scala

@@ -25,7 +25,7 @@ class ButtonGroup(initialButtons: AbstractButton*) {
     def contains(b: AbstractButton): Boolean = this.iterator.contains(b)
     override def size: Int = peer.getButtonCount
     def iterator: Iterator[AbstractButton] = new Iterator[AbstractButton] {
-      val enum = peer.getElements
+      private val enum = peer.getElements
       def next: AbstractButton = UIElement.cachedWrapper[AbstractButton](enum.nextElement)
       def hasNext: Boolean = enum.hasMoreElements
     }

src/main/scala/scala/swing/CheckBox.scala

@@ -10,7 +10,7 @@
 
 package scala.swing
 
-import javax.swing._
+import javax.swing.JCheckBox
 
 /**
  * Two state button that can either be checked or unchecked.

src/main/scala/scala/swing/ComboBox.scala

@@ -9,9 +9,10 @@
 package scala.swing
 
 import java.awt.event.ActionListener
+
 import javax.swing.{AbstractListModel, ComboBoxModel, InputVerifier, JComboBox, JComponent, JTextField, ListCellRenderer}
 
-import scala.swing.event._
+import scala.swing.event.ActionEvent
 
 object ComboBox {
   /**
@@ -44,7 +45,7 @@ object ComboBox {
 
       def getEditorComponent: JComponent = Editor.this.component.peer
 
-      def getItem(): AnyRef = item.asInstanceOf[AnyRef]
+      def getItem: AnyRef = item.asInstanceOf[AnyRef]
 
       def selectAll(): Unit = startEditing()
 
@@ -84,7 +85,7 @@ object ComboBox {
 
       def getEditorComponent: JComponent = editor.getEditorComponent.asInstanceOf[JComponent]
       def selectAll(): Unit = editor.selectAll()
-      def getItem(): AnyRef = { verifier.verify(getEditorComponent); value.asInstanceOf[AnyRef] }
+      def getItem: AnyRef = { verifier.verify(getEditorComponent); value.asInstanceOf[AnyRef] }
       def setItem(a: Any): Unit = editor.setItem(a)
 
       val verifier: InputVerifier = new InputVerifier {

src/main/scala/scala/swing/Component.scala

@@ -8,8 +8,6 @@
 
 package scala.swing
 
-import event._
-
 import java.awt.Graphics
 import java.awt.event._
 import javax.swing.JComponent
@@ -42,7 +40,9 @@ object Component {
  */
 abstract class Component extends UIElement {
   override lazy val peer: javax.swing.JComponent = new javax.swing.JComponent with SuperMixin {}
-  var initP: JComponent = null
+
+  // TODO: what was this used for?
+  // var initP: JComponent = null
 
   /**
    * This trait is used to redirect certain calls from the peer to the wrapper
@@ -127,13 +127,13 @@ abstract class Component extends UIElement {
         def mouseEntered(e: java.awt.event.MouseEvent): Unit = ()
         def mouseExited(e: java.awt.event.MouseEvent): Unit = ()
         def mouseClicked(e: java.awt.event.MouseEvent): Unit =
-          publish(new MouseClicked(e))
+          publish(new event.MouseClicked(e))
 
         def mousePressed(e: java.awt.event.MouseEvent): Unit =
-          publish(new MousePressed(e))
+          publish(new event.MousePressed(e))
 
         def mouseReleased(e: java.awt.event.MouseEvent): Unit =
-          publish(new MouseReleased(e))
+          publish(new event.MouseReleased(e))
       }
 
       def onFirstSubscribe (): Unit = peer.addMouseListener(l)
@@ -145,10 +145,10 @@ abstract class Component extends UIElement {
     val moves: Publisher = new LazyPublisher {
       lazy val mouseListener: MouseListener = new MouseListener {
         def mouseEntered(e: java.awt.event.MouseEvent): Unit =
-          publish(new MouseEntered(e))
+          publish(new event.MouseEntered(e))
 
         def mouseExited(e: java.awt.event.MouseEvent): Unit =
-          publish(new MouseExited(e))
+          publish(new event.MouseExited(e))
 
         def mouseClicked (e: java.awt.event.MouseEvent): Unit = ()
         def mousePressed (e: java.awt.event.MouseEvent): Unit = ()
@@ -157,10 +157,10 @@ abstract class Component extends UIElement {
 
       lazy val mouseMotionListener: MouseMotionListener = new MouseMotionListener {
         def mouseMoved(e: java.awt.event.MouseEvent): Unit =
-          publish(new MouseMoved(e))
+          publish(new event.MouseMoved(e))
 
         def mouseDragged(e: java.awt.event.MouseEvent): Unit =
-          publish(new MouseDragged(e))
+          publish(new event.MouseDragged(e))
       }
       def onFirstSubscribe(): Unit = {
         peer.addMouseListener(mouseListener)
@@ -179,7 +179,7 @@ abstract class Component extends UIElement {
       // mouse wheel events if there is a listener installed. See ticket #1442.
       lazy val l: MouseWheelListener = new MouseWheelListener {
         def mouseWheelMoved(e: java.awt.event.MouseWheelEvent): Unit =
-          publish(new MouseWheelMoved(e))
+          publish(new event.MouseWheelMoved(e))
       }
       def onFirstSubscribe (): Unit = peer.addMouseWheelListener(l)
       def onLastUnsubscribe(): Unit = peer.removeMouseWheelListener(l)
@@ -188,9 +188,9 @@ abstract class Component extends UIElement {
 
   object keys extends Publisher {
     peer.addKeyListener(new KeyListener {
-      def keyPressed  (e: java.awt.event.KeyEvent): Unit = publish(new KeyPressed(e))
-      def keyReleased (e: java.awt.event.KeyEvent): Unit = publish(new KeyReleased(e))
-      def keyTyped    (e: java.awt.event.KeyEvent): Unit = publish(new KeyTyped(e))
+      def keyPressed  (e: java.awt.event.KeyEvent): Unit = publish(new event.KeyPressed (e))
+      def keyReleased (e: java.awt.event.KeyEvent): Unit = publish(new event.KeyReleased(e))
+      def keyTyped    (e: java.awt.event.KeyEvent): Unit = publish(new event.KeyTyped   (e))
     })
   }
 
@@ -205,16 +205,16 @@ abstract class Component extends UIElement {
     // TODO: deprecated, remove after 2.8
     peer.addComponentListener(new java.awt.event.ComponentListener {
       def componentHidden(e: java.awt.event.ComponentEvent): Unit =
-        publish(UIElementHidden(Component.this))
+        publish(event.UIElementHidden(Component.this))
 
       def componentShown(e: java.awt.event.ComponentEvent): Unit =
-        publish(UIElementShown(Component.this))
+        publish(event.UIElementShown(Component.this))
 
       def componentMoved(e: java.awt.event.ComponentEvent): Unit =
-        publish(UIElementMoved(Component.this))
+        publish(event.UIElementMoved(Component.this))
 
       def componentResized(e: java.awt.event.ComponentEvent): Unit =
-        publish(UIElementResized(Component.this))
+        publish(event.UIElementResized(Component.this))
     })
 
     peer.addFocusListener(new java.awt.event.FocusListener {
@@ -224,18 +224,18 @@ abstract class Component extends UIElement {
       }
 
       def focusGained(e: java.awt.event.FocusEvent): Unit =
-        publish(FocusGained(Component.this, other(e), e.isTemporary))
+        publish(event.FocusGained(Component.this, other(e), e.isTemporary))
 
       def focusLost(e: java.awt.event.FocusEvent): Unit =
-        publish(FocusLost(Component.this, other(e), e.isTemporary))
+        publish(event.FocusLost(Component.this, other(e), e.isTemporary))
     })
 
     peer.addPropertyChangeListener(new java.beans.PropertyChangeListener {
       def propertyChange(e: java.beans.PropertyChangeEvent): Unit =
         e.getPropertyName match {
-          case "font"       => publish(FontChanged      (Component.this))
-          case "background" => publish(BackgroundChanged(Component.this))
-          case "foreground" => publish(ForegroundChanged(Component.this))
+          case "font"       => publish(event.FontChanged      (Component.this))
+          case "background" => publish(event.BackgroundChanged(Component.this))
+          case "foreground" => publish(event.ForegroundChanged(Component.this))
           case _ =>
           /*case "focusable" =>
           case "focusTraversalKeysEnabled" =>

src/main/scala/scala/swing/Container.scala

@@ -10,7 +10,7 @@
 
 package scala.swing
 
-import scala.swing.event._
+import scala.swing.event.{ComponentAdded, ComponentRemoved}
 
 object Container {
   /**