Merge remote branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
	src/com/vaadin/terminal/gwt/client/ui/VTree.java
	src/com/vaadin/terminal/gwt/client/ui/VWindow.java
	src/com/vaadin/ui/AbstractField.java

2 files changed, 130 insertions, 3 deletions

diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index fac9fc98db..b9621d518a 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
@@ -1,14 +1,19 @@
 package com.vaadin.data.util.sqlcontainer;
 
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.Arrays;
 
+import com.vaadin.data.Property.ReadOnlyException;
+import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException;
+import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
+
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.Property.ReadOnlyException;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException;
-
 public class ColumnPropertyTest {
 
     @Test
@@ -175,4 +180,53 @@ public class ColumnPropertyTest {
         cp.setValue(null);
         Assert.assertNull(cp.getValue());
     }
+
+    @Test
+    public void setValue_sendsItemChangeNotification() throws SQLException {
+
+        class TestContainer extends SQLContainer {
+            Object value = null;
+            boolean modified = false;
+
+            public TestContainer(QueryDelegate delegate) throws SQLException {
+                super(delegate);
+            }
+
+            @Override
+            public void itemChangeNotification(RowItem changedItem) {
+                ColumnProperty cp = (ColumnProperty) changedItem
+                        .getItemProperty("NAME");
+                value = cp.getValue();
+                modified = cp.isModified();
+            }
+        }
+
+        ColumnProperty property = new ColumnProperty("NAME", false, true, true,
+                "Ville", String.class);
+
+        Statement statement = EasyMock.createNiceMock(Statement.class);
+        EasyMock.replay(statement);
+
+        ResultSetMetaData metadata = EasyMock
+                .createNiceMock(ResultSetMetaData.class);
+        EasyMock.replay(metadata);
+
+        ResultSet resultSet = EasyMock.createNiceMock(ResultSet.class);
+        EasyMock.expect(resultSet.getStatement()).andReturn(statement);
+        EasyMock.expect(resultSet.getMetaData()).andReturn(metadata);
+        EasyMock.replay(resultSet);
+
+        QueryDelegate delegate = EasyMock.createNiceMock(QueryDelegate.class);
+        EasyMock.expect(delegate.getResults(0, 1)).andReturn(resultSet);
+        EasyMock.replay(delegate);
+
+        TestContainer container = new TestContainer(delegate);
+
+        new RowItem(container, new RowId(new Object[] { 1 }),
+                Arrays.asList(property));
+
+        property.setValue("Kalle");
+        Assert.assertEquals("Kalle", container.value);
+        Assert.assertTrue(container.modified);
+    }
 }
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
new file mode 100644
index 0000000000..9aeccdb56f
--- /dev/null
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -0,0 +1,73 @@
+package com.vaadin.tests.server.component.abstractfield;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.util.AbstractProperty;
+import com.vaadin.data.util.converter.Converter.ConversionException;
+import com.vaadin.ui.AbstractField;
+
+public class RemoveListenersOnDetach {
+
+    int numValueChanges = 0;
+    int numReadOnlyChanges = 0;
+
+    AbstractField field = new AbstractField() {
+        @Override
+        public Class<?> getType() {
+            return null;
+        }
+
+        @Override
+        public void valueChange(Property.ValueChangeEvent event) {
+            super.valueChange(event);
+            numValueChanges++;
+        }
+
+        @Override
+        public void readOnlyStatusChange(
+                Property.ReadOnlyStatusChangeEvent event) {
+            super.readOnlyStatusChange(event);
+            numReadOnlyChanges++;
+        }
+    };
+
+    Property property = new AbstractProperty() {
+        public Object getValue() {
+            return null;
+        }
+
+        public void setValue(Object newValue) throws ReadOnlyException,
+                ConversionException {
+            fireValueChange();
+        }
+
+        public Class<?> getType() {
+            return null;
+        }
+    };
+
+    @Test
+    public void testAttachDetach() {
+        field.setPropertyDataSource(property);
+
+        property.setValue(null);
+        property.setReadOnly(true);
+        assertEquals(1, numValueChanges);
+        assertEquals(1, numReadOnlyChanges);
+
+        field.attach();
+        property.setValue(null);
+        property.setReadOnly(false);
+        assertEquals(2, numValueChanges);
+        assertEquals(2, numReadOnlyChanges);
+
+        field.detach();
+        property.setValue(null);
+        property.setReadOnly(true);
+        assertEquals(2, numValueChanges);
+        assertEquals(2, numReadOnlyChanges);
+    }
+}