From d5860be5b6043c9b6f9a1b5b1550b1666af2d6ef Mon Sep 17 00:00:00 2001
From: Teppo Kurki <teppo.kurki@vaadin.com>
Date: Wed, 3 Jun 2015 14:26:35 +0300
Subject: Use headerCaption as default hidingToggleCaption (#18028)

Change-Id: Ifaf288da98d6d1d1c02760784b832cb5b5d93c07
---
 client/src/com/vaadin/client/connectors/GridConnector.java | 2 ++
 client/src/com/vaadin/client/widgets/Grid.java             | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'client/src')

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
-- 
cgit v1.2.3