diff options
author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-01 15:07:30 +0300 |
---|---|---|
committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-08-07 15:38:23 +0300 |
commit | c8e0335ccd4e2af54efe752fc98b20c52fafabcf (patch) | |
tree | aa81255e3735cc4ce34472a067a2e33bee7c437d /shared | |
parent | 94dfb5d68dd6c1e3542edc80488fe53a9da2d0e5 (diff) | |
download | vaadin-framework-c8e0335ccd4e2af54efe752fc98b20c52fafabcf.tar.gz vaadin-framework-c8e0335ccd4e2af54efe752fc98b20c52fafabcf.zip |
Add server side support for Components in Headers and Footers (#13334)
Change-Id: Ic5a6b4c68bc2d09840cbd7faffebae8991a5fff4
Diffstat (limited to 'shared')
-rw-r--r-- | shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java | 39 | ||||
-rw-r--r-- | shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java | 8 |
2 files changed, 47 insertions, 0 deletions
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java b/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java new file mode 100644 index 0000000000..eae4bc8da4 --- /dev/null +++ b/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java @@ -0,0 +1,39 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.shared.ui.grid; + +/** + * Enumeration, specifying the content type of a Cell in a GridStaticSection. + * + * @since + * @author Vaadin Ltd + */ +public enum GridStaticCellType { + /** + * Text content + */ + TEXT, + + /** + * HTML content + */ + HTML, + + /** + * Widget content + */ + WIDGET; +}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java b/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java index 41f56199da..c3c373b5af 100644 --- a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java +++ b/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java @@ -19,6 +19,8 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import com.vaadin.shared.Connector; + /** * Shared state for Grid headers and footers. * @@ -29,6 +31,12 @@ public class GridStaticSectionState implements Serializable { public static class CellState implements Serializable { public String text = ""; + + public String html = ""; + + public Connector connector = null; + + public GridStaticCellType type = GridStaticCellType.TEXT; } public static class RowState implements Serializable { |