diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-08-25 08:44:13 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-08-25 08:44:13 +0000 |
| commit | c635285fd86a8c26a996f92bb7e1a8728308ecdf (patch) | |
| tree | b6f8126b25ae1ca22d905767ae88d98f8804ec24 /src | |
| parent | d47b8ed5bfae5f9b618b49bda3cf209c803c6a8b (diff) | |
| download | vaadin-framework-c635285fd86a8c26a996f92bb7e1a8728308ecdf.tar.gz vaadin-framework-c635285fd86a8c26a996f92bb7e1a8728308ecdf.zip | |
fixes a regression since UIDL refactoring (non-hosted mode only)
svn changeset:8544/svn branch:6.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/UIDL.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VTextField.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/UIDL.java b/src/com/vaadin/terminal/gwt/client/UIDL.java index e601febe7b..bc6a1b9b72 100644 --- a/src/com/vaadin/terminal/gwt/client/UIDL.java +++ b/src/com/vaadin/terminal/gwt/client/UIDL.java @@ -196,7 +196,7 @@ public final class UIDL extends JavaScriptObject { } public boolean hasVariable(String name) { - return var().containsKey(name); + return hasVariables() && var().containsKey(name); } public String getStringVariable(String name) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java index 207b65775c..f2be96438d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java @@ -102,7 +102,8 @@ public class VTextField extends TextBoxBase implements Paintable, Field, setColumns(new Integer(uidl.getStringAttribute("cols")).intValue()); } - String text = uidl.getStringVariable("text"); + String text = uidl.hasVariable("text") ? uidl.getStringVariable("text") + : null; setPrompting(inputPrompt != null && focusedTextField != this && (text == null || text.equals(""))); if (prompting) { |