Use @DelegateToWidget instead of manual handling (#13334)

Change-Id: Iac7f742053b43e15e1bdf16d51cce7363987f291

diff --git a/client/src/com/vaadin/client/ui/grid/GridConnector.java b/client/src/com/vaadin/client/ui/grid/GridConnector.java
index 3b1ecb44d80cdeb3e8d63080f70abb80f5bead80..31e52b1c1c02cc0db5b2cbc02c7a93ece8fa1ea3 100644 (file)
--- a/client/src/com/vaadin/client/ui/grid/GridConnector.java
+++ b/client/src/com/vaadin/client/ui/grid/GridConnector.java
@@ -278,20 +278,6 @@ public class GridConnector extends AbstractComponentConnector {
             }
         }
 
-        /*
-         * @DelegateToWidget annotation doesn't work because of
-         * http://dev.vaadin.com/ticket/12900. Remove manual code and uncomment
-         * annotations at GridState once fixed.
-         */
-
-        if (stateChangeEvent.hasPropertyChanged("heightByRows")) {
-            getWidget().setHeightByRows(getState().heightByRows);
-        }
-
-        if (stateChangeEvent.hasPropertyChanged("heightMode")) {
-            getWidget().setHeightMode(getState().heightMode);
-        }
-
         if (stateChangeEvent.hasPropertyChanged("selectedKeys")) {
             selectionModel.updateFromState();
         }

diff --git a/shared/src/com/vaadin/shared/ui/grid/GridState.java b/shared/src/com/vaadin/shared/ui/grid/GridState.java
index 0b23e2c11dc91dbef385ae923cbfd846c697656e..d223d64e7e687fa1e5103e387be35f18035ccb6f 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/grid/GridState.java
+++ b/shared/src/com/vaadin/shared/ui/grid/GridState.java
@@ -85,19 +85,11 @@ public class GridState extends AbstractComponentState {
     public String lastFrozenColumnId = null;
 
     /** The height of the Grid in terms of body rows. */
-    // @DelegateToWidget
-    /*
-     * Annotation doesn't work because of http://dev.vaadin.com/ticket/12900.
-     * Remove manual code from Connector once fixed
-     */
+    @DelegateToWidget
     public double heightByRows = DEFAULT_HEIGHT_BY_ROWS;
 
     /** The mode by which Grid defines its height. */
-    // @DelegateToWidget
-    /*
-     * Annotation doesn't work because of http://dev.vaadin.com/ticket/12900.
-     * Remove manual code from Connector once fixed
-     */
+    @DelegateToWidget
     public HeightMode heightMode = HeightMode.CSS;
 
     /** FIXME remove once selection mode communcation is done. only for testing. */