Even better testcase

svn changeset:5512/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket677.java b/src/com/itmill/toolkit/tests/tickets/Ticket677.java
index f687899e74d35327d064a0f19478256af30f8ee0..e7f574e9b9bc5370caf227a729612df9a305ce76 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket677.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket677.java
@@ -35,6 +35,8 @@ public class Ticket677 extends Application {
     Panel root = new Panel("Enabled");\r
     Panel one = new Panel("Enabled");\r
     Panel two = new Panel("Enabled");\r
+    Form form;\r
+    Table table;\r
 \r
     public void init() {\r
         Window main = new Window();\r
@@ -46,19 +48,32 @@ public class Ticket677 extends Application {
                 OrderedLayout.ORIENTATION_HORIZONTAL);\r
         main.addComponent(l);\r
 \r
-        l.addComponent(new Button("Toggle root", new Button.ClickListener() {\r
+        l.addComponent(new Button("Toggle root panel",\r
+                new Button.ClickListener() {\r
+                    public void buttonClick(ClickEvent event) {\r
+                        toggle(root);\r
+                    }\r
+                }));\r
+        l.addComponent(new Button("Toggle panel one",\r
+                new Button.ClickListener() {\r
+                    public void buttonClick(ClickEvent event) {\r
+                        toggle(one);\r
+                    }\r
+                }));\r
+        l.addComponent(new Button("Toggle panel two",\r
+                new Button.ClickListener() {\r
+                    public void buttonClick(ClickEvent event) {\r
+                        toggle(two);\r
+                    }\r
+                }));\r
+        l.addComponent(new Button("Toggle form", new Button.ClickListener() {\r
             public void buttonClick(ClickEvent event) {\r
-                toggle(root);\r
+                toggle(form);\r
             }\r
         }));\r
-        l.addComponent(new Button("Toggle one", new Button.ClickListener() {\r
+        l.addComponent(new Button("Toggle table", new Button.ClickListener() {\r
             public void buttonClick(ClickEvent event) {\r
-                toggle(one);\r
-            }\r
-        }));\r
-        l.addComponent(new Button("Toggle two", new Button.ClickListener() {\r
-            public void buttonClick(ClickEvent event) {\r
-                toggle(two);\r
+                toggle(table);\r
             }\r
         }));\r
 \r
@@ -91,8 +106,9 @@ public class Ticket677 extends Application {
         tf.setEnabled(false);\r
         two.addComponent(tf);\r
 \r
-        Form f = new Form();\r
-        f.setFieldFactory(new BaseFieldFactory() {\r
+        form = new Form();\r
+        form.setCaption("Enabled");\r
+        form.setFieldFactory(new BaseFieldFactory() {\r
 \r
             public Field createField(Item item, Object propertyId,\r
                     Component uiContext) {\r
@@ -102,18 +118,18 @@ public class Ticket677 extends Application {
             }\r
 \r
         });\r
-        f.setItemDataSource(new BeanItem(new MyBean()));\r
-        root.addComponent(f);\r
+        form.setItemDataSource(new BeanItem(new MyBean()));\r
+        root.addComponent(form);\r
 \r
-        Table t = new Table();\r
-        t.addContainerProperty("Text", String.class, null);\r
+        table = new Table("Enabled");\r
+        table.addContainerProperty("Text", String.class, null);\r
         for (int i = 0; i < 5; i++) {\r
-            Item item = t.addItem("Item" + i);\r
+            Item item = table.addItem("Item" + i);\r
             Property p = item.getItemProperty("Text");\r
             p.setValue(i > 1 ? "enabled" : "disabled");\r
         }\r
 \r
-        t.setFieldFactory(new BaseFieldFactory() {\r
+        table.setFieldFactory(new BaseFieldFactory() {\r
 \r
             public Field createField(Container container, Object itemId,\r
                     Object propertyId, Component uiContext) {\r
@@ -128,17 +144,20 @@ public class Ticket677 extends Application {
             }\r
 \r
         });\r
-        t.setEditable(true);\r
-        root.addComponent(t);\r
+        table.setEditable(true);\r
+        root.addComponent(table);\r
 \r
     }\r
 \r
-    private void toggle(ComponentContainer c) {\r
+    private void toggle(Component c) {\r
         boolean enable = "Disabled".equals(c.getCaption());\r
         c.setEnabled(enable);\r
         c.setCaption((enable ? "Enabled" : "Disabled"));\r
-        TextField tf = (TextField) c.getComponentIterator().next();\r
-        tf.focus();\r
+        if (c instanceof ComponentContainer) {\r
+            TextField tf = (TextField) ((ComponentContainer) c)\r
+                    .getComponentIterator().next();\r
+            tf.focus();\r
+        }\r
     }\r
 \r
     class MyBean {\r