Fix for #2294 - Sanity check for setComponentAlignment

svn changeset:6120/svn branch:trunk

2 files changed, 69 insertions, 3 deletions

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2294.java b/src/com/itmill/toolkit/tests/tickets/Ticket2294.java
new file mode 100644
index 0000000000..c77ee155b5
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket2294.java
@@ -0,0 +1,61 @@
+package com.itmill.toolkit.tests.tickets;
+
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.OrderedLayout;
+import com.itmill.toolkit.ui.Window;
+import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+
+public class Ticket2294 extends Application {
+
+    public void init() {
+        Window w = new Window(getClass().getSimpleName());
+        setMainWindow(w);
+        // setTheme("tests-tickets");
+        createUI((OrderedLayout) w.getLayout());
+    }
+
+    private void createUI(OrderedLayout layout) {
+        Label label1 = new Label();
+        Label label2 = null;
+        Label label3 = new Label();
+        String result1 = "";
+        String result2 = "";
+        String result3 = "";
+
+        layout.addComponent(label1);
+        try {
+            layout.setComponentAlignment(label1,
+                    AlignmentHandler.ALIGNMENT_LEFT,
+                    AlignmentHandler.ALIGNMENT_BOTTOM);
+            result1 = "OK";
+        } catch (Exception e) {
+            result1 = "FAILED: " + e.getMessage();
+        }
+
+        try {
+            layout.setComponentAlignment(label2,
+                    AlignmentHandler.ALIGNMENT_LEFT,
+                    AlignmentHandler.ALIGNMENT_BOTTOM);
+            result2 = "FAILED, no exception";
+        } catch (IllegalArgumentException e) {
+            result2 = "OK";
+        } catch (Exception e) {
+            result2 = "FAILED: " + e.getMessage();
+        }
+
+        try {
+            layout.setComponentAlignment(label3,
+                    AlignmentHandler.ALIGNMENT_LEFT,
+                    AlignmentHandler.ALIGNMENT_BOTTOM);
+            result3 = "FAILED, no exception";
+        } catch (IllegalArgumentException e) {
+            result3 = "OK";
+        } catch (Exception e) {
+            result3 = "FAILED: " + e.getMessage();
+        }
+
+        label1.setValue("Result 1: " + result1 + ", result 2: " + result2
+                + ", result 3: " + result3);
+    }
+}
diff --git a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
index cb3d277222..fe9d897d71 100644
--- a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
+++ b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
@@ -235,9 +235,14 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      */
     public void setComponentAlignment(Component childComponent,
             int horizontalAlignment, int verticalAlignment) {
-        componentToAlignment.put(childComponent, new Integer(
-                horizontalAlignment + verticalAlignment));
-        requestRepaint();
+        if (components.contains(childComponent)) {
+            componentToAlignment.put(childComponent, new Integer(
+                    horizontalAlignment + verticalAlignment));
+            requestRepaint();
+        } else {
+            throw new IllegalArgumentException(
+                    "Component must be added to layout before using setComponentAlignment()");
+        }
     }
 
     /*