Index: javax/swing/Box.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/Box.java,v
retrieving revision 1.13
diff -u -3 -p -u -r1.13 Box.java
--- javax/swing/Box.java	22 Oct 2004 12:43:59 -0000	1.13
+++ javax/swing/Box.java	27 Jan 2005 02:07:31 -0000
@@ -40,6 +40,7 @@ package javax.swing;
 
 import java.awt.AWTError;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.LayoutManager;
 
@@ -60,18 +61,39 @@ public class Box extends JComponent impl
 {
   private static final long serialVersionUID = 1525417495883046342L;
   
-  // FIXME: disable to make libjava compile; visibility rules are broken
-  protected class AccessibleBox // extends Container.AccessibleAWTContainer
+  /**
+   * This class provides accessibility support for the
+   * box.
+   *
+   * @author Michael Koch (address@hidden)
+   * @author Kim Ho  (address@hidden)
+   * @author Andrew John Hughes (address@hidden)
+   */
+  protected class AccessibleBox 
+    extends Container.AccessibleAWTContainer
   {
     private static final long serialVersionUID = -7775079816389931944L;
   
+    /**
+     * Default constructor which simply calls the
+     * super class for generic component accessibility
+     * handling.
+     */
     protected AccessibleBox()
     {
+      super();
     }
     
+    /**
+     * Returns the role of this accessible object.
+     *
+     * @return the instance of <code>AccessibleRole</code>,
+     *         which describes this object.
+     * @see javax.accessibility.AccessibleRole
+     */
     public AccessibleRole getAccessibleRole()
     {
-      return null;
+      return AccessibleRole.GROUP_BOX;
     }
   }
 
@@ -82,18 +104,39 @@ public class Box extends JComponent impl
   {
     private static final long serialVersionUID = -1204263191910183998L;
   
-    // FIXME: disable to make libjava compile; visibility rules are broken
-    protected class AccessibleBoxFiller // extends Component.AccessibleAWTComponent
+    /**
+     * This class provides accessibility support for the
+     * filler.
+     *
+     * @author Michael Koch (address@hidden)
+     * @author Kim Ho  (address@hidden)
+     * @author Andrew John Hughes (address@hidden)
+     */
+    protected class AccessibleBoxFiller
+      extends Component.AccessibleAWTComponent
     {
       private static final long serialVersionUID = 164963348357479321L;
       
+      /**
+       * Default constructor which simply calls the
+       * super class for generic component accessibility
+       * handling.
+       */
       protected AccessibleBoxFiller()
       {
+	super();
       }
       
+      /**
+       * Returns the role of this accessible object.
+       *
+       * @return the instance of <code>AccessibleRole</code>,
+       *         which describes this object.
+       * @see javax.accessibility.AccessibleRole
+       */
       public AccessibleRole getAccessibleRole()
       {
-        return null;
+        return AccessibleRole.FILLER;
       }
     }
     
@@ -129,9 +172,8 @@ public class Box extends JComponent impl
     
     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;
     }
     
@@ -275,8 +317,8 @@ public class Box extends JComponent impl
   
   public AccessibleContext getAccessibleContext()
   {
-    //     if (accessibleContext == null)
-    //       accessibleContext = new AccessibleBox();
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleBox();
     return accessibleContext;
   }