diff options
author | Leif Åstrand <leif@vaadin.com> | 2012-08-22 20:14:30 +0300 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2012-08-22 20:14:30 +0300 |
commit | 38358ae25543433f8cc381101bc340adc7e5c67f (patch) | |
tree | e494d807e1031c04a3d07a0c56dd60be9ae6578a /shared | |
parent | 02878bd07a38dc69fe415c7f60238817d2a7c434 (diff) | |
download | vaadin-framework-38358ae25543433f8cc381101bc340adc7e5c67f.tar.gz vaadin-framework-38358ae25543433f8cc381101bc340adc7e5c67f.zip |
Support using public fields in state classes (#9324)
Diffstat (limited to 'shared')
-rw-r--r-- | shared/src/com/vaadin/shared/ui/label/LabelState.java | 21 | ||||
-rw-r--r-- | shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java | 2 |
2 files changed, 3 insertions, 20 deletions
diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java index 35e27bc63d..a91aeb0aa1 100644 --- a/shared/src/com/vaadin/shared/ui/label/LabelState.java +++ b/shared/src/com/vaadin/shared/ui/label/LabelState.java @@ -18,23 +18,6 @@ package com.vaadin.shared.ui.label; import com.vaadin.shared.ComponentState; public class LabelState extends ComponentState { - private ContentMode contentMode = ContentMode.TEXT; - private String text = ""; - - public ContentMode getContentMode() { - return contentMode; - } - - public void setContentMode(ContentMode contentMode) { - this.contentMode = contentMode; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - + public ContentMode contentMode = ContentMode.TEXT; + public String text = ""; } diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java index 3fa2ad771c..35456ab9ac 100644 --- a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java +++ b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java @@ -25,7 +25,7 @@ import com.vaadin.shared.ui.AlignmentInfo; public class AbstractOrderedLayoutState extends AbstractLayoutState { private boolean spacing = false; - public HashMap<Connector, ChildComponentData> childData = new HashMap<Connector, ChildComponentData>(); + private HashMap<Connector, ChildComponentData> childData = new HashMap<Connector, ChildComponentData>(); private int marginsBitmask = 0; |