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

Conflicts:
	server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java

Change-Id: I04938bd8c5b4f01c3ca801c9f7adbb20d279523c

1 files changed, 7 insertions, 2 deletions

diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java
index 48239b09e3..45532756e5 100644
--- a/server/src/com/vaadin/ui/Form.java
+++ b/server/src/com/vaadin/ui/Form.java
@@ -1186,9 +1186,14 @@ public class Form extends AbstractField<Object> implements Item.Editor,
         }
     }
 
-    /** Form is empty if all of its fields are empty. */
+    /**
+     * {@inheritDoc}
+     * <p>
+     * A Form is empty if all of its fields are empty.
+     * 
+     */
     @Override
-    protected boolean isEmpty() {
+    public boolean isEmpty() {
 
         for (Iterator<Field<?>> i = fields.values().iterator(); i.hasNext();) {
             Field<?> f = i.next();