From 1a0b3a2afe1b1ef48dbb2af9d33b4aad1f59f037 Mon Sep 17 00:00:00 2001 From: NAME Date: Tue, 29 Apr 2008 18:05:29 +0000 Subject: Fixed showOptions --- src/swing/scala/swing/Dialog.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/swing/scala/swing/Dialog.scala b/src/swing/scala/swing/Dialog.scala index ad80193627..e7a2c7c02b 100644 --- a/src/swing/scala/swing/Dialog.scala +++ b/src/swing/scala/swing/Dialog.scala @@ -36,12 +36,11 @@ object Dialog { def showOptions(parent: Component, message: String, title: String, optionType: Options.Value, messageType: Message.Value, icon: Icon, - entries: Seq[Any], initialEntry: Int): Either[Result.Closed.type, Int] = { + entries: Seq[Any], initialEntry: Int): Result.Value = { val r = JOptionPane.showOptionDialog(parent.peer, message, title, optionType.id, messageType.id, Icon.wrap(icon), entries.map(_.asInstanceOf[AnyRef]).toArray, entries(initialEntry)) - if (r == JOptionPane.CLOSED_OPTION) Left[Result.Closed.type, Int](Result.Closed) - else Right[Result.Closed.type, Int](r) + Result(r) } def showInput[A](parent: Component, message: String, title: String, -- cgit v1.2.3