diff options
author | John Ahlroos <john@vaadin.com> | 2012-09-27 11:08:06 +0300 |
---|---|---|
committer | John Ahlroos <john@vaadin.com> | 2012-09-27 11:08:06 +0300 |
commit | 0543f70823211ef4e9424f4748d01fc19e4e84fa (patch) | |
tree | 510c9295a0eb2596e18406280bb952e1d6ceea1b /shared | |
parent | 1888d8fdcb32f8111122430cf8c6f782287d97f6 (diff) | |
download | vaadin-framework-0543f70823211ef4e9424f4748d01fc19e4e84fa.tar.gz vaadin-framework-0543f70823211ef4e9424f4748d01fc19e4e84fa.zip |
Added primary stylename to all component states #9724
Diffstat (limited to 'shared')
33 files changed, 222 insertions, 5 deletions
diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java index 283e827e6e..c242cdb11b 100644 --- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java @@ -18,9 +18,14 @@ 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; + } + // Maps each component to a position public Map<String, String> connectorToCssPosition = new HashMap<String, String>(); }
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java index 1c36420372..3325f06789 100644 --- a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java +++ b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java @@ -1,7 +1,10 @@ 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; + } } diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java index c144a8124f..659ec747aa 100644 --- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java +++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java @@ -16,6 +16,7 @@ package com.vaadin.shared.ui.button; +import com.vaadin.client.ui.button.VButton; import com.vaadin.shared.ComponentState; import com.vaadin.shared.ui.TabIndexState; @@ -28,6 +29,9 @@ import com.vaadin.shared.ui.TabIndexState; * @since 7.0 */ public class ButtonState extends TabIndexState { + { + primaryStyleName = VButton.CLASSNAME; + } 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 b89270bee2..1892310ae1 100644 --- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java +++ b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java @@ -15,9 +15,13 @@ */ package com.vaadin.shared.ui.checkbox; +import com.vaadin.client.ui.checkbox.VCheckBox; import com.vaadin.shared.AbstractFieldState; public class CheckBoxState extends AbstractFieldState { - public boolean checked = false; + { + primaryStyleName = VCheckBox.CLASSNAME; + } + public boolean checked = false; }
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java new file mode 100644 index 0000000000..da8ec9ca33 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java index 2fbc42ca0f..a4b595335b 100644 --- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java @@ -18,9 +18,13 @@ 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; + } 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 e77ea5c068..4d95cd3c68 100644 --- a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java @@ -18,10 +18,14 @@ 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; + } public Map<Connector, String> childLocations = new HashMap<Connector, String>(); public String templateContents; public String templateName; diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java new file mode 100644 index 0000000000..2575e81ab2 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java new file mode 100644 index 0000000000..5071b8cfb4 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java @@ -0,0 +1,9 @@ +package com.vaadin.shared.ui.datefield; + +import com.vaadin.client.ui.datefield.VPopupCalendar; + +public class PopupDateFieldState extends TextualDateFieldState { + { + primaryStyleName = VPopupCalendar.CLASSNAME; + } +} diff --git a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java new file mode 100644 index 0000000000..e7a8251bcb --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java new file mode 100644 index 0000000000..cdf0621f5f --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/flash/FlashState.java b/shared/src/com/vaadin/shared/ui/flash/FlashState.java index 50f0d63733..f9886cf737 100644 --- a/shared/src/com/vaadin/shared/ui/flash/FlashState.java +++ b/shared/src/com/vaadin/shared/ui/flash/FlashState.java @@ -2,9 +2,13 @@ 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; + } 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 f0e79ad38f..bae8899c13 100644 --- a/shared/src/com/vaadin/shared/ui/form/FormState.java +++ b/shared/src/com/vaadin/shared/ui/form/FormState.java @@ -15,10 +15,14 @@ */ 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; + } public Connector layout; public Connector footer; }
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java index ae54dc3765..9d7cd8a615 100644 --- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java @@ -15,9 +15,13 @@ */ 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; + } public boolean spacing = false; public int rows = 0; public int columns = 0; diff --git a/shared/src/com/vaadin/shared/ui/image/ImageState.java b/shared/src/com/vaadin/shared/ui/image/ImageState.java index 4296c76847..1ecf9b25d8 100644 --- a/shared/src/com/vaadin/shared/ui/image/ImageState.java +++ b/shared/src/com/vaadin/shared/ui/image/ImageState.java @@ -1,7 +1,10 @@ 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; + } } diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java index a91aeb0aa1..09d4837fbe 100644 --- a/shared/src/com/vaadin/shared/ui/label/LabelState.java +++ b/shared/src/com/vaadin/shared/ui/label/LabelState.java @@ -15,9 +15,13 @@ */ 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; + } 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 new file mode 100644 index 0000000000..7ce626f380 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/link/LinkState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java new file mode 100644 index 0000000000..418be8dba3 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java new file mode 100644 index 0000000000..b6a37d0bf6 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java new file mode 100644 index 0000000000..caad987697 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java @@ -0,0 +1,9 @@ +package com.vaadin.shared.ui.orderedlayout; + +import com.vaadin.client.ui.orderedlayout.VHorizontalLayout; + +public class HorizontalLayoutState extends AbstractOrderedLayoutState { + { + primaryStyleName = VHorizontalLayout.CLASSNAME; + } +} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java new file mode 100644 index 0000000000..e8ad3c9a29 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java @@ -0,0 +1,9 @@ +package com.vaadin.shared.ui.orderedlayout; + +import com.vaadin.client.ui.orderedlayout.VVerticalLayout; + +public class VerticalLayoutState extends AbstractOrderedLayoutState { + { + primaryStyleName = VVerticalLayout.CLASSNAME; + } +} diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/com/vaadin/shared/ui/panel/PanelState.java index 878b921d55..3061d54438 100644 --- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java +++ b/shared/src/com/vaadin/shared/ui/panel/PanelState.java @@ -15,9 +15,13 @@ */ 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; + } public int tabIndex; public int scrollLeft, scrollTop; }
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderState.java b/shared/src/com/vaadin/shared/ui/slider/SliderState.java index ca18f72b7a..3393dbbfb5 100644 --- a/shared/src/com/vaadin/shared/ui/slider/SliderState.java +++ b/shared/src/com/vaadin/shared/ui/slider/SliderState.java @@ -1,8 +1,12 @@ 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; + } public double value; diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java index 733f032726..8bddffdfd6 100644 --- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java +++ b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java @@ -21,7 +21,6 @@ import com.vaadin.shared.ComponentState; import com.vaadin.shared.Connector; public class AbstractSplitPanelState extends ComponentState { - public Connector firstChild = null; public Connector secondChild = null; public SplitterState splitterState = new SplitterState(); diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java new file mode 100644 index 0000000000..5472c17fdd --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java @@ -0,0 +1,9 @@ +package com.vaadin.shared.ui.splitpanel; + +import com.vaadin.client.ui.splitpanel.VSplitPanelHorizontal; + +public class HorizontalSplitPanelState extends AbstractSplitPanelState { + { + primaryStyleName = VSplitPanelHorizontal.CLASSNAME; + } +} diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java new file mode 100644 index 0000000000..0e97557769 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java @@ -0,0 +1,9 @@ +package com.vaadin.shared.ui.splitpanel; + +import com.vaadin.client.ui.splitpanel.VSplitPanelVertical; + +public class VerticalSplitPanelState extends AbstractSplitPanelState { + { + primaryStyleName = VSplitPanelVertical.CLASSNAME; + } +} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java new file mode 100644 index 0000000000..f03f9b9e5d --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java index a562c607b0..ca9481f5e3 100644 --- a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java +++ b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java @@ -15,10 +15,14 @@ */ 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; + } /** * Number of visible rows in the text area. The default is 5. diff --git a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java index 39265c516f..ebe99f729f 100644 --- a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java +++ b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java @@ -15,9 +15,14 @@ */ 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; + } + /** * Maximum character count in text field. */ diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/com/vaadin/shared/ui/tree/TreeState.java new file mode 100644 index 0000000000..3785051276 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/tree/TreeState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java new file mode 100644 index 0000000000..9199c1c267 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java new file mode 100644 index 0000000000..a0e554a084 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java @@ -0,0 +1,10 @@ +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; + } +} diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/com/vaadin/shared/ui/video/VideoState.java index 2e6e24a743..4232888328 100644 --- a/shared/src/com/vaadin/shared/ui/video/VideoState.java +++ b/shared/src/com/vaadin/shared/ui/video/VideoState.java @@ -15,8 +15,11 @@ */ 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; + } } |