summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/Grid.java
diff options
context:
space:
mode:
authorPekka Hyvönen <pekka@vaadin.com>2015-04-16 10:48:59 +0300
committerVaadin Code Review <review@vaadin.com>2015-04-16 09:32:14 +0000
commitebd18795aab03617a1ae39926d8569f4daef59d8 (patch)
tree44e2f3e52546b7aa61ad18ed259abaf780fb38de /server/src/com/vaadin/ui/Grid.java
parentdd550858b9b4300acac8e35159f4c93e7f58d8ed (diff)
downloadvaadin-framework-ebd18795aab03617a1ae39926d8569f4daef59d8.tar.gz
vaadin-framework-ebd18795aab03617a1ae39926d8569f4daef59d8.zip
Declarative support and tests for Grid's 7.5 features (#17481)
- Grid.Column.hidden and Grid.Column.hidable - Grid.columnReorderingAllowed Change-Id: Iee2e3ff7472bceef314403b750549c99e26a9546
Diffstat (limited to 'server/src/com/vaadin/ui/Grid.java')
-rw-r--r--server/src/com/vaadin/ui/Grid.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index ed526bc63c..9346248dd9 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -3200,6 +3200,10 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
getMaximumWidth(), def.maxWidth, Double.class);
DesignAttributeHandler.writeAttribute("expand", attributes,
getExpandRatio(), def.expandRatio, Integer.class);
+ DesignAttributeHandler.writeAttribute("hidable", attributes,
+ isHidable(), def.hidable, boolean.class);
+ DesignAttributeHandler.writeAttribute("hidden", attributes,
+ isHidden(), def.hidden, boolean.class);
DesignAttributeHandler.writeAttribute("property-id", attributes,
getPropertyId(), null, Object.class);
}
@@ -3225,7 +3229,14 @@ public class Grid extends AbstractComponent implements SelectionNotifier,
setEditable(DesignAttributeHandler.readAttribute("editable",
attributes, boolean.class));
}
-
+ if (design.hasAttr("hidable")) {
+ setHidable(DesignAttributeHandler.readAttribute("hidable",
+ attributes, boolean.class));
+ }
+ if (design.hasAttr("hidden")) {
+ setHidden(DesignAttributeHandler.readAttribute("hidden",
+ attributes, boolean.class));
+ }
// Read size info where necessary.
if (design.hasAttr("width")) {
setWidth(DesignAttributeHandler.readAttribute("width",