diff options
| author | Ingo Maier <ingo.maier@epfl.ch> | 2010-03-28 13:15:31 +0000 |
|---|---|---|
| committer | Ingo Maier <ingo.maier@epfl.ch> | 2010-03-28 13:15:31 +0000 |
| commit | 40fdbddc057c763771182b74c4a964f4aca2fb11 (patch) | |
| tree | 22dcf92099d7dc165fc7bc735cc4d6f80d34bef2 /src | |
| parent | a7dc91be7a1455bbeb05481357719d7247b596bd (diff) | |
| download | scala-40fdbddc057c763771182b74c4a964f4aca2fb11.tar.gz scala-40fdbddc057c763771182b74c4a964f4aca2fb11.tar.bz2 scala-40fdbddc057c763771182b74c4a964f4aca2fb11.zip | |
Fixed #2753. No review.
Diffstat (limited to 'src')
| -rw-r--r-- | src/swing/scala/swing/RootPanel.scala | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/swing/scala/swing/RootPanel.scala b/src/swing/scala/swing/RootPanel.scala index bb42824225..c18b68a306 100644 --- a/src/swing/scala/swing/RootPanel.scala +++ b/src/swing/scala/swing/RootPanel.scala @@ -22,11 +22,13 @@ trait RootPanel extends Container { /** * At most one component. */ - def contents: Seq[Component] = { - Option[Any](peer.getContentPane.getComponent(0)).map { c => - UIElement.cachedWrapper[Component](c.asInstanceOf[javax.swing.JComponent]) - }.toList - } + def contents: Seq[Component] = + if (peer.getContentPane.getComponentCount == 0) Nil + else { + val c = peer.getContentPane.getComponent(0).asInstanceOf[javax.swing.JComponent] + List(UIElement.cachedWrapper[Component](c)) + } + def contents_=(c: Component) { if (peer.getContentPane.getComponentCount > 0) { val old = peer.getContentPane.getComponent(0) |