merge master

1 files changed, 28 insertions, 0 deletions

diff --git a/src/com/vaadin/shared/ui/label/LabelState.java b/src/com/vaadin/shared/ui/label/LabelState.java
new file mode 100644
index 0000000000..0298e40179
--- /dev/null
+++ b/src/com/vaadin/shared/ui/label/LabelState.java
@@ -0,0 +1,28 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+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;
+    }
+
+}