fixes #2128, implemented Focusable for some client side selects

svn changeset:5560/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java
index 4b7a3a0477191ae86b61418dbb75e07880c32f9b..7bc4863dfb6e80fe5dcd3e31a13ec2c87a40c470 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java
@@ -98,6 +98,10 @@ public class IListSelect extends IOptionGroupBase {
         ((TooltipListBox) optionsContainer).setTabIndex(tabIndex);
     }
 
+    public void focus() {
+        select.setFocus(true);
+    }
+
 }
 
 /**

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java
index 8bb4bd35dd5036cdc1e09d0a5bcc10e79c883476..8cb8d6ca610c064300bf02a6fb873d0271e79cd6 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java
@@ -92,4 +92,8 @@ public class INativeSelect extends IOptionGroupBase implements Field {
         ((TooltipListBox) optionsContainer).setTabIndex(tabIndex);
     }
 
+    public void focus() {
+        select.setFocus(true);
+    }
+
 }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java
index d771f5e644241172c6e7fb1d94fc23438efabfe3..c737a52e95c51d0e49c21287d0bf3bfe378add0b 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java
@@ -9,6 +9,7 @@ import java.util.Iterator;
 import java.util.Map;\r
 \r
 import com.google.gwt.user.client.ui.CheckBox;\r
+import com.google.gwt.user.client.ui.HasFocus;\r
 import com.google.gwt.user.client.ui.Panel;\r
 import com.google.gwt.user.client.ui.RadioButton;\r
 import com.google.gwt.user.client.ui.Widget;\r
@@ -87,4 +88,11 @@ public class IOptionGroup extends IOptionGroupBase {
         }\r
     }\r
 \r
+    public void focus() {\r
+        Iterator<Widget> iterator = panel.iterator();\r
+        if (iterator.hasNext()) {\r
+            ((HasFocus) iterator.next()).setFocus(true);\r
+        }\r
+    }\r
+\r
 }\r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java
index ffb204dee0caac82c2da7bb6b3d67c090a7a54d6..2dc44cc33f563f9d44eb1a778664900978dde0f6 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java
@@ -14,11 +14,12 @@ import com.google.gwt.user.client.ui.KeyboardListener;
 import com.google.gwt.user.client.ui.Panel;\r
 import com.google.gwt.user.client.ui.Widget;\r
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;\r
+import com.itmill.toolkit.terminal.gwt.client.Focusable;\r
 import com.itmill.toolkit.terminal.gwt.client.Paintable;\r
 import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
 \r
 abstract class IOptionGroupBase extends Composite implements Paintable, Field,\r
-        ClickListener, ChangeListener, KeyboardListener {\r
+        ClickListener, ChangeListener, KeyboardListener, Focusable {\r
 \r
     public static final String CLASSNAME_OPTION = "i-select-option";\r
 \r

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
index d33fc5a8b90d06cd7de9e7ddcccccad260626f06..b6a95ffb73bc32274a59e758a41b2f0bbbbbb87f 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
@@ -224,4 +224,8 @@ public class ITwinColSelect extends IOptionGroupBase {
         add.setTabIndex(tabIndex);\r
         remove.setTabIndex(tabIndex);\r
     }\r
+\r
+    public void focus() {\r
+        options.setFocus(true);\r
+    }\r
 }\r