2005-10-19 Roman Kennke <kennke@aicas.com>

	* javax/swing/OverlayLayout.java
	(checkLayout): Respect the container's insets correctly.

2 files changed, 24 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f2d3cdab2..8adbb5b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2005-10-19  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/OverlayLayout.java
+	(checkLayout): Respect the container's insets correctly.
+
+2005-10-19  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/JLabel.java
+	(setText): Call revalidate() and repaint().
+
+2005-10-19  Roman Kennke  <kennke@aicas.com>
+
+	* javax/swing/JEditorPane.java
+	Added comments to empty blocks.
+	(read): Implemented this previously stubbed method.
+
+2005-10-19  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/JComboBox.java
 	Added comments to empty blocks.
 	(writeObject): Removed unnecessary serialization method.
diff --git a/javax/swing/OverlayLayout.java b/javax/swing/OverlayLayout.java
index a34cb2ef1..56b8c8bb6 100644
--- a/javax/swing/OverlayLayout.java
+++ b/javax/swing/OverlayLayout.java
@@ -41,6 +41,7 @@ import java.awt.AWTError;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.Insets;
 import java.awt.LayoutManager2;
 import java.io.Serializable;
 
@@ -397,9 +398,14 @@ public class OverlayLayout implements LayoutManager2, Serializable
         offsetsY = new int[len];
         spansX = new int[len];
         spansY = new int[len];
-        SizeRequirements.calculateAlignedPositions(target.getWidth(), xTotal,
+
+        Insets in = target.getInsets();
+        int width = target.getWidth() - in.left - in.right;
+        int height = target.getHeight() - in.top - in.bottom;
+
+        SizeRequirements.calculateAlignedPositions(width, xTotal,
                                                    xChildren, offsetsX, spansX);
-        SizeRequirements.calculateAlignedPositions(target.getHeight(), yTotal,
+        SizeRequirements.calculateAlignedPositions(height, yTotal,
                                                    yChildren, offsetsY, spansY);
       }
   }