--- /home/cpdev/src/classpath/javax/swing/JApplet.java	2005-07-12 17:32:34.000000000 +0000
+++ javax/swing/JApplet.java	2005-06-30 05:35:08.000000000 +0000
@@ -55,24 +55,12 @@
   private static final long serialVersionUID = 7269359214497372587L;
   
   protected JRootPane rootPane;
-
-  /**
-   * @specnote rootPaneCheckingEnabled is false to comply with J2SE 5.0
-   */
-  protected boolean rootPaneCheckingEnabled=false;
-
-  /**
-   * Tells us if we're in the initialization stage.
-   * If so, adds go to top-level Container, otherwise they go
-   * to the content pane for this container
-   */
-  private boolean initStageDone = false;
+  protected boolean rootPaneCheckingEnabled;
 
   public JApplet()
   {
     super.setLayout(new BorderLayout(1, 1));
-    getRootPane(); // Will do set/create.
-    initStageDone = true; // Init stage is now over.
+    getRootPane(); // will do set/create
   }
 
   public Dimension getPreferredSize()
@@ -82,17 +70,7 @@
 
   public void setLayout(LayoutManager manager)
   {
-    // Check if we're in initialization stage.  If so, call super.setLayout
-    // otherwise, valid calls go to the content pane
-    if (initStageDone)
-      {
-        if (isRootPaneCheckingEnabled())
-          throw new Error("Cannot set layout. Use getContentPane().setLayout()"
-                           + "instead.");
-        getContentPane().setLayout(manager);
-      }
-    else
-      super.setLayout(manager);
+    super.setLayout(manager);
   }
 
   public void setLayeredPane(JLayeredPane layeredPane)
@@ -148,17 +126,7 @@
 
   protected void addImpl(Component comp, Object constraints, int index)
   {
-    // If we're adding in the initialization stage use super.add.
-    // Otherwise pass the add onto the content pane.
-    if (!initStageDone)
-      super.addImpl(comp, constraints, index);
-    else
-      {
-        if (isRootPaneCheckingEnabled())
-          throw new Error("Do not use add() on JApplet directly. Use "
-                           + "getContentPane().add() instead");
-        getContentPane().add(comp, constraints, index);
-      }
+    super.addImpl(comp, constraints, index);
   }
 
   public AccessibleContext getAccessibleContext()
@@ -188,12 +156,7 @@
   
   public void remove(Component comp)
   {
-    // If we're removing the root pane, use super.remove. Otherwise
-    // pass it on to the content pane instead
-    if (comp == rootPane)
-      super.remove(rootPane);
-    else
-      getContentPane().remove(comp);
+    getContentPane().remove(comp);
   }
 
   protected boolean isRootPaneCheckingEnabled()