Changeset 5253

Timestamp:

08/25/08 08:50:11 (3 months ago)

Author:

artur.signell@…

Message:

Fixed #677 for Form

Location:

trunk/src/com/itmill/toolkit

Files:

• tests/tickets/Ticket677.java (modified) (4 diffs)
• ui/Form.java (modified) (4 diffs)

trunk/src/com/itmill/toolkit/tests/tickets/Ticket677.java

@@ -3 +3 @@
 import com.itmill.toolkit.Application;
 import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.DateField;
+import com.itmill.toolkit.ui.Form;
 import com.itmill.toolkit.ui.GridLayout;
 import com.itmill.toolkit.ui.Label;
@@ -14 +16 @@
 public class Ticket677 extends Application {
 
+    private static final Object P1 = new Object();
+    private static final Object P2 = new Object();
+    private static final Object P3 = new Object();
+
     private Panel panel;
+    private Form form;
 
     public void init() {
@@ -26 +33 @@
 
     private void createUI(GridLayout layout) {
-        panel = new Panel("panel caption");
-        layout.addComponent(panel);
+        createPanel(layout);
+        createForm(layout);
+
         layout.addComponent(new Button("Enable", new ClickListener() {
 
             public void buttonClick(ClickEvent event) {
                 panel.setEnabled(true);
+                form.setEnabled(true);
             }
 
@@ -40 +49 @@
             public void buttonClick(ClickEvent event) {
                 panel.setEnabled(false);
+                form.setEnabled(false);
             }
 
         }));
+
+    }
+
+    private void createForm(GridLayout layout) {
+        form = new Form();
+        form.addField(P1, new TextField());
+        form.addField(P2, new DateField());
+        form.addField(P3, new DateField());
+
+        layout.addComponent(form);
+    }
+
+    private void createPanel(GridLayout layout) {
+        panel = new Panel("panel caption");
+        layout.addComponent(panel);
 
         panel.addComponent(new Label("Label 1"));

trunk/src/com/itmill/toolkit/ui/Form.java

@@ -235 +235 @@
      * 
      * @param makeVisible
-     *            If true (default), validation is made visible when commit() is
-     *            called. If false, the visibility is left as it is.
+     *                If true (default), validation is made visible when
+     *                commit() is called. If false, the visibility is left as it
+     *                is.
      */
     public void setValidationVisibleOnCommit(boolean makeVisible) {
@@ -245 +246 @@
      * Is validation made automatically visible on commit?
      * 
-     *  See setValidationVisibleOnCommit().
+     * See setValidationVisibleOnCommit().
      * 
      * @return true if validation is made automatically visible on commit.
@@ -252 +253 @@
         return validationVisibleOnCommit;
     }
-    
+
     /*
      * Commit changes to the data source Don't add a JavaDoc comment here, we
@@ -1075 +1076 @@
     }
 
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+
+        updateComponentDisabledState(!enabled);
+    }
+
+    public void setDisabledByContainer(boolean disabledByContainer) {
+        super.setDisabledByContainer(disabledByContainer);
+
+        updateComponentDisabledState(disabledByContainer);
+    }
+
+    private void updateComponentDisabledState(boolean disabled) {
+        // Update the disabledByContainer state for all subcomponents
+        for (Iterator i = fields.values().iterator(); i.hasNext();) {
+            Component c = (Component) i.next();
+            if (c instanceof AbstractComponent) {
+                ((AbstractComponent) c).setDisabledByContainer(disabled);
+            }
+        }
+
+    }
+
 }