Merge branch 'grid'

Change-Id: I31da151c65ce307d6205905682c6f1e6bbbed258

1 files changed, 4 insertions, 2 deletions

diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
index 53bf96c587..29e56b1b8c 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
@@ -17,6 +17,7 @@ package com.vaadin.tests.widgetset.client.grid;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.TableRowElement;
+import com.google.gwt.dom.client.TableSectionElement;
 import com.vaadin.client.widget.escalator.Cell;
 import com.vaadin.client.widget.escalator.ColumnConfiguration;
 import com.vaadin.client.widget.escalator.EscalatorUpdater;
@@ -138,7 +139,8 @@ public class EscalatorProxy extends Escalator {
         }
 
         @Override
-        public void setDefaultRowHeight(double px) throws IllegalArgumentException {
+        public void setDefaultRowHeight(double px)
+                throws IllegalArgumentException {
             rowContainer.setDefaultRowHeight(px);
         }
 
@@ -159,7 +161,7 @@ public class EscalatorProxy extends Escalator {
         }
 
         @Override
-        public Element getElement() {
+        public TableSectionElement getElement() {
             return rowContainer.getElement();
         }