Index: java/awt/Button.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Button.java,v
retrieving revision 1.18
diff -u -r1.18 Button.java
--- java/awt/Button.java	29 Dec 2004 11:15:02 -0000	1.18
+++ java/awt/Button.java	30 Dec 2004 19:00:45 -0000
@@ -428,9 +428,18 @@
     + getWidth () + "x" + getHeight () + ",label=" + getLabel ();
 }
 
+/**
+ * Gets the AccessibleContext associated with this <code>Button</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
 public AccessibleContext getAccessibleContext()
 {
-  return new AccessibleAWTButton();
+  /* Create the context if this is the first request */
+  if (accessibleContext == null)
+    accessibleContext = new AccessibleAWTButton();
+  return accessibleContext;
 }
 
   /**
Index: java/awt/Canvas.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Canvas.java,v
retrieving revision 1.10
diff -u -r1.10 Canvas.java
--- java/awt/Canvas.java	16 Nov 2004 09:59:11 -0000	1.10
+++ java/awt/Canvas.java	30 Dec 2004 19:00:45 -0000
@@ -174,10 +174,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTCanvas();
-      }
+      accessibleContext = new AccessibleAWTCanvas();
     return accessibleContext;
   }
 
Index: java/awt/Checkbox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Checkbox.java,v
retrieving revision 1.11
diff -u -r1.11 Checkbox.java
--- java/awt/Checkbox.java	23 Nov 2004 18:04:46 -0000	1.11
+++ java/awt/Checkbox.java	30 Dec 2004 19:00:45 -0000
@@ -490,11 +490,22 @@
 	  + "," + super.paramString());
 }
 
+/**
+ * Gets the AccessibleContext associated with this <code>CheckBox</code>.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
 public AccessibleContext getAccessibleContext()
 {
-  AccessibleAWTCheckBox ac = new AccessibleAWTCheckBox();
-  addItemListener(ac);
-  return ac;
+  /* Create the context if this is the first request */
+  if (accessibleContext == null)
+  {
+    AccessibleAWTCheckBox ac = new AccessibleAWTCheckBox();
+    accessibleContext = ac;
+    addItemListener(ac);
+  }
+  return accessibleContext;
 }
 
 } // class Checkbox 
Index: java/awt/CheckboxMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/CheckboxMenuItem.java,v
retrieving revision 1.16
diff -u -r1.16 CheckboxMenuItem.java
--- java/awt/CheckboxMenuItem.java	29 Dec 2004 14:18:25 -0000	1.16
+++ java/awt/CheckboxMenuItem.java	30 Dec 2004 19:00:45 -0000
@@ -330,7 +330,7 @@
   }
   
   /**
-   * Gets the AccessibleContext associated with this <code>List</code>.
+   * Gets the AccessibleContext associated with this <code>CheckboxMenuItem</code>.
    * The context is created, if necessary.
    *
    * @return the associated context
@@ -339,10 +339,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTCheckboxMenuItem();
-      }
+      accessibleContext = new AccessibleAWTCheckboxMenuItem();
     return accessibleContext;
   }
 
Index: java/awt/Choice.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Choice.java,v
retrieving revision 1.18
diff -u -r1.18 Choice.java
--- java/awt/Choice.java	29 Dec 2004 14:18:25 -0000	1.18
+++ java/awt/Choice.java	30 Dec 2004 19:00:45 -0000
@@ -566,8 +566,17 @@
     return (ItemListener[]) getListeners (ItemListener.class);
   }
 
+  /**
+   * Gets the AccessibleContext associated with this <code>Choice</code>.
+   * The context is created, if necessary.
+   *
+   * @return the associated context
+   */
   public AccessibleContext getAccessibleContext()
   {
-    return new AccessibleAWTChoice();
+    /* Create the context if this is the first request */
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleAWTChoice();
+    return accessibleContext;
   }
 } // class Choice 
Index: java/awt/Dialog.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Dialog.java,v
retrieving revision 1.19
diff -u -r1.19 Dialog.java
--- java/awt/Dialog.java	29 Dec 2004 14:18:25 -0000	1.19
+++ java/awt/Dialog.java	30 Dec 2004 19:00:45 -0000
@@ -545,10 +545,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTDialog();
-      }
+      accessibleContext = new AccessibleAWTDialog();
     return accessibleContext;
   }
 
Index: java/awt/Frame.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Frame.java,v
retrieving revision 1.26
diff -u -r1.26 Frame.java
--- java/awt/Frame.java	29 Dec 2004 14:18:25 -0000	1.26
+++ java/awt/Frame.java	30 Dec 2004 19:00:45 -0000
@@ -583,10 +583,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTFrame();
-      }
+      accessibleContext = new AccessibleAWTFrame();
     return accessibleContext;
   }
 
Index: java/awt/Label.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Label.java,v
retrieving revision 1.16
diff -u -r1.16 Label.java
--- java/awt/Label.java	16 Nov 2004 09:59:11 -0000	1.16
+++ java/awt/Label.java	30 Dec 2004 19:00:45 -0000
@@ -306,10 +306,7 @@
 {
   /* Create the context if this is the first request */
   if (accessibleContext == null)
-    {
-      /* Create the context */
-      accessibleContext = new AccessibleAWTLabel();
-    }
+    accessibleContext = new AccessibleAWTLabel();
   return accessibleContext;
 }
 
Index: java/awt/List.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/List.java,v
retrieving revision 1.21
diff -u -r1.21 List.java
--- java/awt/List.java	29 Dec 2004 14:18:25 -0000	1.21
+++ java/awt/List.java	30 Dec 2004 19:00:45 -0000
@@ -1257,10 +1257,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTList();
-      }
+      accessibleContext = new AccessibleAWTList();
     return accessibleContext;
   }
 } // class List
Index: java/awt/Menu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Menu.java,v
retrieving revision 1.18
diff -u -r1.18 Menu.java
--- java/awt/Menu.java	23 Nov 2004 18:18:13 -0000	1.18
+++ java/awt/Menu.java	30 Dec 2004 19:00:45 -0000
@@ -451,12 +451,18 @@
     }
   }
 
-  /* (non-Javadoc)
-   * @see java.awt.MenuComponent#getAccessibleContext()
+  /**
+   * Gets the AccessibleContext associated with this <code>Menu</code>.
+   * The context is created, if necessary.
+   *
+   * @return the associated context
    */
   public AccessibleContext getAccessibleContext()
   {
-    return new AccessibleAWTMenu();
+    /* Create the context if this is the first request */
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleAWTMenu();
+    return accessibleContext;
   }
 
 } // class Menu
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuBar.java,v
retrieving revision 1.14
diff -u -r1.14 MenuBar.java
--- java/awt/MenuBar.java	16 Nov 2004 09:59:11 -0000	1.14
+++ java/awt/MenuBar.java	30 Dec 2004 19:00:45 -0000
@@ -381,10 +381,7 @@
 {
   /* Create the context if this is the first request */
   if (accessibleContext == null)
-    {
-      /* Create the context */
-      accessibleContext = new AccessibleAWTMenuBar();
-    }
+    accessibleContext = new AccessibleAWTMenuBar();
   return accessibleContext;
 }
 
Index: java/awt/MenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuItem.java,v
retrieving revision 1.19
diff -u -r1.19 MenuItem.java
--- java/awt/MenuItem.java	29 Dec 2004 14:18:25 -0000	1.19
+++ java/awt/MenuItem.java	30 Dec 2004 19:00:45 -0000
@@ -590,10 +590,7 @@
 {
   /* Create the context if this is the first request */
   if (accessibleContext == null)
-    {
-      /* Create the context */
-      accessibleContext = new AccessibleAWTMenuItem();
-    }
+    accessibleContext = new AccessibleAWTMenuItem();
   return accessibleContext;
 }
 
Index: java/awt/PopupMenu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/PopupMenu.java,v
retrieving revision 1.14
diff -u -r1.14 PopupMenu.java
--- java/awt/PopupMenu.java	23 Nov 2004 18:18:13 -0000	1.14
+++ java/awt/PopupMenu.java	30 Dec 2004 19:00:45 -0000
@@ -151,9 +151,18 @@
     
   }
   
+  /**
+   * Gets the AccessibleContext associated with this <code>PopupMenu</code>.
+   * The context is created, if necessary.
+   *
+   * @return the associated context
+   */
   public AccessibleContext getAccessibleContext()
   {
-    return new AccessibleAWTPopupMenu();
+    /* Create the context if this is the first request */
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleAWTPopupMenu();
+    return accessibleContext;
   }
 
 } // class PopupMenu
Index: java/awt/ScrollPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/ScrollPane.java,v
retrieving revision 1.22
diff -u -r1.22 ScrollPane.java
--- java/awt/ScrollPane.java	29 Dec 2004 14:18:25 -0000	1.22
+++ java/awt/ScrollPane.java	30 Dec 2004 19:00:46 -0000
@@ -599,7 +599,7 @@
   }
 
   /**
-   * Gets the AccessibleContext associated with this <code>Scrollbar</code>.
+   * Gets the AccessibleContext associated with this <code>ScrollPane</code>.
    * The context is created, if necessary.
    *
    * @return the associated context
@@ -608,10 +608,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTScrollPane();
-      }
+      accessibleContext = new AccessibleAWTScrollPane();
     return accessibleContext;
   }
 } // class ScrollPane 
Index: java/awt/Scrollbar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Scrollbar.java,v
retrieving revision 1.22
diff -u -r1.22 Scrollbar.java
--- java/awt/Scrollbar.java	29 Dec 2004 14:18:25 -0000	1.22
+++ java/awt/Scrollbar.java	30 Dec 2004 19:00:46 -0000
@@ -845,10 +845,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTScrollbar();
-      }
+      accessibleContext = new AccessibleAWTScrollbar();
     return accessibleContext;
   }
 
Index: java/awt/TextArea.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextArea.java,v
retrieving revision 1.17
diff -u -r1.17 TextArea.java
--- java/awt/TextArea.java	23 Nov 2004 18:04:46 -0000	1.17
+++ java/awt/TextArea.java	30 Dec 2004 19:00:46 -0000
@@ -613,8 +613,17 @@
     }
   }
   
+  /**
+   * Gets the AccessibleContext associated with this <code>TextArea</code>.
+   * The context is created, if necessary.
+   *
+   * @return the associated context
+   */
   public AccessibleContext getAccessibleContext()
   {
-    return new AccessibleAWTTextArea();
+    /* Create the context if this is the first request */
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleAWTTextArea();
+    return accessibleContext;
   }
 }
Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v
retrieving revision 1.16
diff -u -r1.16 TextComponent.java
--- java/awt/TextComponent.java	23 Nov 2004 18:18:13 -0000	1.16
+++ java/awt/TextComponent.java	30 Dec 2004 19:00:46 -0000
@@ -46,6 +46,7 @@
 import java.util.EventListener;
 
 import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleState;
 import javax.accessibility.AccessibleStateSet;
@@ -690,6 +691,21 @@
     return (TextListener[]) getListeners (TextListener.class);
   }
 
+  /**
+   * Gets the AccessibleContext associated with this <code>TextComponent</code>.
+   * The context is created, if necessary.
+   *
+   * @return the associated context
+   */
+  public AccessibleContext getAccessibleContext()
+  {
+    /* Create the context if this is the first request */
+    if (accessibleContext == null)
+      accessibleContext = new AccessibleAWTTextComponent();
+    return accessibleContext;
+  }
+
+  
   /*******************************/
   // Provide AccessibleAWTTextComponent access to several peer functions that
   // aren't publicly exposed.
Index: java/awt/Window.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Window.java,v
retrieving revision 1.41
diff -u -r1.41 Window.java
--- java/awt/Window.java	30 Dec 2004 16:51:20 -0000	1.41
+++ java/awt/Window.java	30 Dec 2004 19:00:46 -0000
@@ -823,10 +823,7 @@
   {
     /* Create the context if this is the first request */
     if (accessibleContext == null)
-      {
-        /* Create the context */
-        accessibleContext = new AccessibleAWTWindow();
-      }
+      accessibleContext = new AccessibleAWTWindow();
     return accessibleContext;
   }