From f353f1d528b355f568050b4b65307925c2defb46 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Thu, 14 Jun 2007 13:31:39 +0000 Subject: [PATCH] Cleaned some unnecessary boolean checks. svn changeset:1722/svn branch:trunk --- .../toolkit/terminal/gwt/client/DefaultWidgetFactory.java | 2 +- .../toolkit/terminal/gwt/client/ui/TkPasswordField.java | 8 -------- .../toolkit/terminal/gwt/client/ui/TkTextField.java | 7 ++----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java index 369a60917d..1eff0d7e62 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java @@ -56,7 +56,7 @@ public class DefaultWidgetFactory implements WidgetFactory { if ("textfield".equals(tag)) { if(uidl.hasAttribute("multiline")) return new TkTextArea(); - else if(uidl.hasAttribute("secret") && uidl.getBooleanAttribute("secret")) + else if(uidl.getBooleanAttribute("secret")) return new TkPasswordField(); return new TkTextField(); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkPasswordField.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkPasswordField.java index 7d6c0becb5..a8abd2fee7 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkPasswordField.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkPasswordField.java @@ -1,8 +1,6 @@ package com.itmill.toolkit.terminal.gwt.client.ui; import com.google.gwt.user.client.DOM; -import com.itmill.toolkit.terminal.gwt.client.Client; -import com.itmill.toolkit.terminal.gwt.client.UIDL; /** * This class represents a password field. @@ -16,10 +14,4 @@ public class TkPasswordField extends TkTextField { super(DOM.createInputPassword()); } - public void updateFromUIDL(UIDL uidl, Client client) { - // Call parent renderer explicitly - super.updateFromUIDL(uidl, client); - - } - } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java index 5ce96f8e0f..82fcbae2f4 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkTextField.java @@ -52,18 +52,15 @@ public class TkTextField extends TextBoxBase implements if(client.replaceComponentWithCorrectImplementation(this, uidl)) return; + client.delegateCaptionToParent(this, uidl); - if(uidl.hasAttribute("immediate") && uidl.getBooleanAttribute("immediate")) - immediate = true; + immediate = uidl.getBooleanAttribute("immediate"); if(uidl.hasAttribute("cols")) setWidth(uidl.getStringAttribute("cols")+"em"); setText(uidl.getStringVariable("text")); - // TODO if either caption, description, icon or error is present, - // ask the parent to kindly add those to its list - // getParentLayout().updateComponentAdditionals(this); } -- 2.39.5