Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 3 deletions

diff --git a/libjava/classpath/javax/swing/JRootPane.java b/libjava/classpath/javax/swing/JRootPane.java
index a2cd9c7a000..10fdf10c0ec 100644
--- a/libjava/classpath/javax/swing/JRootPane.java
+++ b/libjava/classpath/javax/swing/JRootPane.java
@@ -505,15 +505,21 @@ public class JRootPane extends JComponent implements Accessible
   }
 
   /**
-   * DOCUMENT ME!
+   * Set the layered pane for the root pane. 
    *
-   * @param f DOCUMENT ME!
+   * @param f The JLayeredPane to be used.
+   * 
+   * @throws IllegalComponentStateException if JLayeredPane
+   * parameter is null.
    */
   public void setLayeredPane(JLayeredPane f)
   {
+    if (f == null)
+      throw new IllegalComponentStateException();
+    
     if (layeredPane != null)
       remove(layeredPane);
-
+    
     layeredPane = f;
     add(f, -1);
   }