GridLayout.java (layoutContainer): Use tree lock.

	* java/awt/GridLayout.java (layoutContainer): Use tree lock.
	(getSize): Likewise.
	* java/awt/FlowLayout.java (layoutContainer): Use tree lock.
	(getSize): Likewise.
	* java/awt/BorderLayout.java (layoutContainer): Use tree lock.
	(calcSize): Likewise.
	* java/awt/CardLayout.java (getSize): Use tree lock.
	(gotoComponent): Likewise.
	(layoutContainer): Likewise.

From-SVN: r58998

libjava/ChangeLog

 2002-11-10  Tom Tromey  <tromey@redhat.com>
 
+	* java/awt/GridLayout.java (layoutContainer): Use tree lock.
+	(getSize): Likewise.
+	* java/awt/FlowLayout.java (layoutContainer): Use tree lock.
+	(getSize): Likewise.
+	* java/awt/BorderLayout.java (layoutContainer): Use tree lock.
+	(calcSize): Likewise.
+	* java/awt/CardLayout.java (getSize): Use tree lock.
+	(gotoComponent): Likewise.
+	(layoutContainer): Likewise.
+
 	* java/io/natFileDescriptorWin32.cc (read): Handle case where
 	count is 0.
 	* java/io/natFileDescriptorPosix.cc (read): Handle case where

libjava/java/awt/BorderLayout.java

@@ -529,6 +529,8 @@ invalidateLayout(Container parent)
 public void
 layoutContainer(Container target)
 {
+  synchronized (target.getTreeLock ())
+    {
       Insets i = target.getInsets();
 
       ComponentOrientation orient = target.getComponentOrientation ();
@@ -603,6 +605,7 @@ layoutContainer(Container target)
       setBounds(my_south, x1, y3, ww, s.height);
       setBounds(my_west, x1, y2, w.width, hh);
       setBounds(my_east, x3, y2, e.width, hh);
+    }
 }
 
 /*************************************************************************/
@@ -648,6 +651,8 @@ calcCompSize(Component comp, int what)
 private Dimension
 calcSize(Container target, int what)
 {
+  synchronized (target.getTreeLock ())
+    {
       Insets ins = target.getInsets();
 
       ComponentOrientation orient = target.getComponentOrientation ();
@@ -702,5 +707,6 @@ calcSize(Container target, int what)
       height += (ndim.height + sdim.height + (vgap * 2) + ins.top + ins.bottom);
 
       return(new Dimension(width, height));
+    }
 }
 } // class BorderLayout 

libjava/java/awt/CardLayout.java

@@ -165,6 +165,8 @@ public class CardLayout implements LayoutManager2, Serializable
    */ 
   public void layoutContainer (Container parent)
   {
+    synchronized (parent.getTreeLock ())
+      {
 	int width = parent.width;
 	int height = parent.height;
 
@@ -181,6 +183,7 @@ public class CardLayout implements LayoutManager2, Serializable
 	for (int i = 0; i < num; ++i)
 	  comps[i].setBounds (x, y, width, height);
       }
+  }
 
   /** Get the maximum layout size of the container.
    * @param target The parent container
@@ -287,6 +290,8 @@ public class CardLayout implements LayoutManager2, Serializable
   private void gotoComponent (Container parent, int what,
 			      Component target)
   {
+    synchronized (parent.getTreeLock ())
+      {
 	int num = parent.ncomponents;
 	// This is more efficient than calling getComponents().
 	Component[] comps = parent.component;
@@ -339,10 +344,13 @@ public class CardLayout implements LayoutManager2, Serializable
 	if (choice >= 0 && choice < num)
 	  comps[choice].setVisible (true);
       }
+  }
 
   // Compute the size according to WHAT.
   private Dimension getSize (Container parent, int what)
   {
+    synchronized (parent.getTreeLock ())
+      {
 	int w = 0, h = 0, num = parent.ncomponents;
 	Component[] comps = parent.component;
 
@@ -373,6 +381,7 @@ public class CardLayout implements LayoutManager2, Serializable
 
 	return new Dimension (w, h);
       }
+  }
 
   /**
    * @serial Horizontal gap value.

libjava/java/awt/FlowLayout.java

@@ -150,6 +150,8 @@ public class FlowLayout implements LayoutManager, Serializable
    */
   public void layoutContainer (Container parent)
   {
+    synchronized (parent.getTreeLock ())
+      {
 	int num = parent.getComponentCount ();
 	// This is more efficient than calling getComponents().
 	Component[] comps = parent.component;
@@ -222,6 +224,7 @@ public class FlowLayout implements LayoutManager, Serializable
 	    y += new_h + vgap;
 	  }
       }
+  }
 
   /**
    * Returns the minimum layout size for the specified container using
@@ -304,6 +307,8 @@ public class FlowLayout implements LayoutManager, Serializable
   // This method is used to compute the various sizes.
   private Dimension getSize (Container parent, boolean is_min)
   {
+    synchronized (parent.getTreeLock ())
+      {
 	int w, h, num = parent.getComponentCount ();
 	// This is more efficient than calling getComponents().
 	Component[] comps = parent.component;
@@ -335,6 +340,7 @@ public class FlowLayout implements LayoutManager, Serializable
 
 	return new Dimension (w, h);
       }
+  }
 
   /**
    * @serial The justification alignment of the lines of components, which

libjava/java/awt/GridLayout.java

@@ -153,6 +153,8 @@ public class GridLayout implements LayoutManager, Serializable
    */
   public void layoutContainer (Container parent)
   {
+    synchronized (parent.getTreeLock ())
+      {
 	int num = parent.ncomponents;
 
 	// There's no point, and handling this would mean adding special
@@ -211,6 +213,7 @@ public class GridLayout implements LayoutManager, Serializable
 	      x += hgap + tw;
 	  }
       }
+  }
 
   /** Get the minimum layout size of the container.
    * @param cont The parent container
@@ -301,6 +304,8 @@ public class GridLayout implements LayoutManager, Serializable
   // This method is used to compute the various sizes.
   private Dimension getSize (Container parent, boolean is_min)
   {
+    synchronized (parent.getTreeLock ())
+      {
 	int w = 0, h = 0, num = parent.ncomponents;
 	// This is more efficient than calling getComponents().
 	Component[] comps = parent.component;
@@ -332,6 +337,7 @@ public class GridLayout implements LayoutManager, Serializable
 	h = ins.top + ins.bottom + real_rows * (h + vgap) - vgap;
 	return new Dimension (w, h);
       }
+  }
 
   /**
    * @serial The number of columns in the grid.