From 40fdbddc057c763771182b74c4a964f4aca2fb11 Mon Sep 17 00:00:00 2001
From: Ingo Maier <ingo.maier@epfl.ch>
Date: Sun, 28 Mar 2010 13:15:31 +0000
Subject: Fixed #2753. No review.

---
 src/swing/scala/swing/RootPanel.scala | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/swing')

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)
-- 
cgit v1.2.3