diff options
| -rw-r--r-- | server/src/com/vaadin/ui/AbsoluteLayout.java | 3 | ||||
| -rw-r--r-- | server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java | 43 |
2 files changed, 46 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java index 303e8efd6b..c62da24612 100644 --- a/server/src/com/vaadin/ui/AbsoluteLayout.java +++ b/server/src/com/vaadin/ui/AbsoluteLayout.java @@ -154,6 +154,9 @@ public class AbsoluteLayout extends AbstractLayout implements */ private void addComponent(Component c, ComponentPosition position) throws IllegalArgumentException { + if (equals(c.getParent())) { + removeComponent(c); + } /* * Create position instance and add it to componentToCoordinates map. We * need to do this before we call addComponent so the attachListeners diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java new file mode 100644 index 0000000000..96f27851cf --- /dev/null +++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java @@ -0,0 +1,43 @@ +/* + * Copyright 2000-2014 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.absolutelayout; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +import com.vaadin.ui.AbsoluteLayout; +import com.vaadin.ui.Button; + +/** + * Tests adding of components to {@link AbsoluteLayout} + * + * @since + * @author Vaadin Ltd + */ +public class AddComponentsTest { + + @Test + public void testAddExistingWithDifferentPosition() { + AbsoluteLayout layout = new AbsoluteLayout(); + Button b1 = new Button("OK"); + layout.addComponent(b1, "top: 100px; left: 0px;"); + assertEquals(1, layout.getComponentCount()); + layout.addComponent(b1, "bottom: 0px; right: 0px;"); + assertEquals(1, layout.getComponentCount()); + } + +} |