fixes #2432, AlignmentHandler methods now symmetric + saner usage overall

svn changeset:6473/svn branch:trunk

1 files changed, 23 insertions, 11 deletions

diff --git a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
index 5fe3d616d9..6e430c98f2 100644
--- a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
+++ b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
@@ -17,19 +17,19 @@ import com.itmill.toolkit.terminal.Sizeable;
 public abstract class AbstractOrderedLayout extends AbstractLayout implements
         Layout.AlignmentHandler, Layout.SpacingHandler {
 
-    private static final int ALIGNMENT_DEFAULT = ALIGNMENT_TOP + ALIGNMENT_LEFT;
+    private static final Alignment ALIGNMENT_DEFAULT = Alignment.TOP_LEFT;
 
     /**
      * Custom layout slots containing the components.
      */
-    protected LinkedList components = new LinkedList();
+    protected LinkedList<Component> components = new LinkedList<Component>();
 
     /* Child component alignments */
 
     /**
      * Mapping from components to alignments (horizontal + vertical).
      */
-    private final Map componentToAlignment = new HashMap();
+    private final Map<Component, Alignment> componentToAlignment = new HashMap<Component, Alignment>();
 
     private final Map<Component, Float> componentToExpandRatio = new HashMap<Component, Float>();
 
@@ -157,7 +157,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
                 // Paint child component UIDL
                 c.paint(target);
                 alignmentsArray[index] = String
-                        .valueOf(getComponentAlignment(c));
+                        .valueOf(getComponentAlignment(c).getBitMask());
                 if (!equallyDivided) {
                     int myRatio = Math.round((getExpandRatio(c) / sum) * 1000);
                     expandRatioArray[index] = myRatio;
@@ -240,7 +240,8 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     public void setComponentAlignment(Component childComponent,
             int horizontalAlignment, int verticalAlignment) {
         if (components.contains(childComponent)) {
-            componentToAlignment.put(childComponent, new Integer(
+            // Alignments are bit masks
+            componentToAlignment.put(childComponent, new Alignment(
                     horizontalAlignment + verticalAlignment));
             requestRepaint();
         } else {
@@ -249,6 +250,18 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
         }
     }
 
+    public void setComponentAlignment(Component childComponent,
+            Alignment alignment) {
+        if (components.contains(childComponent)) {
+            componentToAlignment.put(childComponent, alignment);
+            requestRepaint();
+        } else {
+            throw new IllegalArgumentException(
+                    "Component must be added to layout before using setComponentAlignment()");
+        }
+
+    }
+
     /*
      * (non-Javadoc)
      * 
@@ -256,13 +269,12 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      * com.itmill.toolkit.ui.Layout.AlignmentHandler#getComponentAlignment(com
      * .itmill.toolkit.ui.Component)
      */
-    public int getComponentAlignment(Component childComponent) {
-        final Integer bitMask = (Integer) componentToAlignment
-                .get(childComponent);
-        if (bitMask != null) {
-            return bitMask.intValue();
-        } else {
+    public Alignment getComponentAlignment(Component childComponent) {
+        Alignment alignment = componentToAlignment.get(childComponent);
+        if (alignment == null) {
             return ALIGNMENT_DEFAULT;
+        } else {
+            return alignment;
         }
     }