allow showXXXDialogs to have a Dialog as a parent

Author: andy1138

src/main/scala/scala/swing/ColorChooser.scala

@@ -11,7 +11,8 @@
 package scala.swing
 
 import javax.swing.JColorChooser
-import event._
+import scala.swing.event._
+import scala.swing.Swing._
 
 /**
  * Wrapper for JColorChooser. Publishes  `ColorChanged` events, when the color selection changes.
@@ -21,7 +22,7 @@ import event._
  * @see javax.swing.JColorChooser
  */
 object ColorChooser {
-  def showDialog(parent: Component, title: String, color: Color): scala.Option[Color] = {
+  def showDialog(parent: PeerContainer, title: String, color: scala.swing.Color): scala.Option[Color] = {
     toOption[Color](javax.swing.JColorChooser.showDialog(parent.peer, title, color))
   }
 }

src/main/scala/scala/swing/FileChooser.scala

@@ -40,34 +40,34 @@ object FileChooser {
  * @see [[javax.swing.JFileChooser]]
  */
 class FileChooser(dir: File) {
-  import FileChooser._
+  import scala.swing.FileChooser._
   lazy val peer: JFileChooser = new JFileChooser(dir)
 
   def this() = this(null)
 
-  import Swing._
+  import scala.swing.Swing._
 
   /**
    * Display a dialog box to select a file.
    * @param over Parent container -  Component, Frame or Dialog
    * @return Status of how the dialog was closed.
    */
-  def showOpenDialog[T <: PeerContainer](over: T): Result.Value = Result(peer.showOpenDialog(nullPeer(over)))
+  def showOpenDialog(over: PeerContainer): Result.Value = Result(peer.showOpenDialog(nullPeer(over)))
 
   /**
    * Display a dialog box to select a file.
    * @param over Parent container -  Component, Frame or Dialog
    * @return Parent container -  Component, Frame or Dialog
    */
-  def showSaveDialog[T <: PeerContainer](over: T): Result.Value = Result(peer.showSaveDialog(nullPeer(over)))
+  def showSaveDialog(over: PeerContainer): Result.Value = Result(peer.showSaveDialog(nullPeer(over)))
 
   /**
    * Display a dialog box to select a file.
    * @param over Parent container -  Component, Frame or Dialog
    * @param approveText text for the 'ok' button
    * @return Parent container -  Component, Frame or Dialog
    */
-  def showDialog[T <: PeerContainer](over: T, approveText: String): Result.Value = Result(peer.showDialog(nullPeer(over), approveText))
+  def showDialog(over: PeerContainer, approveText: String): Result.Value = Result(peer.showDialog(nullPeer(over), approveText))
 
   def controlButtonsAreShown: Boolean = peer.getControlButtonsAreShown
   def controlButtonsAreShown_=(b: Boolean) { peer.setControlButtonsAreShown(b) }

src/main/scala/scala/swing/RichWindow.scala

@@ -126,7 +126,7 @@ object Dialog {
 
   private def uiString(txt: String) = UIManager.getString(txt)
 
-  def showConfirmation(parent: Component = null,
+  def showConfirmation(parent: PeerContainer = null,
                        message: Any,
                        title: String = uiString("OptionPane.titleText"),
                        optionType: Options.Value = Options.YesNo,
@@ -135,7 +135,7 @@ object Dialog {
     Result(JOptionPane.showConfirmDialog(nullPeer(parent), message, title,
       optionType.id, messageType.id, Swing.wrapIcon(icon)))
 
-  def showOptions(parent: Component = null,
+  def showOptions(parent: PeerContainer = null,
                   message: Any,
                   title: String = uiString("OptionPane.titleText"),
                   optionType: Options.Value = Options.YesNo,
@@ -149,7 +149,7 @@ object Dialog {
     Result(r)
   }
 
-  def showInput[A](parent: Component = null,
+  def showInput[A](parent: PeerContainer = null,
                    message: Any,
                    title: String = uiString("OptionPane.inputDialogTitle"),
                    messageType: Message.Value = Message.Question,
@@ -164,7 +164,7 @@ object Dialog {
 
     toOption[A](r)
   }
-  def showMessage(parent: Component = null,
+  def showMessage(parent: PeerContainer = null,
                   message: Any,
                   title: String = uiString("OptionPane.messageDialogTitle"),
                   messageType: Message.Value = Message.Info,

uitest/src/main/scala/scala/swing/uitest/SI7597.scala

@@ -9,63 +9,65 @@
 package scala.swing.uitest
 
 
-import scala.swing.FileChooser.Result
+
 import scala.swing.Swing._
 import scala.swing.event.ButtonClicked
 import scala.swing._
 
+
 /**
  * Test for issue SI-7597 https://issues.scala-lang.org/browse/SI-7597
+ * (expanded to include other showXXXDialog dialogs )
  */
 object SI7597 extends SimpleSwingApplication {
   def top = new MainFrame {
-    title = "SI7597 FileChooser test"
-
+    title = "SI7597 showXXXDialog tests"
+    size = new Dimension(900, 200)
 
     lazy val dialog = aDialog
 
-    val fileChooser = new FileChooser
-
+    val fileChooserDialog = new FileChooser
+    val colorChooser = new ColorChooser
 
-    contents = new FlowPanel {
+    contents = new BoxPanel(Orientation.Vertical) {
       contents ++= Seq(
-        fileChooserStyles[Component]("Component", this),
-        fileChooserStyles[Frame]("Frame", top),
-        fileChooserStyles[Dialog]("Dialog", dialog)
+        fileChooserStyles("Component", parent = this),
+        fileChooserStyles("Frame", parent = top),
+        fileChooserStyles("Dialog", parent = dialog)
       )
     }
 
-    size = new Dimension(400, 400)
+    def fileChooserStyles(rowTitle : String, parent : => PeerContainer) = new FlowPanel {
+      contents ++= Seq(new Label(s"Parent is $rowTitle"))
 
-
-    def fileChooserStyles[T <: PeerContainer](rowTitle: String, parent: => T) = new FlowPanel {
       contents ++= Seq(
-        new Label(s"Parent is $rowTitle"),
-        fileChooserButton("Open", fileChooser.showOpenDialog(parent)),
-        fileChooserButton("Save", fileChooser.showSaveDialog(parent)),
-        fileChooserButton("Text", fileChooser.showDialog(parent, "Text"))
+        simpleButton("Open", fileChooserDialog.showOpenDialog(parent)),
+        simpleButton("Save", fileChooserDialog.showSaveDialog(parent)),
+        simpleButton("Text", fileChooserDialog.showDialog(parent, "Text")),
+        simpleButton("Confirmation", Dialog.showConfirmation(parent, "Confirmation") ),
+        simpleButton("Input", Dialog.showInput(parent, "Input", initial = "Some text") ),
+        simpleButton("Message", Dialog.showMessage(parent, "Message" )),
+        simpleButton("Message", Dialog.showOptions(parent, "Message", entries = List("First", "Second", "Third"), initial=1 )),
+        simpleButton("Color", ColorChooser.showDialog(parent, "Color", java.awt.Color.RED))
       )
     }
 
-    def fileChooserButton(parentTitle: String, fileChooserStyle: => Result.Value): Button = new Button {
+    def simpleButton(parentTitle : String, dialogChooser : => Any): Button = new Button {
       text = parentTitle
       reactions += {
-        case ButtonClicked(_) =>
-          text = fileChooserStyle match {
-            case Result.Approve => s"$parentTitle: ${fileChooser.selectedFile.toString}"
-            case _ => parentTitle
+        case _ : ButtonClicked =>
+          dialogChooser match {
+            case action => println(s"Result: $action")
           }
       }
     }
-
   }
 
 
-  def aDialog = new Dialog(top) {
+  def aDialog:Dialog = new Dialog(top) {
     title = "A Dialog"
-    size = new Dimension(300, 300)
-    contents = new Label("Do not Close")
+    size = new Dimension(300, 600)
+    contents = new Label("Test Dialog.  Do Not Close")
     visible = true
   }
-
 }