Use CellReference in Grid events and event handling (#13334)

Change-Id: Ie4ed85e56f0c23850eec56518a7493f5ed3257bd

1 files changed, 29 insertions, 30 deletions

diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
index 7baff45a22..73f604d2bc 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
@@ -42,7 +42,6 @@ import com.vaadin.client.renderers.NumberRenderer;
 import com.vaadin.client.renderers.Renderer;
 import com.vaadin.client.renderers.TextRenderer;
 import com.vaadin.client.ui.VLabel;
-import com.vaadin.client.widget.escalator.Cell;
 import com.vaadin.client.widget.grid.CellReference;
 import com.vaadin.client.widget.grid.CellStyleGenerator;
 import com.vaadin.client.widget.grid.EditorHandler;
@@ -1050,9 +1049,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyDown(GridKeyDownEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1061,9 +1060,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyDown(GridKeyDownEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1072,9 +1071,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyDown(GridKeyDownEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1084,9 +1083,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyUp(GridKeyUpEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1095,9 +1094,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyUp(GridKeyUpEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1106,9 +1105,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyUp(GridKeyUpEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1118,9 +1117,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyPress(GridKeyPressEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1129,9 +1128,9 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyPress(GridKeyPressEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
@@ -1140,16 +1139,16 @@ public class GridBasicClientFeaturesWidget extends
 
             @Override
             public void onKeyPress(GridKeyPressEvent event) {
-                Cell focused = event.getFocusedCell();
-                updateLabel(label, event.toDebugString(), focused.getRow(),
-                        focused.getColumn());
+                CellReference<?> focused = event.getFocusedCell();
+                updateLabel(label, event.toDebugString(),
+                        focused.getRowIndex(), focused.getColumnIndex());
             }
         });
 
     }
 
-    private void updateLabel(VLabel label, String output, int row, int col) {
-        String coords = "(" + row + ", " + col + ")";
+    private void updateLabel(VLabel label, String output, int object, int column) {
+        String coords = "(" + object + ", " + column + ")";
         label.setText(coords + " " + output);
     }
 }