Container.java (validate): Use tree lock.

	* java/awt/Container.java (validate): Use tree lock.
	(getComponent): Likewise.
	(getComponents): Likewise.
	(addImpl): Likewise.
	(remove): Likewise.
	(removeAll): Likewise.
	(processEvent): Fixed indentation.
	(getComponentAt): Use tree lock.
	(findComponentAt): Likewise.
	(removeNotify): Likewise.
	(isAncestorOf): Likewise.
	(list): Likewise.
	(visitChildren): Likewise.
	(findNextFocusComponent): Likewise.
	(addNotifyContainerChildren): Likewise.
	(getAccessibleChildrenCount): Likewise.
	(getAccessibleChild): Likewise.

From-SVN: r59009

libjava/ChangeLog

 2002-11-10  Tom Tromey  <tromey@redhat.com>
 
+	* java/awt/Container.java (validate): Use tree lock.
+	(getComponent): Likewise.
+	(getComponents): Likewise.
+	(addImpl): Likewise.
+	(remove): Likewise.
+	(removeAll): Likewise.
+	(processEvent): Fixed indentation.
+	(getComponentAt): Use tree lock.
+	(findComponentAt): Likewise.
+	(removeNotify): Likewise.
+	(isAncestorOf): Likewise.
+	(list): Likewise.
+	(visitChildren): Likewise.
+	(findNextFocusComponent): Likewise.
+	(addNotifyContainerChildren): Likewise.
+	(getAccessibleChildrenCount): Likewise.
+	(getAccessibleChild): Likewise.
+
 	* java/awt/GridLayout.java (layoutContainer): Use tree lock.
 	(getSize): Likewise.
 	* java/awt/FlowLayout.java (layoutContainer): Use tree lock.

libjava/java/awt/Container.java

@@ -123,10 +123,13 @@ public class Container extends Component
    */
   public Component getComponent(int n)
   {
+    synchronized (getTreeLock ())
+      {
 	if (n < 0 || n >= ncomponents)
 	  throw new ArrayIndexOutOfBoundsException("no such component");
 	return component[n];
       }
+  }
 
   /**
    * Returns an array of the components in this container.
@@ -135,11 +138,14 @@ public class Container extends Component
    */
   public Component[] getComponents()
   {
+    synchronized (getTreeLock ())
+      {
 	Component[] result = new Component[ncomponents];
 	if (ncomponents > 0)
 	  System.arraycopy(component, 0, result, 0, ncomponents);
 	return result;
       }
+  }
 
   /**
    * Returns the insets for this container, which is the space used for
@@ -260,6 +266,8 @@ public class Container extends Component
    */
   protected void addImpl(Component comp, Object constraints, int index)
   {
+    synchronized (getTreeLock ())
+      {
 	if (index > ncomponents
 	    || (index < 0 && index != -1)
 	    || comp instanceof Window
@@ -324,6 +332,7 @@ public class Container extends Component
 					       comp);
 	getToolkit().getSystemEventQueue().postEvent(ce);
       }
+  }
 
   /**
    * Removes the component at the specified index from this container.
@@ -332,6 +341,8 @@ public class Container extends Component
    */
   public void remove(int index)
   {
+    synchronized (getTreeLock ())
+      {
 	Component r = component[index];
 
 	r.removeNotify();
@@ -351,6 +362,7 @@ public class Container extends Component
 					       r);
 	getToolkit().getSystemEventQueue().postEvent(ce);
       }
+  }
 
   /**
    * Removes the specified component from this container.
@@ -359,6 +371,8 @@ public class Container extends Component
    */
   public void remove(Component comp)
   {
+    synchronized (getTreeLock ())
+      {
 	for (int i = 0; i < ncomponents; ++i)
 	  {
 	    if (component[i] == comp)
@@ -368,15 +382,19 @@ public class Container extends Component
 	      }
 	  }
       }
+  }
 
   /**
    * Removes all components from this container.
    */
   public void removeAll()
   {
+    synchronized (getTreeLock ())
+      {
 	while (ncomponents > 0)
 	  remove(0);
       }
+  }
 
   /**
    * Returns the current layout manager for this container.
@@ -433,8 +451,7 @@ public class Container extends Component
    */
   public void validate()
   {
-    // FIXME: use the tree lock?
-    synchronized (this)
+    synchronized (getTreeLock ())
       {
         if (! isValid())
           {
@@ -713,7 +730,8 @@ public class Container extends Component
   {
     if (e instanceof ContainerEvent)
       processContainerEvent((ContainerEvent) e);
-    else super.processEvent(e);
+    else
+      super.processEvent(e);
   }
 
   /**
@@ -764,6 +782,8 @@ public class Container extends Component
    */
   public Component getComponentAt(int x, int y)
   {
+    synchronized (getTreeLock ())
+      {
 	if (! contains(x, y))
 	  return null;
 	for (int i = 0; i < ncomponents; ++i)
@@ -779,6 +799,7 @@ public class Container extends Component
 	  }
 	return this;
       }
+  }
 
   /**
    * Returns the component located at the specified point.  This is done
@@ -818,6 +839,8 @@ public class Container extends Component
 
   public Component findComponentAt(int x, int y)
   {
+    synchronized (getTreeLock ())
+      {
 	if (! contains(x, y))
 	  return null;
 
@@ -844,6 +867,7 @@ public class Container extends Component
 
 	return this;
       }
+  }
 
   public Component findComponentAt(Point p)
   {
@@ -868,10 +892,13 @@ public class Container extends Component
    */
   public void removeNotify()
   {
+    synchronized (getTreeLock ())
+      {
 	for (int i = 0; i < ncomponents; ++i)
 	  component[i].removeNotify();
 	super.removeNotify();
       }
+  }
 
   /**
    * Tests whether or not the specified component is contained within
@@ -880,10 +907,12 @@ public class Container extends Component
    * @param component The component to test.
    *
    * @return <code>true</code> if this container is an ancestor of the
-   * specified component, <code>false</code>.
+   * specified component, <code>false</code> otherwise.
    */
   public boolean isAncestorOf(Component comp)
   {
+    synchronized (getTreeLock ())
+      {
 	while (true)
 	  {
 	    if (comp == null)
@@ -893,6 +922,7 @@ public class Container extends Component
 	    comp = comp.getParent();
 	  }
       }
+  }
 
   /**
    * Returns a string representing the state of this container for
@@ -918,10 +948,13 @@ public class Container extends Component
    */
   public void list(PrintStream out, int indent)
   {
+    synchronized (getTreeLock ())
+      {
 	super.list(out, indent);
 	for (int i = 0; i < ncomponents; ++i)
 	  component[i].list(out, indent + 2);
       }
+  }
 
   /**
    * Writes a listing of this container to the specified stream starting
@@ -932,10 +965,13 @@ public class Container extends Component
    */
   public void list(PrintWriter out, int indent)
   {
+    synchronized (getTreeLock ())
+      {
 	super.list(out, indent);
 	for (int i = 0; i < ncomponents; ++i)
 	  component[i].list(out, indent + 2);
       }
+  }
 
   public void setFocusTraversalKeys(int id, Set keys)
   {
@@ -1006,8 +1042,8 @@ public class Container extends Component
   private void visitChildren(Graphics gfx, GfxVisitor visitor,
                              boolean lightweightOnly)
   {
-    // FIXME: do locking
-
+    synchronized (getTreeLock ())
+      {
 	for (int i = 0; i < ncomponents; ++i)
 	  {
 	    Component comp = component[i];
@@ -1018,6 +1054,7 @@ public class Container extends Component
 	      visitChild(gfx, visitor, comp);
 	  }
       }
+  }
 
   /**
    * Perform a graphics operation on a child. A translated and clipped
@@ -1061,6 +1098,8 @@ public class Container extends Component
   // This is used to implement Component.transferFocus.
   Component findNextFocusComponent(Component child)
   {
+    synchronized (getTreeLock ())
+      {
 	int start, end;
 	if (child != null)
 	  {
@@ -1106,9 +1145,12 @@ public class Container extends Component
 
 	return null;
       }
+  }
 
   private void addNotifyContainerChildren()
   {
+    synchronized (getTreeLock ())
+      {
 	for (int i = ncomponents;  --i >= 0; )
 	  {
 	    component[i].addNotify();
@@ -1116,6 +1158,7 @@ public class Container extends Component
 	      enableEvents(component[i].eventMask);
 	  }
       }
+  }
 
 
   // Nested classes.
@@ -1190,6 +1233,8 @@ public class Container extends Component
      */
     public int getAccessibleChildrenCount()
     {
+      synchronized (getTreeLock ())
+	{
 	  int count = 0;
 	  int i = component == null ? 0 : component.length;
 	  while (--i >= 0)
@@ -1197,6 +1242,7 @@ public class Container extends Component
 	      count++;
 	  return count;
 	}
+    }
 
     /**
      * Return the nth accessible child of the containing accessible object.
@@ -1206,6 +1252,8 @@ public class Container extends Component
      */
     public Accessible getAccessibleChild(int i)
     {
+      synchronized (getTreeLock ())
+	{
 	  if (component == null)
 	    return null;
 	  int index = -1;
@@ -1216,6 +1264,7 @@ public class Container extends Component
 	    return (Accessible) component[index];
 	  return null;
 	}
+    }
 
     /**
      * Return the accessible child located at point (in the parent's