Cleaned some unnecessary boolean checks.

svn changeset:1722/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java
index 369a60917daaec3f6fa025645800411a155942f5..1eff0d7e62a4959d4f58c4f514b7bfabf5104e42 100644 (file)
--- 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 7d6c0becb5ed6582f9a994a8a8bccdfb825b80b0..a8abd2fee737d7ca8b129a82023c5f4f32844ac7 100644 (file)
--- 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;\r
 \r
 import com.google.gwt.user.client.DOM;\r
-import com.itmill.toolkit.terminal.gwt.client.Client;\r
-import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
 \r
 /**\r
  * This class represents a password field.\r
@@ -16,10 +14,4 @@ public class TkPasswordField extends TkTextField {
                super(DOM.createInputPassword());\r
        }\r
        \r
-       public void updateFromUIDL(UIDL uidl, Client client) {\r
-               // Call parent renderer explicitly\r
-               super.updateFromUIDL(uidl, client);\r
-               \r
-       }\r
-       \r
 }\r

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 5ce96f8e0fb1c2e84a52ef80e09072d3c76cad20..82fcbae2f4e58462cfe315e2d9d2c9441e073896 100644 (file)
--- 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);
 
        }