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

Conflicts:
	server/src/com/vaadin/ui/TextField.java

Change-Id: I289cb9ec80d494ab79aec11a43708abf5b403a00

1 files changed, 3 insertions, 16 deletions

diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index 6d4b5ff2d7..9b9c7efd86 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -1508,25 +1508,12 @@ public abstract class AbstractField<T> extends AbstractComponent implements
         markAsDirty();
     }
 
-    /**
-     * Is the field empty?
-     * 
-     * In general, "empty" state is same as null. As an exception, TextField
-     * also treats empty string as "empty".
-     */
-    protected boolean isEmpty() {
+    @Override
+    public boolean isEmpty() {
         return (getFieldValue() == null);
     }
 
-    /**
-     * Clear the value of the field.
-     * <p>
-     * The field value is typically reset to the initial value of the field but
-     * this is not mandatory. Calling {@link #isEmpty()} on a cleared field must
-     * always returns true.
-     * 
-     * @since
-     */
+    @Override
     public void clear() {
         setValue(null);
     }