summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/connectors/GridConnector.java2
-rw-r--r--client/src/com/vaadin/client/widgets/Grid.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/connectors/GridConnector.java b/client/src/com/vaadin/client/connectors/GridConnector.java
index d3fa678c3e..f2246b1e5f 100644
--- a/client/src/com/vaadin/client/connectors/GridConnector.java
+++ b/client/src/com/vaadin/client/connectors/GridConnector.java
@@ -1198,6 +1198,8 @@ public class GridConnector extends AbstractHasComponentsConnector implements
column.setSortable(state.sortable);
+ column.setHeaderCaption(state.headerCaption);
+
column.setHidden(state.hidden);
column.setHidable(state.hidable);
column.setHidingToggleCaption(state.hidingToggleCaption);
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 9393ffb48c..fa74b16317 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -4390,8 +4390,8 @@ public class Grid<T> extends ResizeComposite implements
* for this column in the grid's sidebar when the column is
* {@link #isHidable() hidable}.
* <p>
- * Defaults to <code>null</code>, when will use whatever is set with
- * {@link #setHeaderCaption(String)}.
+ * The default value is <code>null</code>. In this case the header
+ * caption is used, see {@link #setHeaderCaption(String)}.
*
* @since 7.5.0
* @param hidingToggleCaption