--- /home/cpdev/src/classpath/javax/swing/JFrame.java	2005-07-12 17:32:36.000000000 +0000
+++ javax/swing/JFrame.java	2005-06-30 05:35:09.000000000 +0000
@@ -45,7 +45,6 @@
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
 import java.awt.LayoutManager;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
@@ -66,18 +65,7 @@
   private int close_action = HIDE_ON_CLOSE;
   protected AccessibleContext accessibleContext;
   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 JFrame()
   {
@@ -91,44 +79,11 @@
     frameInit();
   }
 
-  /**
-   * Creates a new JFrame in the specified {@link GraphicsConfiguration}
-   * and with an empty title.
-   *
-   * @param gc the <code>GraphicsConfiguration</code> that is used for
-   *     the new <code>JFrame</code>
-   *
-   * @see Frame(GraphicsConfiguration)
-   */
-  public JFrame(GraphicsConfiguration gc)
-  {
-    super(gc);
-    frameInit();
-  }
-
-  /**
-   * Creates a new JFrame in the specified {@link GraphicsConfiguration}
-   * and with the specified title.
-   *
-   * @param title the title for the new <code>JFrame</code>
-   * @param gc the <code>GraphicsConfiguration</code> that is used for
-   *     the new <code>JFrame</code>
-   *
-   * @see Frame(String, GraphicsConfiguration)
-   */
-  public JFrame(String title, GraphicsConfiguration gc)
-  {
-    super(title, gc);
-    frameInit();
-  }
-
   protected void frameInit()
   {
     super.setLayout(new BorderLayout(1, 1));
     enableEvents(AWTEvent.WINDOW_EVENT_MASK);
     getRootPane(); // will do set/create
-    // We're now done the init stage.
-    initStageDone = true;
   }
 
   public Dimension getPreferredSize()
@@ -148,17 +103,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)
@@ -214,27 +159,12 @@
 
   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("rootPaneChecking is enabled - adding components "
-                           + "disallowed.");
-        getContentPane().add(comp,constraints,index);
-      }
+    super.addImpl(comp, constraints, index);
   }
 
   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()
@@ -342,7 +272,7 @@
 
     if (operation != EXIT_ON_CLOSE && operation != DISPOSE_ON_CLOSE
         && operation != HIDE_ON_CLOSE && operation != DO_NOTHING_ON_CLOSE)
-      throw new IllegalArgumentException("defaultCloseOperation must be EXIT_ON_CLOSE, HIDE_ON_CLOSE, DISPOSE_ON_CLOSE, or DO_NOTHING_ON_CLOSE");
+      throw new IllegalArgumentException("operation = " + operation);
 
     close_action = operation;
   }