Merge remote-tracking branch 'origin/master' into grid

Conflicts:
	client/src/com/vaadin/client/communication/AtmospherePushConnection.java
	server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java
	shared/src/com/vaadin/shared/util/SharedUtil.java

Change-Id: I300b5a92bde562390a56b720adf9a37b795c9513

1 files changed, 8 insertions, 5 deletions

diff --git a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
index 1b598ef720..069cb2e153 100644
--- a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
@@ -266,6 +266,14 @@ public class FieldGroup implements Serializable {
         configureField(field);
     }
 
+    /**
+     * Wrap property to transactional property.
+     */
+    protected <T> Property.Transactional<T> wrapInTransactionalProperty(
+            Property<T> itemProperty) {
+        return new TransactionalPropertyWrapper<T>(itemProperty);
+    }
+
     private void throwIfFieldIsNull(Field<?> field, Object propertyId) {
         if (field == null) {
             throw new BindException(
@@ -283,11 +291,6 @@ public class FieldGroup implements Serializable {
         }
     }
 
-    private <T> Property.Transactional<T> wrapInTransactionalProperty(
-            Property<T> itemProperty) {
-        return new TransactionalPropertyWrapper<T>(itemProperty);
-    }
-
     /**
      * Gets the property with the given property id from the item.
      *