Fixes #1913 : Test #1710 Layout alignment center|right broken

svn changeset:5078/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
index 7c9097dfb1326194956cbda5a5f8a3f7e0023555..d6908294f4e6d7a638a760b3a1361fabcf0193ee 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
@@ -209,7 +209,7 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
     public class LayoutTestingPanel extends Panel {\r
 \r
         Layout testedLayout;\r
-        OrderedLayout internalLayout = new OrderedLayout();\r
+\r
         OrderedLayout controls = new OrderedLayout(\r
                 OrderedLayout.ORIENTATION_HORIZONTAL);\r
         Button marginLeft = new Button("m-left", false);\r
@@ -217,9 +217,11 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
         Button marginTop = new Button("m-top", false);\r
         Button marginBottom = new Button("m-bottom", false);\r
         Button spacing = new Button("spacing", false);\r
+        OrderedLayout testPanelLayout = new OrderedLayout();\r
 \r
         LayoutTestingPanel(String caption, Layout layout) {\r
             super(caption);\r
+            OrderedLayout internalLayout = new OrderedLayout();\r
             setLayout(internalLayout);\r
             testedLayout = layout;\r
             Panel controlWrapper = new Panel();\r
@@ -228,8 +230,9 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
             controlWrapper.setScrollable(true);\r
             controlWrapper.setStyleName("controls");\r
             internalLayout.addComponent(controlWrapper);\r
-            Panel testPanel = new Panel(testedLayout);\r
+            Panel testPanel = new Panel(testPanelLayout);\r
             testPanel.setStyleName("testarea");\r
+            testPanelLayout.addComponent(testedLayout);\r
             internalLayout.addComponent(testPanel);\r
             internalLayout.setMargin(true);\r
             internalLayout.setSpacing(true);\r
@@ -353,7 +356,7 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
 \r
             lAlign.addListener(new Property.ValueChangeListener() {\r
                 public void valueChange(ValueChangeEvent event) {\r
-                    internalLayout.setComponentAlignment(testedLayout,\r
+                    testPanelLayout.setComponentAlignment(testedLayout,\r
                             ((Integer) lAlign.getValue()).intValue(),\r
                             OrderedLayout.ALIGNMENT_TOP);\r
                 }\r