Another test case for #1966

svn changeset:5314/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
index 45e9705806aea00e393245f8048fc61b39e5322e..1092c4bac86c699c28b930ccda32df1ad5f93274 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
@@ -32,7 +32,7 @@ public class Ticket1966 extends Application {
     }\r
 \r
     public void init() {\r
-        Window w = new Window(getClass().getSimpleName());\r
+        Window w = new Window(getClass().getName());\r
         setMainWindow(w);\r
         // setTheme("tests-tickets");\r
         w.setLayout(new GridLayout(2, 2));\r

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
new file mode 100644 (file)
index 0000000..b4ec296
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
@@ -0,0 +1,185 @@
+package com.itmill.toolkit.tests.tickets;\r
+\r
+import java.util.HashMap;\r
+import java.util.Map;\r
+\r
+import com.itmill.toolkit.Application;\r
+import com.itmill.toolkit.ui.Button;\r
+import com.itmill.toolkit.ui.ExpandLayout;\r
+import com.itmill.toolkit.ui.GridLayout;\r
+import com.itmill.toolkit.ui.Layout;\r
+import com.itmill.toolkit.ui.OrderedLayout;\r
+import com.itmill.toolkit.ui.Panel;\r
+import com.itmill.toolkit.ui.Window;\r
+import com.itmill.toolkit.ui.Layout.AlignmentHandler;\r
+\r
+public class Ticket1966_2 extends Application {\r
+\r
+    private static final int LEFT = OrderedLayout.ALIGNMENT_LEFT;\r
+    private static final int CENTER = OrderedLayout.ALIGNMENT_HORIZONTAL_CENTER;\r
+    private static final int RIGHT = OrderedLayout.ALIGNMENT_RIGHT;\r
+    private static final int TOP = OrderedLayout.ALIGNMENT_TOP;\r
+    private static final int VCENTER = OrderedLayout.ALIGNMENT_VERTICAL_CENTER;\r
+    private static final int BOTTOM = OrderedLayout.ALIGNMENT_BOTTOM;\r
+\r
+    private static Map names = new HashMap();\r
+    static {\r
+        names.put(new Integer(LEFT), "Left");\r
+        names.put(new Integer(CENTER), "Center");\r
+        names.put(new Integer(RIGHT), "Right");\r
+        names.put(new Integer(BOTTOM), "Bottom");\r
+        names.put(new Integer(VCENTER), "Vcenter");\r
+        names.put(new Integer(TOP), "Top");\r
+    }\r
+\r
+    public void init() {\r
+        Window w = new Window(getClass().getName());\r
+        setMainWindow(w);\r
+        w.setLayout(new GridLayout(2, 2));\r
+\r
+        // Panel p = new Panel("test");\r
+        // p.setWidth(500);\r
+        // p.setHeight(500);\r
+        // p.setLayout(new GridLayout(1, 2));\r
+        // p.getLayout().setSizeFull();\r
+        //\r
+        // p.addComponent(new Button("asjkdfhakshdf"));\r
+        // p.addComponent(new Button("öalijgto8aq5"));\r
+\r
+        // GridLayout gl = new GridLayout(4, 1);\r
+        // // gl.setCaption("Vertical");\r
+        // gl.setWidth("100%");\r
+        // gl.setHeight(500);\r
+\r
+        // addButtons(gl);\r
+        // gl.addComponent(new Label("abc"));\r
+        // p.addComponent(gl);\r
+\r
+        // w.getLayout().addComponent(p);\r
+        createUI(w.getLayout());\r
+    }\r
+\r
+    private void createUI(Layout layout) {\r
+        orderedLayout(layout);\r
+        gridLayout(layout);\r
+        expandLayout(layout);\r
+    }\r
+\r
+    private void gridLayout(Layout layout) {\r
+        Panel p = new Panel("GridLayout");\r
+        p.setWidth(500);\r
+        p.setHeight(500);\r
+        p.getLayout().setSizeFull();\r
+        layout.addComponent(p);\r
+\r
+        GridLayout gl = new GridLayout(1, 4);\r
+        gl.setCaption("Horizontal");\r
+        gl.setWidth("100%");\r
+\r
+        // Button b;\r
+\r
+        // b = new Button("Wide button");\r
+        // b.setWidth("500");\r
+        // gl.addComponent(b);\r
+\r
+        addButtons(gl);\r
+\r
+        p.addComponent(gl);\r
+\r
+        /* VERTICAL */\r
+\r
+        gl = new GridLayout(4, 1);\r
+        // gl.setCaption("Vertical");\r
+        gl.setHeight("100%");\r
+        addButtons(gl);\r
+\r
+        // Button b = new Button("High button");\r
+        // b.setHeight(200);\r
+        // gl.addComponent(b);\r
+\r
+        p.addComponent(gl);\r
+\r
+    }\r
+\r
+    private void orderedLayout(Layout layout) {\r
+        Panel p = new Panel("OrderedLayout");\r
+        p.setWidth(500);\r
+        p.setHeight(500);\r
+        p.getLayout().setWidth("100%");\r
+        layout.addComponent(p);\r
+\r
+        OrderedLayout ol = new OrderedLayout();\r
+        // ol.setCaption("Horizontal");\r
+        ol.setWidth("100%");\r
+        addButtons(ol);\r
+        p.addComponent(ol);\r
+\r
+        /* VERTICAL */\r
+\r
+        ol = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL);\r
+        // ol.setCaption("Vertical");\r
+        ol.setHeight(200);\r
+        addButtons(ol);\r
+        // Button b = new Button("High button");\r
+        // b.setHeight(200);\r
+        // ol.addComponent(b);\r
+        p.addComponent(ol);\r
+\r
+    }\r
+\r
+    private void expandLayout(Layout layout) {\r
+        Panel p = new Panel("ExpandLayout");\r
+        layout.addComponent(p);\r
+        p.getLayout().setWidth("500");\r
+        p.getLayout().setHeight("400");\r
+\r
+        ExpandLayout el = new ExpandLayout(ExpandLayout.ORIENTATION_VERTICAL);\r
+        // el.setCaption("Horizontal");\r
+        // el.setSizeUndefined();\r
+        // el.setWidth("100%");\r
+        // ol.setWidth("100%");\r
+        Button b;\r
+\r
+        b = new Button("Wide button");\r
+        b.setWidth("100%");\r
+        // b.setHeight(200);\r
+        // el.expand(b);\r
+        // el.addComponent(b);\r
+\r
+        addButtons(el);\r
+        p.addComponent(el);\r
+\r
+        /* VERTICAL */\r
+\r
+        el = new ExpandLayout(ExpandLayout.ORIENTATION_HORIZONTAL);\r
+        // el.setHeight(400);\r
+        // el.setWidth("100%");\r
+        // el.setCaption("Vertical");\r
+\r
+        addButtons(el);\r
+        // b = new Button("High button");\r
+        // el.expand(b);\r
+        // b.setHeight(100);\r
+        // el.addComponent(b);\r
+\r
+        p.addComponent(el);\r
+\r
+    }\r
+\r
+    private void addButtons(AlignmentHandler ol) {\r
+        ol.addComponent(getButton(ol, LEFT, TOP));\r
+        ol.addComponent(getButton(ol, CENTER, VCENTER));\r
+        ol.addComponent(getButton(ol, RIGHT, BOTTOM));\r
+\r
+    }\r
+\r
+    private Button getButton(AlignmentHandler l, int hAlign, int vAlign) {\r
+        Button b = new Button(names.get(new Integer(hAlign)) + " - "\r
+                + names.get(new Integer(vAlign)));\r
+        // b.setWidth("100");\r
+        l.setComponentAlignment(b, hAlign, vAlign);\r
+\r
+        return b;\r
+\r
+    }\r
+}\r