diff options
author | Pekka Hyvönen <pekka@vaadin.com> | 2015-04-16 14:25:55 +0300 |
---|---|---|
committer | Pekka Hyvönen <pekka@vaadin.com> | 2015-04-16 14:25:55 +0300 |
commit | 6ed28680346c648a6b4e974568a56f6d4d0e000b (patch) | |
tree | 91c2fc722ec41a66b5ead524b2aa30865d004350 /server/src | |
parent | ebd18795aab03617a1ae39926d8569f4daef59d8 (diff) | |
download | vaadin-framework-6ed28680346c648a6b4e974568a56f6d4d0e000b.tar.gz vaadin-framework-6ed28680346c648a6b4e974568a56f6d4d0e000b.zip |
Declarative support and test for Grid.Column.hidingToggleCaption #17481
Change-Id: Ic20686649b28530160498742e78f69074e32e596
Diffstat (limited to 'server/src')
-rw-r--r-- | server/src/com/vaadin/ui/Grid.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index 9346248dd9..a7ff15c8dd 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -3204,6 +3204,10 @@ public class Grid extends AbstractComponent implements SelectionNotifier, isHidable(), def.hidable, boolean.class); DesignAttributeHandler.writeAttribute("hidden", attributes, isHidden(), def.hidden, boolean.class); + DesignAttributeHandler.writeAttribute("hiding-toggle-caption", + attributes, getHidingToggleCaption(), + SharedUtil.propertyIdToHumanFriendly(getPropertyId()), + String.class); DesignAttributeHandler.writeAttribute("property-id", attributes, getPropertyId(), null, Object.class); } @@ -3237,6 +3241,10 @@ public class Grid extends AbstractComponent implements SelectionNotifier, setHidden(DesignAttributeHandler.readAttribute("hidden", attributes, boolean.class)); } + if (design.hasAttr("hiding-toggle-caption")) { + setHidingToggleCaption(DesignAttributeHandler.readAttribute( + "hiding-toggle-caption", attributes, String.class)); + } // Read size info where necessary. if (design.hasAttr("width")) { setWidth(DesignAttributeHandler.readAttribute("width", |