Index: javax/swing/JApplet.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JApplet.java,v retrieving revision 1.19 diff -u -r1.19 JApplet.java --- javax/swing/JApplet.java 27 Jul 2005 12:41:33 -0000 1.19 +++ javax/swing/JApplet.java 7 Sep 2005 16:03:17 -0000 @@ -47,6 +47,7 @@ import java.awt.LayoutManager; import java.awt.event.KeyEvent; +import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; /** @@ -55,8 +56,23 @@ * @author original author unknown */ public class JApplet extends Applet - implements RootPaneContainer + implements RootPaneContainer, Accessible { + /** + * Provides accessibility support for JApplet. + */ + protected class AccessibleJApplet extends Applet.AccessibleApplet + { + /** + * Creates a new instance of AccessibleJApplet. + */ + public AccessibleJApplet() + { + super(); + // Nothing to do here. + } + } + private static final long serialVersionUID = 7269359214497372587L; protected JRootPane rootPane; @@ -73,6 +89,11 @@ */ private boolean initStageDone = false; + /** + * The accessible context for this JApplet. + */ + AccessibleContext accessibleContext; + public JApplet() { super.setLayout(new BorderLayout(1, 1)); @@ -168,7 +189,9 @@ public AccessibleContext getAccessibleContext() { - return null; + if (accessibleContext == null) + accessibleContext = new AccessibleJApplet(); + return accessibleContext; } public JMenuBar getJMenuBar() Index: javax/swing/JFrame.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JFrame.java,v retrieving revision 1.28 diff -u -r1.28 JFrame.java --- javax/swing/JFrame.java 5 Sep 2005 14:05:28 -0000 1.28 +++ javax/swing/JFrame.java 7 Sep 2005 16:03:17 -0000 @@ -50,6 +50,7 @@ import java.awt.event.KeyEvent; import java.awt.event.WindowEvent; +import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; /** @@ -65,8 +66,23 @@ * @author Ronald Veldema (address@hidden) */ public class JFrame extends Frame - implements WindowConstants, RootPaneContainer + implements WindowConstants, RootPaneContainer, Accessible { + /** + * Provides accessibility support for JFrames. + */ + protected class AccessibleJFrame extends Frame.AccessibleAWTFrame + { + /** + * Creates a new instance of AccessibleJFrame. + */ + public AccessibleJFrame() + { + super(); + // Nothing to do here. + } + } + private static final long serialVersionUID = -3362141868504252139L; private static boolean defaultLookAndFeelDecorated; private int close_action = HIDE_ON_CLOSE; @@ -275,6 +291,8 @@ public AccessibleContext getAccessibleContext() { + if (accessibleContext == null) + accessibleContext = new AccessibleJFrame(); return accessibleContext; } Index: javax/swing/JWindow.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JWindow.java,v retrieving revision 1.20 diff -u -r1.20 JWindow.java --- javax/swing/JWindow.java 12 Jul 2005 13:48:35 -0000 1.20 +++ javax/swing/JWindow.java 7 Sep 2005 16:03:17 -0000 @@ -60,6 +60,21 @@ */ public class JWindow extends Window implements Accessible, RootPaneContainer { + /** + * Provides accessibility support for JWindow. + */ + protected class AccessibleJWindow extends Window.AccessibleAWTWindow + { + /** + * Creates a new instance of AccessibleJWindow. + */ + public AccessibleJWindow() + { + super(); + // Nothing to do here. + } + } + private static final long serialVersionUID = 5420698392125238833L; protected JRootPane rootPane; @@ -235,7 +250,9 @@ public AccessibleContext getAccessibleContext() { - return null; + if (accessibleContext == null) + accessibleContext = new AccessibleJWindow(); + return accessibleContext; } protected String paramString() Index: javax/swing/JDialog.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JDialog.java,v retrieving revision 1.17 diff -u -r1.17 JDialog.java --- javax/swing/JDialog.java 5 Sep 2005 14:05:28 -0000 1.17 +++ javax/swing/JDialog.java 7 Sep 2005 16:03:17 -0000 @@ -66,6 +66,21 @@ public class JDialog extends Dialog implements Accessible, WindowConstants, RootPaneContainer { + /** + * Provides accessibility support for JDialogs. + */ + protected class AccessibleJDialog extends Dialog.AccessibleAWTDialog + { + /** + * Creates a new instance of AccessibleJDialog. + */ + public AccessibleJDialog() + { + super(); + // Nothing to do here. + } + } + private static final long serialVersionUID = -864070866424508218L; /** DOCUMENT ME! */ @@ -588,6 +603,8 @@ */ public AccessibleContext getAccessibleContext() { - return null; + if (accessibleContext == null) + accessibleContext = new AccessibleJDialog(); + return accessibleContext; } }