Merged: [9102] fix for #3475 OptionGroup with newItemsAllowed(true) was not rendered

svn changeset:9103/svn branch:6.2

1 files changed, 3 insertions, 7 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java
index cbc0ae6859..e54cf04a6c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java
@@ -10,6 +10,7 @@ import java.util.Map;
 

 import com.google.gwt.event.dom.client.ClickEvent;

 import com.google.gwt.user.client.ui.CheckBox;

+import com.google.gwt.user.client.ui.FocusWidget;

 import com.google.gwt.user.client.ui.Focusable;

 import com.google.gwt.user.client.ui.Panel;

 import com.google.gwt.user.client.ui.RadioButton;

@@ -83,13 +84,8 @@ public class VOptionGroup extends VOptionGroupBase {
     @Override

     protected void setTabIndex(int tabIndex) {

         for (Iterator iterator = panel.iterator(); iterator.hasNext();) {

-            if (isMultiselect()) {

-                VCheckBox cb = (VCheckBox) iterator.next();

-                cb.setTabIndex(tabIndex);

-            } else {

-                RadioButton rb = (RadioButton) iterator.next();

-                rb.setTabIndex(tabIndex);

-            }

+            FocusWidget widget = (FocusWidget) iterator.next();

+            widget.setTabIndex(tabIndex);

         }

     }