From 4f70bb519b2c3b4248e4eee1050bfe7013e56943 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marko=20Gr=C3=B6nroos?= Date: Fri, 19 Nov 2010 13:24:15 +0000 Subject: [PATCH] Optimization for word wrap. For #6003. svn changeset:16053/svn branch:6.5 --- .../vaadin/terminal/gwt/client/ui/VTextField.java | 13 +++++++++---- src/com/vaadin/ui/TextField.java | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java index c0eb4a90ee..42264fc1b6 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java @@ -282,9 +282,14 @@ public class VTextField extends TextBoxBase implements Paintable, Field, }); } - // For backward compatibility; to be moved to TextArea - if (uidl.hasAttribute("wordwrap")) { - setWordwrap(uidl.getBooleanAttribute("wordwrap")); + // Here for backward compatibility; to be moved to TextArea. + // Optimization: server does not send attribute for the default 'true' + // state. + if (uidl.hasAttribute("wordwrap") + && uidl.getBooleanAttribute("wordwrap") == false) { + setWordwrap(false); + } else { + setWordwrap(true); } } @@ -544,7 +549,7 @@ public class VTextField extends TextBoxBase implements Paintable, Field, valueChange(false); } - // For backward compatibility; to be moved to TextArea + // Here for backward compatibility; to be moved to TextArea public void setWordwrap(boolean enabled) { if (enabled == wordwrap) return; // No change diff --git a/src/com/vaadin/ui/TextField.java b/src/com/vaadin/ui/TextField.java index f9dd93b6f9..64dbf933b2 100644 --- a/src/com/vaadin/ui/TextField.java +++ b/src/com/vaadin/ui/TextField.java @@ -199,8 +199,10 @@ public class TextField extends AbstractTextField implements target.addAttribute("rows", String.valueOf(rows)); target.addAttribute("multiline", true); - // For backward compatibility; to be moved to TextArea - target.addAttribute("wordwrap", isWordwrap()); + // Optimization: the default true is assumed if not painted + if (!isWordwrap()) { + target.addAttribute("wordwrap", false); + } } if (getInputPrompt() != null) { -- 2.39.5