[SI7597] FileChooser parent to be Frame/Dialog

Author: andy1138

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

@@ -46,9 +46,28 @@ class FileChooser(dir: File) {
   def this() = this(null)
 
   import Swing._
-  def showOpenDialog(over: Component): Result.Value = Result(peer.showOpenDialog(nullPeer(over)))
-  def showSaveDialog(over: Component): Result.Value = Result(peer.showSaveDialog(nullPeer(over)))
-  def showDialog(over: Component, approveText: String): Result.Value = Result(peer.showDialog(nullPeer(over), approveText))
+
+  /**
+   * 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)))
+
+  /**
+   * 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)))
+
+  /**
+   * 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 controlButtonsAreShown: Boolean = peer.getControlButtonsAreShown
   def controlButtonsAreShown_=(b: Boolean) { peer.setControlButtonsAreShown(b) }

src/main/scala/scala/swing/Swing.scala

@@ -20,9 +20,11 @@ import javax.swing.{JComponent, Icon, BorderFactory, SwingUtilities}
  * Helpers for this package.
  */
 object Swing {
+  protected[swing] type PeerContainer = {def peer:java.awt.Container}
+
   protected[swing] def toNoIcon(i: Icon): Icon = if(i == null) EmptyIcon else i
   protected[swing] def toNullIcon(i: Icon): Icon = if(i == EmptyIcon) null else i
-  protected[swing] def nullPeer(c: Component) = if (c != null) c.peer else null
+  protected[swing] def nullPeer(c: PeerContainer) = if (c != null) c.peer else null
 
   implicit def pair2Dimension(p: (Int, Int)): Dimension = new Dimension(p._1, p._2)
   implicit def pair2Point(p: (Int, Int)): Point = new Point(p._1, p._2)