+2005-04-18 Roman Kennke <roman@kennke.org>
+
+ * java/awt/BorderLayout.java
+ (calcSize): Check for overflow when component sizes are added.
+
2005-04-18 Robert Schuster <thebohemian@gmx.net>
* java/awt/AWTEvent.java (toString): Added case
Dimension cdim = calcCompSize(center, what);
int width = edim.width + cdim.width + wdim.width + (hgap * 2);
+ // check for overflow
+ if (width < edim.width || width < cdim.width || width < cdim.width)
+ width = Integer.MAX_VALUE;
+
if (ndim.width > width)
width = ndim.width;
if (sdim.width > width)
if (wdim.height > height)
height = wdim.height;
- height += (ndim.height + sdim.height + (vgap * 2) + ins.top + ins.bottom);
+ int addedHeight = height + (ndim.height + sdim.height + (vgap * 2)
+ + ins.top + ins.bottom);
+ // check for overflow
+ if (addedHeight < height)
+ height = Integer.MAX_VALUE;
+ else
+ height = addedHeight;
return(new Dimension(width, height));
}