Pick changes from 7.7.7 (#8577)

* Fix java packaging order (#106)

Closes vaadin/archetypes#113

* Use proper UTF-8 encoding for Content-Disposition filenames (#19527) (#6607)

* Enable changing the backing bean for BeanItem (#4302) (#77)

When storing a bean to the database, you typically get a new and updated
bean instance back. By allowing to change the bean instance, we make it
possible to just update the single BeanItem instance which can be used
in many places.

* Make AtmospherePushConnection methods public (#7973)

There is no sensible way to use a custom version of APC, so protected
access does not help in any way to access the underlying resource and/or
connected UI.

* Use correct indexes in multiselect checkboxes after removing rows (#8072)

Fixes #8011

* Fix removal of hidden Grid columns (#8071)

Fixes #8018

* Call error handler for exceptions in UI.init() (#8055)

Fixes #4995

* Render font icon correctly on the 'more' menu item (#8126)

* Render font icon correctly on the 'more' menu item

Fixes #8125

* Reopen Grid details on attach, fixes #8015 (#8074)

Fixes #8015

* Fix broken Grid tests after picking changes from 7.7.7

Removed duplicate setDetailsVisible calls from onDetach

* Correctly detach components in merged cells when a static row is removed (#8142)

Fixes #8140

8 files changed, 300 insertions, 9 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
index 8bba865ffc..a286cdc3b2 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Set;
 
 import com.vaadin.data.util.BeanUtil;
+import com.vaadin.v7.data.Property;
 
 /**
  * A wrapper class for adding the Item interface to any Java Bean.
@@ -41,7 +42,7 @@ public class BeanItem<BT> extends PropertysetItem {
     /**
      * The bean which this Item is based on.
      */
-    private final BT bean;
+    private BT bean;
 
     /**
      * <p>
@@ -264,4 +265,46 @@ public class BeanItem<BT> extends PropertysetItem {
         return bean;
     }
 
+    /**
+     * Changes the Java Bean this item is based on.
+     * <p>
+     * This will cause any existing properties to be re-mapped to the new bean.
+     * Any added custom properties which are not of type {@link MethodProperty}
+     * or {@link NestedMethodProperty} will not be updated to reflect the change
+     * of bean.
+     * <p>
+     * Changing the bean will fire value change events for all properties of
+     * type {@link MethodProperty} or {@link NestedMethodProperty}.
+     * 
+     * @param bean
+     *            The new bean to use for this item, not <code>null</code>
+     */
+    public void setBean(BT bean) {
+        if (bean == null) {
+            throw new IllegalArgumentException("Bean cannot be null");
+        }
+
+        if (getBean().getClass() != bean.getClass()) {
+            throw new IllegalArgumentException(
+                    "The new bean class " + bean.getClass().getName()
+                            + " does not match the old bean class "
+                            + getBean().getClass());
+        }
+
+        // Remap properties
+        for (Object propertyId : getItemPropertyIds()) {
+            Property p = getItemProperty(propertyId);
+            if (p instanceof MethodProperty) {
+                MethodProperty mp = (MethodProperty) p;
+                assert (mp.getInstance() == getBean());
+                mp.setInstance(bean);
+            } else if (p instanceof NestedMethodProperty) {
+                NestedMethodProperty nmp = (NestedMethodProperty) p;
+                assert (nmp.getInstance() == getBean());
+                nmp.setInstance(bean);
+            }
+        }
+
+        this.bean = bean;
+    }
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
index ba5edbb146..e3651d0272 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
@@ -769,6 +769,37 @@ public class MethodProperty<T> extends AbstractProperty<T> {
         super.fireValueChange();
     }
 
+    /**
+     * The instance used by this property
+     *
+     * @return the instance used for fetching the property value
+     */
+    public Object getInstance() {
+        return instance;
+    }
+
+    /**
+     * Sets the instance used by this property.
+     * <p>
+     * The new instance must be of the same type as the old instance
+     * <p>
+     * To be consistent with {@link #setValue(Object)}, this method will fire a
+     * value change event even if the value stays the same
+     *
+     * @param instance
+     *            the instance to use
+     */
+    public void setInstance(Object instance) {
+        if (this.instance.getClass() != instance.getClass()) {
+            throw new IllegalArgumentException("The new instance is of type "
+                    + instance.getClass().getName()
+                    + " which does not match the old instance type "
+                    + this.instance.getClass().getName());
+        }
+        this.instance = instance;
+        fireValueChange();
+    }
+
     private static final Logger getLogger() {
         return Logger.getLogger(MethodProperty.class.getName());
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
index 3f9236c4ac..ab23d07551 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
@@ -193,9 +193,10 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
 
     /**
      * Gets the value stored in the Property. The value is resolved by calling
-     * the specified getter method with the argument specified at instantiation.
+     * the specified getter methods on the current instance:
      *
      * @return the value of the Property
+     * @see #getInstance()
      */
     @Override
     public T getValue() {
@@ -267,4 +268,35 @@ public class NestedMethodProperty<T> extends AbstractProperty<T> {
         return Collections.unmodifiableList(getMethods);
     }
 
+    /**
+     * The instance used by this property
+     * 
+     * @return the instance used for fetching the property value
+     */
+    public Object getInstance() {
+        return instance;
+    }
+
+    /**
+     * Sets the instance used by this property.
+     * <p>
+     * The new instance must be of the same type as the old instance
+     * <p>
+     * To be consistent with {@link #setValue(Object)}, this method will fire a
+     * value change event even if the value stays the same
+     * 
+     * @param instance
+     *            the instance to use
+     */
+    public void setInstance(Object instance) {
+        if (this.instance.getClass() != instance.getClass()) {
+            throw new IllegalArgumentException("The new instance is of type "
+                    + instance.getClass().getName()
+                    + " which does not match the old instance type "
+                    + this.instance.getClass().getName());
+        }
+        this.instance = instance;
+        fireValueChange();
+    }
+
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index cabba91d31..ee9b968c00 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -2556,6 +2556,9 @@ public class Grid extends AbstractComponent
                 for (CELLTYPE cell : cells.values()) {
                     cell.detach();
                 }
+                for (CELLTYPE cell : cellGroups.values()) {
+                    cell.detach();
+                }
             }
         }
 
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
index cc5d72f3df..a9eb3d740b 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java
@@ -386,4 +386,41 @@ public class BeanItemTest {
         // Should not be exception
         property.setValue(null);
     }
+
+    @Test
+    public void testChangeBean() {
+        BeanItem<MyClass> beanItem = new BeanItem<BeanItemTest.MyClass>(
+                new MyClass("Foo"));
+        beanItem.setBean(new MyClass("Bar"));
+        Assert.assertEquals("Bar", beanItem.getItemProperty("name").getValue());
+    }
+
+    @Test
+    public void testChangeBeanNestedProperty() {
+        BeanItem<MyClass> beanItem = new BeanItem<BeanItemTest.MyClass>(
+                new MyClass("Foo"));
+        beanItem.setBean(new MyClass("Bar"));
+        Assert.assertEquals("Bar", beanItem.getItemProperty("name").getValue());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testChangeBeanToIncompatibleOne() {
+        BeanItem<Object> beanItem = new BeanItem<Object>(new MyClass("Foo"));
+        beanItem.setBean(new Generic<String>());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testChangeBeanToSubclass() {
+        BeanItem<MyClass> beanItem = new BeanItem<BeanItemTest.MyClass>(
+                new MyClass("Foo"));
+        beanItem.setBean(new MyClass("Bar"));
+        beanItem.setBean(new MyClass2("foo"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testChangeBeanToNull() {
+        BeanItem<Object> beanItem = new BeanItem<Object>(new MyClass("Foo"));
+        beanItem.setBean(null);
+    }
+
 }
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/MethodPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/MethodPropertyTest.java
new file mode 100644
index 0000000000..61c66b9167
--- /dev/null
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/MethodPropertyTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.v7.data.util;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.vaadin.v7.data.util.NestedMethodPropertyTest.Address;
+
+public class MethodPropertyTest {
+
+    private Address testObject;
+
+    @Before
+    public void setup() {
+        testObject = new Address("some street", 123);
+    }
+
+    @Test
+    public void getValue() {
+        MethodProperty<String> mp = new MethodProperty<String>(testObject,
+                "street");
+        Assert.assertEquals("some street", mp.getValue());
+    }
+
+    @Test
+    public void getValueAfterBeanUpdate() {
+        MethodProperty<String> mp = new MethodProperty<String>(testObject,
+                "street");
+        testObject.setStreet("Foo street");
+        Assert.assertEquals("Foo street", mp.getValue());
+    }
+
+    @Test
+    public void setValue() {
+        MethodProperty<String> mp = new MethodProperty<String>(testObject,
+                "street");
+        mp.setValue("Foo street");
+        Assert.assertEquals("Foo street", testObject.getStreet());
+    }
+
+    @Test
+    public void changeInstance() {
+        MethodProperty<String> mp = new MethodProperty<String>(testObject,
+                "street");
+        Address newStreet = new Address("new street", 999);
+        mp.setInstance(newStreet);
+        Assert.assertEquals("new street", mp.getValue());
+        Assert.assertEquals("some street", testObject.getStreet());
+
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void changeInstanceToIncompatible() {
+        MethodProperty<String> mp = new MethodProperty<String>(testObject,
+                "street");
+        mp.setInstance("foobar");
+
+    }
+
+}
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java
index a5103e0e0a..9a47e395e2 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java
@@ -348,4 +348,27 @@ public class NestedMethodPropertyTest {
         Assert.assertTrue(booleanProperty.isReadOnly());
     }
 
+    @Test
+    public void testChangeInstance() {
+        NestedMethodProperty<String> streetProperty = new NestedMethodProperty<String>(
+                vaadin, "manager.address.street");
+
+        Address somewhere = new Address("The street", 1234);
+        Person someone = new Person("Someone", somewhere);
+        Team someteam = new Team("The team", someone);
+        streetProperty.setInstance(someteam);
+
+        Assert.assertEquals("The street", streetProperty.getValue());
+        Assert.assertEquals("Ruukinkatu 2-4", vaadin.getManager().getAddress()
+                .getStreet());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testChangeInstanceToIncompatible() {
+        NestedMethodProperty<String> streetProperty = new NestedMethodProperty<String>(
+                vaadin, "manager.address.street");
+
+        streetProperty.setInstance("bar");
+    }
+
 }
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java
index 7a599f2745..2d8edddac1 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java
@@ -18,6 +18,7 @@ package com.vaadin.v7.tests.server.component.grid;
 import java.util.Iterator;
 
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.ui.Component;
@@ -28,12 +29,19 @@ import com.vaadin.v7.ui.Grid.HeaderCell;
 
 public class GridChildrenTest {
 
-    @Test
-    public void componentsInMergedHeader() {
-        Grid grid = new Grid();
+    private Grid grid;
+
+    @Before
+    public void createGrid() {
+        grid = new Grid();
         grid.addColumn("foo");
         grid.addColumn("bar");
         grid.addColumn("baz");
+
+    }
+
+    @Test
+    public void iteratorFindsComponentsInMergedHeader() {
         HeaderCell merged = grid.getDefaultHeaderRow().join("foo", "bar",
                 "baz");
         Label label = new Label();
@@ -44,16 +52,55 @@ public class GridChildrenTest {
     }
 
     @Test
+    public void removeComponentInMergedHeaderCell() {
+        HeaderCell merged = grid.getDefaultHeaderRow().join("foo", "bar",
+                "baz");
+        Label label = new Label();
+        merged.setComponent(label);
+        Assert.assertEquals(grid, label.getParent());
+        merged.setText("foo");
+        Assert.assertNull(label.getParent());
+    }
+
+    @Test
+    public void removeHeaderWithComponentInMergedHeaderCell() {
+        HeaderCell merged = grid.getDefaultHeaderRow().join("foo", "bar",
+                "baz");
+        Label label = new Label();
+        merged.setComponent(label);
+        Assert.assertEquals(grid, label.getParent());
+        grid.removeHeaderRow(0);
+        Assert.assertNull(label.getParent());
+    }
+
+    @Test
+    public void removeComponentInMergedFooterCell() {
+        FooterCell merged = grid.addFooterRowAt(0).join("foo", "bar", "baz");
+        Label label = new Label();
+        merged.setComponent(label);
+        Assert.assertEquals(grid, label.getParent());
+        merged.setText("foo");
+        Assert.assertNull(label.getParent());
+    }
+
+    @Test
+    public void removeFooterWithComponentInMergedFooterCell() {
+        FooterCell merged = grid.addFooterRowAt(0).join("foo", "bar", "baz");
+        Label label = new Label();
+        merged.setComponent(label);
+        Assert.assertEquals(grid, label.getParent());
+        grid.removeFooterRow(0);
+        Assert.assertNull(label.getParent());
+    }
+
+    @Test
     public void componentsInMergedFooter() {
-        Grid grid = new Grid();
-        grid.addColumn("foo");
-        grid.addColumn("bar");
-        grid.addColumn("baz");
         FooterCell merged = grid.addFooterRowAt(0).join("foo", "bar", "baz");
         Label label = new Label();
         merged.setComponent(label);
         Iterator<Component> i = grid.iterator();
         Assert.assertEquals(label, i.next());
         Assert.assertFalse(i.hasNext());
+        Assert.assertEquals(grid, label.getParent());
     }
 }