Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTabbedPane.java,v
retrieving revision 1.24
diff -u -r1.24 JTabbedPane.java
--- javax/swing/JTabbedPane.java	9 Nov 2005 21:30:10 -0000	1.24
+++ javax/swing/JTabbedPane.java	9 Nov 2005 22:02:16 -0000
@@ -337,7 +337,10 @@
      */
     public void setComponent(Component c)
     {
+      int i = indexOfComponent(component);
+      insertTab(title, icon, c, tip, i);
       component = c;
+      removeTabAt(i);
     }
 
     /**
@@ -1059,10 +1062,8 @@
   public void removeTabAt(int index)
   {
     checkIndex(index, 0, tabs.size());
-    Component c = getComponentAt(index);
-    super.remove(index);
-    c.show();
     tabs.remove(index);
+    getComponentAt(index).show();
   }
 
   /**
@@ -1082,6 +1083,7 @@
    */
   public void remove(int index)
   {
+    remove(getComponentAt(index));
     removeTabAt(index);
   }