Index: javax/swing/Box.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/Box.java,v
retrieving revision 1.16
diff -u -r1.16 Box.java
--- javax/swing/Box.java	26 Jul 2005 15:30:54 -0000	1.16
+++ javax/swing/Box.java	6 Sep 2005 20:37:27 -0000
@@ -63,8 +63,7 @@
   /**
    * Provides accessibility support for <code>Box</code>es.
    */
-  // FIXME: disable to make libjava compile; visibility rules are broken
-  protected class AccessibleBox // extends Container.AccessibleAWTContainer
+  protected class AccessibleBox extends Container.AccessibleAWTContainer
   {
     private static final long serialVersionUID = -7775079816389931944L;
   
@@ -88,8 +87,8 @@
     /**
      * Provides accessibility support for <code>Box.Filler</code>.
      */
-    // FIXME: disable to make libjava compile; visibility rules are broken
-    protected class AccessibleBoxFiller // extends Component.AccessibleAWTComponent
+    protected class AccessibleBoxFiller
+      extends Component.AccessibleAWTComponent
     {
       private static final long serialVersionUID = 164963348357479321L;
       
@@ -135,9 +134,8 @@
     
     public AccessibleContext getAccessibleContext()
     {
-      // FIXME: disable to make libjava compile; visibility rules are broken      
-      //      if (accessibleContext == null)
-      //        accessibleContext = new AccessibleBoxFiller();
+      if (accessibleContext == null)
+        accessibleContext = new AccessibleBoxFiller();
       return accessibleContext;
     }
     
@@ -284,8 +282,8 @@
   
   public AccessibleContext getAccessibleContext()
   {
-    //     if (accessibleContext == null)
-    //       accessibleContext = new AccessibleBox();
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleBox();
     return accessibleContext;
   }
   
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v
retrieving revision 1.23
diff -u -r1.23 JRootPane.java
--- javax/swing/JRootPane.java	2 Jul 2005 20:32:48 -0000	1.23
+++ javax/swing/JRootPane.java	6 Sep 2005 20:37:27 -0000
@@ -46,6 +46,7 @@
 import java.awt.LayoutManager2;
 import java.io.Serializable;
 
+import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleRole;
 import javax.swing.plaf.RootPaneUI;
 
@@ -59,10 +60,10 @@
  *
  * @author Ronald Veldema (address@hidden)
  */
-public class JRootPane extends JComponent
+public class JRootPane extends JComponent implements Accessible
 {
   //  The class used to obtain the accessible role for this object.
-  protected static class AccessibleJRootPane
+  protected class AccessibleJRootPane extends AccessibleJComponent
   {
     /**
      * For compatability with Sun's JDK