2005-11-08 Roman Kennke <kennke@aicas.com>

	* java/awt/Container.java
	(getAlignmentX): Refer to the layout managers layoutAlignmentX
	property if layout manager is a LayoutManager2.
	(getAlignmentY): Refer to the layout managers layoutAlignmentY
	property if layout manager is a

1 files changed, 20 insertions, 2 deletions

diff --git a/java/awt/Container.java b/java/awt/Container.java
index 42e5235df..91d63c653 100644
--- a/java/awt/Container.java
+++ b/java/awt/Container.java
@@ -738,7 +738,16 @@ public class Container extends Component
    */
   public float getAlignmentX()
   {
-    return super.getAlignmentX();
+    LayoutManager layout = getLayout();
+    float alignmentX = 0.0F;
+    if (layout != null && layout instanceof LayoutManager2)
+      {
+        LayoutManager2 lm2 = (LayoutManager2) layout;
+        alignmentX = lm2.getLayoutAlignmentX(this);
+      }
+    else
+      alignmentX = super.getAlignmentX();
+    return alignmentX;
   }
 
   /**
@@ -750,7 +759,16 @@ public class Container extends Component
    */
   public float getAlignmentY()
   {
-    return super.getAlignmentY();
+    LayoutManager layout = getLayout();
+    float alignmentY = 0.0F;
+    if (layout != null && layout instanceof LayoutManager2)
+      {
+        LayoutManager2 lm2 = (LayoutManager2) layout;
+        alignmentY = lm2.getLayoutAlignmentY(this);
+      }
+    else
+      alignmentY = super.getAlignmentY();
+    return alignmentY;
   }
 
   /**