Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 10 insertions, 11 deletions

diff --git a/libjava/classpath/javax/swing/Box.java b/libjava/classpath/javax/swing/Box.java
index b2cb44aceb5..57519f6fcbd 100644
--- a/libjava/classpath/javax/swing/Box.java
+++ b/libjava/classpath/javax/swing/Box.java
@@ -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;
 
@@ -63,13 +64,13 @@ public class Box extends JComponent implements Accessible
   /**
    * 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;
   
     protected AccessibleBox()
     {
+      // Nothing to do here.
     }
     
     public AccessibleRole getAccessibleRole()
@@ -88,13 +89,14 @@ public class Box extends JComponent implements Accessible
     /**
      * 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;
       
       protected AccessibleBoxFiller()
       {
+        // Nothing to do here.
       }
       
       public AccessibleRole getAccessibleRole()
@@ -103,8 +105,6 @@ public class Box extends JComponent implements Accessible
       }
     }
     
-    protected AccessibleContext accessibleContext;
-    
     private transient Dimension min, pref, max;
     
     /**
@@ -135,9 +135,8 @@ public class Box extends JComponent implements Accessible
     
     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 +283,8 @@ public class Box extends JComponent implements Accessible
   
   public AccessibleContext getAccessibleContext()
   {
-    //     if (accessibleContext == null)
-    //       accessibleContext = new AccessibleBox();
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleBox();
     return accessibleContext;
   }