Removed references to client widgetset from state #9724

diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
index c242cdb11b81dcec221796707bfa275bd475e45d..9a112dc76309f42ac21a29afc41f3ef42bf94265 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
@@ -18,12 +18,11 @@ package com.vaadin.shared.ui.absolutelayout;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.client.ui.absolutelayout.VAbsoluteLayout;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class AbsoluteLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VAbsoluteLayout.CLASSNAME;
+        primaryStyleName = "v-absolutelayout";
     }
 
     // Maps each component to a position

diff --git a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
index 3325f067891ae427fc1299dd3f22fb8c15c7a219..6f098e863efe5434a1b5ebe6143598bff79f6e8c 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
+++ b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.browserframe;
 
-import com.vaadin.client.ui.browserframe.VBrowserFrame;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class BrowserFrameState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VBrowserFrame.CLASSNAME;
+        primaryStyleName = "v-browserframe";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
index 659ec747aaf5e55bd388a6bbe28b0d258aaad503..e7272379bb404fb9b3acf63b9698a196d50bd286 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java
+++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.shared.ui.button;
 
-import com.vaadin.client.ui.button.VButton;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.ui.TabIndexState;
 
@@ -30,7 +29,7 @@ import com.vaadin.shared.ui.TabIndexState;
  */
 public class ButtonState extends TabIndexState {
     {
-        primaryStyleName = VButton.CLASSNAME;
+        primaryStyleName = "v-button";
     }
     public boolean disableOnClick = false;
     public int clickShortcutKeyCode = 0;

diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
index 1892310ae1e9fac57fa6d0d79d673172173afd4a..9f7388e21cc6fa684ec01fa298a3dcd985b3ef98 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
+++ b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.checkbox;
 
-import com.vaadin.client.ui.checkbox.VCheckBox;
 import com.vaadin.shared.AbstractFieldState;
 
 public class CheckBoxState extends AbstractFieldState {
     {
-        primaryStyleName = VCheckBox.CLASSNAME;
+        primaryStyleName = "v-checkbox";
     }
 
     public boolean checked = false;

diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
index da8ec9ca33a42779918e084552430999d62a3fce..a3c0c8e7651d1f1e6a7dbb596194eb574f9ee78f 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
+++ b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.combobox;
 
-import com.vaadin.client.ui.combobox.VFilterSelect;
 import com.vaadin.shared.AbstractFieldState;
 
 public class ComboBoxState extends AbstractFieldState {
     {
-        primaryStyleName = VFilterSelect.CLASSNAME;
+        primaryStyleName = "v-filterselect";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
index a4b595335bac95e8f5af22894f144771ffe470c5..fa25f2840b41a103ca51923b67c230c209871343 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
@@ -18,13 +18,12 @@ package com.vaadin.shared.ui.csslayout;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.client.ui.csslayout.VCssLayout;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CssLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VCssLayout.CLASSNAME;
+        primaryStyleName = "v-csslayout";
     }
     public Map<Connector, String> childCss = new HashMap<Connector, String>();
 }
\ No newline at end of file

diff --git a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
index 4d95cd3c681d7458652fc88d690630037b8197ab..07f69b691e78f39bbfaeb18b0c7067546eb80e39 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
@@ -18,13 +18,12 @@ package com.vaadin.shared.ui.customlayout;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.client.ui.customlayout.VCustomLayout;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CustomLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VCustomLayout.CLASSNAME;
+        primaryStyleName = "v-customlayout";
     }
     public Map<Connector, String> childLocations = new HashMap<Connector, String>();
     public String templateContents;

diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
index 2575e81ab2a2e07cb6fda4ee786d881916cf2455..879670effab340b140cdd77720ca26023c342cae 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.datefield;
 
-import com.vaadin.client.ui.datefield.VDateFieldCalendar;
 import com.vaadin.shared.AbstractFieldState;
 
 public class InlineDateFieldState extends AbstractFieldState {
     {
-        primaryStyleName = VDateFieldCalendar.CLASSNAME;
+        primaryStyleName = "v-datefield";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
index 5071b8cfb4b2551c567f1996f2d59065da8b17af..c0d3b20c28b11a91c3cb5a0b0005c04ed4fd83b0 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
@@ -1,9 +1,7 @@
 package com.vaadin.shared.ui.datefield;
 
-import com.vaadin.client.ui.datefield.VPopupCalendar;
-
 public class PopupDateFieldState extends TextualDateFieldState {
     {
-        primaryStyleName = VPopupCalendar.CLASSNAME;
+        primaryStyleName = "v-datefield";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
index e7a8251bcbbc90a60a1d4a870c672cffed4fe06e..d7c98fa457fd696e5d459e66c6347505a9ebda7d 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.datefield;
 
-import com.vaadin.client.ui.datefield.VTextualDate;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TextualDateFieldState extends AbstractFieldState {
     {
-        primaryStyleName = VTextualDate.CLASSNAME;
+        primaryStyleName = "v-datefield";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
index cdf0621f5fdbd3c150a0ee016072e07a31fef9c5..2a85197d0a517b130825272f91f02cb23a039f77 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
+++ b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.embedded;
 
-import com.vaadin.client.ui.embedded.VEmbedded;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class EmbeddedState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VEmbedded.CLASSNAME;
+        primaryStyleName = "v-embedded";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/flash/FlashState.java b/shared/src/com/vaadin/shared/ui/flash/FlashState.java
index f9886cf73790f9b994a7a27f263cb6766742b4aa..0c94850da771abf9961ddd74f71277e6547ac47e 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/flash/FlashState.java
+++ b/shared/src/com/vaadin/shared/ui/flash/FlashState.java
@@ -2,12 +2,11 @@ package com.vaadin.shared.ui.flash;
 
 import java.util.Map;
 
-import com.vaadin.client.ui.flash.VFlash;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class FlashState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VFlash.CLASSNAME;
+        primaryStyleName = "v-flash";
     }
 
     public String classId;

diff --git a/shared/src/com/vaadin/shared/ui/form/FormState.java b/shared/src/com/vaadin/shared/ui/form/FormState.java
index bae8899c130dcaf9a0c05eafd8871f1525b8672d..c48b68dd4a157c8818b1e3d6c091363c8b87ea34 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/form/FormState.java
+++ b/shared/src/com/vaadin/shared/ui/form/FormState.java
@@ -15,13 +15,12 @@
  */
 package com.vaadin.shared.ui.form;
 
-import com.vaadin.client.ui.form.VForm;
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.Connector;
 
 public class FormState extends AbstractFieldState {
     {
-        primaryStyleName = VForm.CLASSNAME;
+        primaryStyleName = "v-form";
     }
     public Connector layout;
     public Connector footer;

diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
index 9d7cd8a615a89fa96be358ee15c4f0ff513d7b15..e8a90adcd5c4fe6f6c53f821e4743b3440c6c3a4 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.gridlayout;
 
-import com.vaadin.client.ui.gridlayout.VGridLayout;
 import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class GridLayoutState extends AbstractLayoutState {
     {
-        primaryStyleName = VGridLayout.CLASSNAME;
+        primaryStyleName = "v-gridlayout";
     }
     public boolean spacing = false;
     public int rows = 0;

diff --git a/shared/src/com/vaadin/shared/ui/image/ImageState.java b/shared/src/com/vaadin/shared/ui/image/ImageState.java
index 1ecf9b25d807e5d9dc3b96dcc331cbb6a08eed38..4e9fcf1d5e14e30a69559e1c59eedadba3b043a2 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/image/ImageState.java
+++ b/shared/src/com/vaadin/shared/ui/image/ImageState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.image;
 
-import com.vaadin.client.ui.image.VImage;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
 
 public class ImageState extends AbstractEmbeddedState {
     {
-        primaryStyleName = VImage.CLASSNAME;
+        primaryStyleName = "v-image";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java
index 09d4837fbe8ee6fb9fc5310adba36e5ca4b75725..2cccc310aaa661ec3372898177952db651dd11de 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/label/LabelState.java
+++ b/shared/src/com/vaadin/shared/ui/label/LabelState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.label;
 
-import com.vaadin.client.ui.label.VLabel;
 import com.vaadin.shared.ComponentState;
 
 public class LabelState extends ComponentState {
     {
-        primaryStyleName = VLabel.CLASSNAME;
+        primaryStyleName = "v-label";
     }
     public ContentMode contentMode = ContentMode.TEXT;
     public String text = "";

diff --git a/shared/src/com/vaadin/shared/ui/link/LinkState.java b/shared/src/com/vaadin/shared/ui/link/LinkState.java
index 7ce626f38003d5455c9adaee04548f3546d5c64d..96b4600000f8dca9017b2d4d43435d6dc7397d2e 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/link/LinkState.java
+++ b/shared/src/com/vaadin/shared/ui/link/LinkState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.link;
 
-import com.vaadin.client.ui.link.VLink;
 import com.vaadin.shared.ComponentState;
 
 public class LinkState extends ComponentState {
     {
-        primaryStyleName = VLink.CLASSNAME;
+        primaryStyleName = "v-link";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
index 418be8dba3f87615bd25382b2f813a284ad5343d..cf1ef99c0641d29e25d133fad5e156d0fcd5a5b6 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
+++ b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.menubar;
 
-import com.vaadin.client.ui.menubar.VMenuBar;
 import com.vaadin.shared.ComponentState;
 
 public class MenuBarState extends ComponentState {
     {
-        primaryStyleName = VMenuBar.CLASSNAME;
+        primaryStyleName = "v-menubar";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
index b6a37d0bf632bdf14fa9d122c5ea196baa32b13d..855a0a3c083410154bbc6b5f0cfaac56f26fc6b9 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
+++ b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.optiongroup;
 
-import com.vaadin.client.ui.optiongroup.VOptionGroup;
 import com.vaadin.shared.AbstractFieldState;
 
 public class OptionGroupState extends AbstractFieldState {
     {
-        primaryStyleName = VOptionGroup.CLASSNAME;
+        primaryStyleName = "v-select-optiongroup";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
index caad9876978fbe3d5e16618ee95eb916209d3eda..6af6f1c04022ee5d87e5c380fccbbe0c55e71b87 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
@@ -1,9 +1,8 @@
 package com.vaadin.shared.ui.orderedlayout;
 
-import com.vaadin.client.ui.orderedlayout.VHorizontalLayout;
 
 public class HorizontalLayoutState extends AbstractOrderedLayoutState {
     {
-        primaryStyleName = VHorizontalLayout.CLASSNAME;
+        primaryStyleName = "v-horizontallayout";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
index e8ad3c9a2972945d266ed38d107d5fdfb345a23e..a7054f683f7241f307213af9e524b37dd91ce226 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
@@ -1,9 +1,7 @@
 package com.vaadin.shared.ui.orderedlayout;
 
-import com.vaadin.client.ui.orderedlayout.VVerticalLayout;
-
 public class VerticalLayoutState extends AbstractOrderedLayoutState {
     {
-        primaryStyleName = VVerticalLayout.CLASSNAME;
+        primaryStyleName = "v-verticallayout";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
index 3061d54438af3e3dd17af0538a4638ed15ca4328..9d502df8fe4c1121758f7feee558d7e3cc975172 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java
+++ b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.panel;
 
-import com.vaadin.client.ui.panel.VPanel;
 import com.vaadin.shared.ComponentState;
 
 public class PanelState extends ComponentState {
     {
-        primaryStyleName = VPanel.CLASSNAME;
+        primaryStyleName = "v-panel";
     }
     public int tabIndex;
     public int scrollLeft, scrollTop;

diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderState.java b/shared/src/com/vaadin/shared/ui/slider/SliderState.java
index 3393dbbfb588d7936621c52b425001664b1986e0..481ee5885515391f2f530d1cac221d3fec7525f0 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/slider/SliderState.java
+++ b/shared/src/com/vaadin/shared/ui/slider/SliderState.java
@@ -1,11 +1,10 @@
 package com.vaadin.shared.ui.slider;
 
-import com.vaadin.client.ui.slider.VSlider;
 import com.vaadin.shared.AbstractFieldState;
 
 public class SliderState extends AbstractFieldState {
     {
-        primaryStyleName = VSlider.CLASSNAME;
+        primaryStyleName = "v-slider";
     }
 
     public double value;

diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
index 5472c17fdd5ce9623944fe9215ad368a031dbc80..4824f63838e75ddd2dda9f28877078cf01f94251 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
@@ -1,9 +1,8 @@
 package com.vaadin.shared.ui.splitpanel;
 
-import com.vaadin.client.ui.splitpanel.VSplitPanelHorizontal;
 
 public class HorizontalSplitPanelState extends AbstractSplitPanelState {
     {
-        primaryStyleName = VSplitPanelHorizontal.CLASSNAME;
+        primaryStyleName = "v-splitpanel-horizontal";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
index 0e97557769333d1970bd5f485d5b0b62e0c18d18..901914cdeab123ebb6d19ae10e9565c6ab856884 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
@@ -1,9 +1,7 @@
 package com.vaadin.shared.ui.splitpanel;
 
-import com.vaadin.client.ui.splitpanel.VSplitPanelVertical;
-
 public class VerticalSplitPanelState extends AbstractSplitPanelState {
     {
-        primaryStyleName = VSplitPanelVertical.CLASSNAME;
+        primaryStyleName = "v-splitpanel-vertical";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/table/TableState.java b/shared/src/com/vaadin/shared/ui/table/TableState.java
index 58e6850f315fdfa68430d12a7bffbf7752b277a0..8e772b7c92b31db6a549721a07005be7f8860453 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/table/TableState.java
+++ b/shared/src/com/vaadin/shared/ui/table/TableState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.table;
 
-import com.vaadin.client.ui.table.VScrollTable;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TableState extends AbstractFieldState {
     {
-        primaryStyleName = VScrollTable.STYLENAME;
+        primaryStyleName = "v-table";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
index f03f9b9e5da1fb1a5ef95ebd36a005134d161e6f..a36acca9dc008b4af13bb0b7b313990aff2da16a 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
+++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.tabsheet;
 
-import com.vaadin.client.ui.tabsheet.VTabsheet;
 import com.vaadin.shared.ComponentState;
 
 public class TabsheetState extends ComponentState {
     {
-        primaryStyleName = VTabsheet.CLASSNAME;
+        primaryStyleName = "v-tabsheet";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
index ca9481f5e3bd5c3b95c113245f7e18b6be31432c..0b87f5293c9d00b7aea98f3de02f4c74f6676a93 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
+++ b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
@@ -15,13 +15,12 @@
  */
 package com.vaadin.shared.ui.textarea;
 
-import com.vaadin.client.ui.textarea.VTextArea;
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.ui.textfield.AbstractTextFieldState;
 
 public class TextAreaState extends AbstractTextFieldState {
     {
-        primaryStyleName = VTextArea.CLASSNAME;
+        primaryStyleName = "v-textarea";
     }
 
     /**

diff --git a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
index ebe99f729f4eedb594dc3fc03bf4880ee188a896..9ea8ded0a73b887edf21d45b4ee2d97d43a5462f 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
+++ b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
@@ -15,12 +15,11 @@
  */
 package com.vaadin.shared.ui.textfield;
 
-import com.vaadin.client.ui.textfield.VTextField;
 import com.vaadin.shared.AbstractFieldState;
 
 public class AbstractTextFieldState extends AbstractFieldState {
     {
-        primaryStyleName = VTextField.CLASSNAME;
+        primaryStyleName = "v-textfield";
     }
 
     /**

diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/com/vaadin/shared/ui/tree/TreeState.java
index 3785051276d0c951e2392849b0ac72dbf740ff78..d2d09d41a364f8b61f6e0dadb91a4bb8588ae337 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/tree/TreeState.java
+++ b/shared/src/com/vaadin/shared/ui/tree/TreeState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.tree;
 
-import com.vaadin.client.ui.tree.VTree;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TreeState extends AbstractFieldState {
     {
-        primaryStyleName = VTree.CLASSNAME;
+        primaryStyleName = "v-tree";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
index 9199c1c267bb6c31bf2cfef7bd25ecdf13963770..c8ab3371d333915fec4407aea60fed6d859af115 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
+++ b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.treetable;
 
-import com.vaadin.client.ui.treetable.VTreeTable;
 import com.vaadin.shared.ui.table.TableState;
 
 public class TreeTableState extends TableState {
     {
-        primaryStyleName = VTreeTable.STYLENAME;
+        primaryStyleName = "v-table";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
index a0e554a084cdc3fc4e83ffc82050d1d6f843a436..933c1812a069c9e9fbc8aa40f905d5f7e6dd27d4 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
+++ b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
@@ -1,10 +1,9 @@
 package com.vaadin.shared.ui.twincolselect;
 
-import com.vaadin.client.ui.twincolselect.VTwinColSelect;
 import com.vaadin.shared.AbstractFieldState;
 
 public class TwinColSelectState extends AbstractFieldState {
     {
-        primaryStyleName = VTwinColSelect.CLASSNAME;
+        primaryStyleName = "v-select-twincol";
     }
 }

diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/com/vaadin/shared/ui/video/VideoState.java
index 4232888328c54a54038df491098ea37d5137997d..8d0bc7d8dd81da5e4f2e955d327285781786d9c4 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/video/VideoState.java
+++ b/shared/src/com/vaadin/shared/ui/video/VideoState.java
@@ -15,11 +15,10 @@
  */
 package com.vaadin.shared.ui.video;
 
-import com.vaadin.client.ui.video.VVideo;
 import com.vaadin.shared.ui.AbstractMediaState;
 
 public class VideoState extends AbstractMediaState {
     {
-        primaryStyleName = VVideo.CLASSNAME;
+        primaryStyleName = "v-video";
     }
 }