Hi,
I fixed the methods getAlignmentX() and getAlignmentY() in
java.awt.Container. These should refer to the layout manager's
layoutAlignmentX/Y() method if its a LayoutManager2. This is backed by a
Mauve test that I committed.
2005-11-08 Roman Kennke <[EMAIL PROTECTED]>
* 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 LayoutManager2.
/Roman
Index: java/awt/Container.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.66
diff -u -r1.66 Container.java
--- java/awt/Container.java 2 Nov 2005 18:03:26 -0000 1.66
+++ java/awt/Container.java 8 Nov 2005 13:23:55 -0000
@@ -738,7 +738,16 @@
*/
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 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;
}
/**
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
