Test case and fix for #2935 - TextField with an input prompt can send prompt text as a value

svn changeset:7974/svn branch:6.0

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
index 2d8e9ac219..00d76d6099 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
@@ -103,7 +103,8 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
         }
 
         String text = uidl.getStringVariable("text");
-        prompting = inputPrompt != null && (text == null || text.equals(""));
+        setPrompting(inputPrompt != null && focusedTextField != this
+                && (text == null || text.equals("")));
         if (prompting) {
             setText(inputPrompt);
             addStyleDependentName(CLASSNAME_PROMPT);
@@ -169,7 +170,7 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
         removeStyleDependentName(CLASSNAME_FOCUS);
         focusedTextField = null;
         String text = getText();
-        prompting = inputPrompt != null && (text == null || "".equals(text));
+        setPrompting(inputPrompt != null && (text == null || "".equals(text)));
         if (prompting) {
             setText(inputPrompt);
             addStyleDependentName(CLASSNAME_PROMPT);
@@ -177,6 +178,11 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
         onChange(sender);
     }
 
+    private void setPrompting(boolean prompting) {
+        this.prompting = prompting;
+        System.out.println("Prompting is now: " + prompting);
+    }
+
     public void setColumns(int columns) {
         setColumns(getElement(), columns);
     }