diff options
| author | NAME <USER@epfl.ch> | 2008-04-29 18:05:29 +0000 |
|---|---|---|
| committer | NAME <USER@epfl.ch> | 2008-04-29 18:05:29 +0000 |
| commit | 1a0b3a2afe1b1ef48dbb2af9d33b4aad1f59f037 (patch) | |
| tree | abf27058213bf6c9d3849d515b696be87b5eca80 | |
| parent | f8085a2e65f4ee9fb21f276da1b8ebbf317ad224 (diff) | |
| download | scala-1a0b3a2afe1b1ef48dbb2af9d33b4aad1f59f037.tar.gz scala-1a0b3a2afe1b1ef48dbb2af9d33b4aad1f59f037.tar.bz2 scala-1a0b3a2afe1b1ef48dbb2af9d33b4aad1f59f037.zip | |
Fixed showOptions
| -rw-r--r-- | src/swing/scala/swing/Dialog.scala | 5 |
1 files 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, |