Add column freezing to Escalator (#3087)

Change-Id: I9943b20ca2568c353c90dec598534fbb5ab58203

4 files changed, 38 insertions, 12 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java b/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java
index c8a35b702f..a9cd22365e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java
+++ b/uitest/src/com/vaadin/tests/components/grid/BasicEscalator.java
@@ -57,9 +57,9 @@ public class BasicEscalator extends AbstractTestUI {
                     @Override
                     @SuppressWarnings("boxing")
                     public void buttonClick(final ClickEvent event) {
-                        final int offset = Integer.valueOf(insertRowsOffset
+                        final int offset = Integer.parseInt(insertRowsOffset
                                 .getValue());
-                        final int amount = Integer.valueOf(insertRowsAmount
+                        final int amount = Integer.parseInt(insertRowsAmount
                                 .getValue());
                         grid.insertRows(offset, amount);
                     }
@@ -80,9 +80,9 @@ public class BasicEscalator extends AbstractTestUI {
                     @Override
                     @SuppressWarnings("boxing")
                     public void buttonClick(final ClickEvent event) {
-                        final int offset = Integer.valueOf(removeRowsOffset
+                        final int offset = Integer.parseInt(removeRowsOffset
                                 .getValue());
-                        final int amount = Integer.valueOf(removeRowsAmount
+                        final int amount = Integer.parseInt(removeRowsAmount
                                 .getValue());
                         grid.removeRows(offset, amount);
                     }
@@ -99,9 +99,9 @@ public class BasicEscalator extends AbstractTestUI {
                     @Override
                     @SuppressWarnings("boxing")
                     public void buttonClick(final ClickEvent event) {
-                        final int offset = Integer.valueOf(insertColumnsOffset
+                        final int offset = Integer.parseInt(insertColumnsOffset
                                 .getValue());
-                        final int amount = Integer.valueOf(insertColumnsAmount
+                        final int amount = Integer.parseInt(insertColumnsAmount
                                 .getValue());
                         grid.insertColumns(offset, amount);
                     }
@@ -118,9 +118,9 @@ public class BasicEscalator extends AbstractTestUI {
                     @Override
                     @SuppressWarnings("boxing")
                     public void buttonClick(final ClickEvent event) {
-                        final int offset = Integer.valueOf(removeColumnsOffset
+                        final int offset = Integer.parseInt(removeColumnsOffset
                                 .getValue());
-                        final int amount = Integer.valueOf(removeColumnsAmount
+                        final int amount = Integer.parseInt(removeColumnsAmount
                                 .getValue());
                         grid.removeColumns(offset, amount);
                     }
@@ -146,14 +146,14 @@ public class BasicEscalator extends AbstractTestUI {
                     public void buttonClick(final ClickEvent event) {
                         int index;
                         try {
-                            index = Integer.valueOf(rowIndex.getValue());
+                            index = Integer.parseInt(rowIndex.getValue());
                         } catch (NumberFormatException e) {
                             index = 0;
                         }
 
                         int padding;
                         try {
-                            padding = Integer.valueOf(rowPadding.getValue());
+                            padding = Integer.parseInt(rowPadding.getValue());
                         } catch (NumberFormatException e) {
                             padding = 0;
                         }
@@ -183,14 +183,14 @@ public class BasicEscalator extends AbstractTestUI {
                     public void buttonClick(final ClickEvent event) {
                         int index;
                         try {
-                            index = Integer.valueOf(colIndex.getValue());
+                            index = Integer.parseInt(colIndex.getValue());
                         } catch (NumberFormatException e) {
                             index = 0;
                         }
 
                         int padding;
                         try {
-                            padding = Integer.valueOf(colPadding.getValue());
+                            padding = Integer.parseInt(colPadding.getValue());
                         } catch (NumberFormatException e) {
                             padding = 0;
                         }
@@ -200,6 +200,20 @@ public class BasicEscalator extends AbstractTestUI {
                     }
                 }));
         addComponent(colScroll);
+
+        final TextField freezeCount = new TextField();
+        freezeCount.setConverter(Integer.class);
+        freezeCount.setNullRepresentation("");
+        addComponent(new HorizontalLayout(freezeCount, new Button(
+                "set frozen columns", new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        grid.setFrozenColumns(((Integer) freezeCount
+                                .getConvertedValue()).intValue());
+                        freezeCount.setValue(null);
+                    }
+                })));
+
     }
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridClientRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridClientRpc.java
index 3c831d2cb4..71fcd63086 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridClientRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridClientRpc.java
@@ -29,4 +29,6 @@ public interface TestGridClientRpc extends ClientRpc {
     void scrollToRow(int index, String destination, int padding);
 
     void scrollToColumn(int index, String destination, int padding);
+
+    void setFrozenColumns(int frozenColumns);
 }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridConnector.java
index 6a024b9d96..7b722e03c0 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/TestGridConnector.java
@@ -76,6 +76,12 @@ public class TestGridConnector extends AbstractComponentConnector {
                 }
                 return d;
             }
+
+            @Override
+            public void setFrozenColumns(int frozenColumns) {
+                getWidget().getColumnConfiguration().setFrozenColumnCount(
+                        frozenColumns);
+            }
         });
     }
 
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/grid/TestGrid.java b/uitest/src/com/vaadin/tests/widgetset/server/grid/TestGrid.java
index c4a642aafe..e37d9ccee0 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/grid/TestGrid.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/grid/TestGrid.java
@@ -61,4 +61,8 @@ public class TestGrid extends AbstractComponent {
     public void scrollToColumn(int index, String destination, int padding) {
         rpc().scrollToColumn(index, destination, padding);
     }
+
+    public void setFrozenColumns(int frozenColumns) {
+        rpc().setFrozenColumns(frozenColumns);
+    }
 }