1 files changed, 7 insertions, 9 deletions

diff --git a/client/src/com/vaadin/client/ui/VOptionGroup.java b/client/src/com/vaadin/client/ui/VOptionGroup.java
index 34227831b9..d429752069 100644
--- a/client/src/com/vaadin/client/ui/VOptionGroup.java
+++ b/client/src/com/vaadin/client/ui/VOptionGroup.java
@@ -40,10 +40,11 @@ import com.google.gwt.user.client.ui.HasEnabled;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RadioButton;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.StyleConstants;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.Util;
+import com.vaadin.client.WidgetUtil;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
 
@@ -136,7 +137,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
 
             String itemHtml = opUidl.getStringAttribute("caption");
             if (!htmlContentAllowed) {
-                itemHtml = Util.escapeHTML(itemHtml);
+                itemHtml = WidgetUtil.escapeHTML(itemHtml);
             }
 
             String iconUrl = opUidl.getStringAttribute("icon");
@@ -160,7 +161,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
                     op.setStyleName("v-radiobutton");
                 }
                 if (iconUrl != null && iconUrl.length() != 0) {
-                    Util.sinkOnloadForImages(op.getElement());
+                    WidgetUtil.sinkOnloadForImages(op.getElement());
                     op.addHandler(iconLoadHandler, LoadEvent.getType());
                 }
 
@@ -178,8 +179,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
             op.setEnabled(enabled);
             optionsEnabled.put(op, optionEnabled);
 
-            setStyleName(op.getElement(),
-                    ApplicationConnection.DISABLED_CLASSNAME,
+            setStyleName(op.getElement(), StyleConstants.DISABLED,
                     !(optionEnabled && isEnabled()));
 
             newwidgets.add(op);
@@ -248,14 +248,12 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
                 Boolean isOptionEnabled = optionsEnabled.get(w);
                 if (isOptionEnabled == null) {
                     hasEnabled.setEnabled(optionGroupEnabled);
-                    setStyleName(w.getElement(),
-                            ApplicationConnection.DISABLED_CLASSNAME,
+                    setStyleName(w.getElement(), StyleConstants.DISABLED,
                             !isEnabled());
                 } else {
                     hasEnabled
                             .setEnabled(isOptionEnabled && optionGroupEnabled);
-                    setStyleName(w.getElement(),
-                            ApplicationConnection.DISABLED_CLASSNAME,
+                    setStyleName(w.getElement(), StyleConstants.DISABLED,
                             !(isOptionEnabled && isEnabled()));
                 }
             }