Apply abstract ordered layout settings for replaced component (#13568).

Change-Id: If6863d518d902ee48bb73fbb0c9b3725cb7c8707

2 files changed, 95 insertions, 0 deletions

diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
index c9eb756daa..f5fd4d7bfc 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -213,8 +213,12 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
         if (oldLocation == -1) {
             addComponent(newComponent);
         } else if (newLocation == -1) {
+            Alignment alignment = getComponentAlignment(oldComponent);
+            float expandRatio = getExpandRatio(oldComponent);
+
             removeComponent(oldComponent);
             addComponent(newComponent, oldLocation);
+            applyLayoutSettings(newComponent, alignment, expandRatio);
         } else {
             // Both old and new are in the layout
             if (oldLocation > newLocation) {
@@ -444,4 +448,10 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
         defaultComponentAlignment = defaultAlignment;
     }
 
+    private void applyLayoutSettings(Component target, Alignment alignment,
+            float expandRatio) {
+        setComponentAlignment(target, alignment);
+        setExpandRatio(target, expandRatio);
+    }
+
 }
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplace.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplace.java
new file mode 100644
index 0000000000..0af21d8cb8
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplace.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.server.component.abstractorderedlayout;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.AbstractOrderedLayout;
+import com.vaadin.ui.Alignment;
+
+/**
+ * Tests for abstract layout settings which should be preserved on replace
+ * component
+ * 
+ * @since 7.2
+ * @author Vaadin Ltd
+ */
+public class LayoutSettingsOnReplace {
+
+    @Test
+    public void testExpandRatio() {
+        AbstractOrderedLayout layout = new AbstractOrderedLayout() {
+        };
+
+        AbstractComponent first = new AbstractComponent() {
+        };
+        AbstractComponent second = new AbstractComponent() {
+        };
+
+        layout.addComponent(first);
+        layout.addComponent(second);
+
+        int ratio = 2;
+        layout.setExpandRatio(first, ratio);
+        layout.setExpandRatio(second, 1);
+
+        AbstractComponent replace = new AbstractComponent() {
+        };
+        layout.replaceComponent(first, replace);
+
+        Assert.assertEquals("Expand ratio for replaced component is not "
+                + "the same as for previous one", ratio,
+                layout.getExpandRatio(replace), 0.0001);
+    }
+
+    @Test
+    public void testAlignment() {
+        AbstractOrderedLayout layout = new AbstractOrderedLayout() {
+        };
+
+        AbstractComponent first = new AbstractComponent() {
+        };
+        AbstractComponent second = new AbstractComponent() {
+        };
+
+        layout.addComponent(first);
+        layout.addComponent(second);
+
+        Alignment alignment = Alignment.BOTTOM_RIGHT;
+        layout.setComponentAlignment(first, alignment);
+        layout.setComponentAlignment(second, Alignment.MIDDLE_CENTER);
+
+        AbstractComponent replace = new AbstractComponent() {
+        };
+        layout.replaceComponent(first, replace);
+
+        Assert.assertEquals("Alignment for replaced component is not "
+                + "the same as for previous one", alignment,
+                layout.getComponentAlignment(replace));
+    }
+}