diff options
| author | Denis <denis@vaadin.com> | 2017-01-20 10:13:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-20 10:13:25 +0200 |
| commit | 1fb40df8742791803e0a08328028bbbd67deb78b (patch) | |
| tree | 0af44b046f5b76f775f5da4e65e5be69bb2764b0 /shared | |
| parent | f42b9657b818da483b839d3b43b4cf55552ef034 (diff) | |
| download | vaadin-framework-1fb40df8742791803e0a08328028bbbd67deb78b.tar.gz vaadin-framework-1fb40df8742791803e0a08328028bbbd67deb78b.zip | |
Overload AbstarctComponent.setDescription() with content mode parameter (#8252)
* Overload AbstarctComponent.setDescription() with content mode parameter
Fixes #8185
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/main/java/com/vaadin/shared/AbstractComponentState.java | 3 | ||||
| -rw-r--r-- | shared/src/main/java/com/vaadin/shared/ui/ContentMode.java (renamed from shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java) | 2 | ||||
| -rw-r--r-- | shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java b/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java index a60ae7aaf5..81f808f676 100644 --- a/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java +++ b/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java @@ -20,6 +20,7 @@ import java.util.List; import com.vaadin.shared.annotations.NoLayout; import com.vaadin.shared.communication.SharedState; +import com.vaadin.shared.ui.ContentMode; /** * Default shared state implementation for AbstractComponent. @@ -33,6 +34,8 @@ public class AbstractComponentState extends SharedState { public String width = ""; @NoLayout public String description = ""; + @NoLayout + public ContentMode descriptionContentMode = ContentMode.PREFORMATTED; // Note: for the caption, there is a difference between null and an empty // string! public String caption = null; diff --git a/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/main/java/com/vaadin/shared/ui/ContentMode.java index f5d31fe46f..e283728425 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java +++ b/shared/src/main/java/com/vaadin/shared/ui/ContentMode.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.shared.ui.label; +package com.vaadin.shared.ui; /** * Content modes defining how the client should interpret a Label's value. diff --git a/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java b/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java index 40a6399817..84e65449e6 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java @@ -16,6 +16,7 @@ package com.vaadin.shared.ui.label; import com.vaadin.shared.AbstractComponentState; +import com.vaadin.shared.ui.ContentMode; public class LabelState extends AbstractComponentState { { |