Index: javax/swing/BoxLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/BoxLayout.java,v
retrieving revision 1.19
diff -u -r1.19 BoxLayout.java
--- javax/swing/BoxLayout.java	25 Sep 2005 13:57:37 -0000	1.19
+++ javax/swing/BoxLayout.java	27 Sep 2005 20:46:27 -0000
@@ -44,7 +44,6 @@
 import java.awt.Dimension;
 import java.awt.Insets;
 import java.awt.LayoutManager2;
-import java.awt.Rectangle;
 import java.io.Serializable;
 
 /**
@@ -168,7 +167,9 @@
         hReq = SizeRequirements.getAlignedSizeRequirements(hSizeReqs);
         vReq = SizeRequirements.getTiledSizeRequirements(vSizeReqs);
       }
-    return new Dimension(hReq.preferred, vReq.preferred);
+    Insets insets = container.getInsets();
+    return new Dimension(hReq.preferred + insets.left + insets.right,
+                         vReq.preferred + insets.top + insets.bottom);
   }
 
   /**
@@ -222,8 +223,8 @@
     int[] vOffsets = new int[children.length];
 
     Insets insets = container.getInsets();
-    int width = container.getWidth() - insets.left - insets.right - 1;
-    int height = container.getHeight() - insets.top - insets.bottom - 1;
+    int width = container.getWidth() - insets.left - insets.right;
+    int height = container.getHeight() - insets.top - insets.bottom;
     if (isHorizontalIn(container))
       {
         SizeRequirements.calculateTiledPositions(width, null,