Flatten Header and Footer API into client-side Grid (#13334)

Change-Id: I70d6d79efbf8d6b14d89d836779cbf16173887fc

2 files changed, 30 insertions, 40 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 ce899be8f9..cdf674e570 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
@@ -42,12 +42,10 @@ import com.vaadin.client.ui.grid.EditorRowHandler;
 import com.vaadin.client.ui.grid.FlyweightCell;
 import com.vaadin.client.ui.grid.Grid;
 import com.vaadin.client.ui.grid.Grid.CellStyleGenerator;
+import com.vaadin.client.ui.grid.Grid.FooterRow;
+import com.vaadin.client.ui.grid.Grid.HeaderRow;
 import com.vaadin.client.ui.grid.Grid.SelectionMode;
 import com.vaadin.client.ui.grid.GridColumn;
-import com.vaadin.client.ui.grid.GridFooter;
-import com.vaadin.client.ui.grid.GridFooter.FooterRow;
-import com.vaadin.client.ui.grid.GridHeader;
-import com.vaadin.client.ui.grid.GridHeader.HeaderRow;
 import com.vaadin.client.ui.grid.Renderer;
 import com.vaadin.client.ui.grid.datasources.ListDataSource;
 import com.vaadin.client.ui.grid.datasources.ListSorter;
@@ -343,7 +341,7 @@ public class GridBasicClientFeaturesWidget extends
             column.setHeaderText("Header (0," + c + ")");
         }
 
-        HeaderRow row = grid.getHeader().getDefaultRow();
+        HeaderRow row = grid.getDefaultHeaderRow();
         for (int i = 0; i < col; ++i) {
             String caption = "Header (0," + i + ")";
             GridColumn<?, ?> column = grid.getColumn(i);
@@ -628,7 +626,7 @@ public class GridBasicClientFeaturesWidget extends
             addMenuCommand("HTML Header", new ScheduledCommand() {
                 @Override
                 public void execute() {
-                    grid.getHeader().getRow(0).getCell(column)
+                    grid.getHeaderRow(0).getCell(column)
                             .setHtml("<b>HTML Header</b>");
                 }
             }, "Component", "Columns", "Column " + i, "Header Type");
@@ -643,8 +641,7 @@ public class GridBasicClientFeaturesWidget extends
                             button.setText("Clicked");
                         }
                     });
-                    grid.getHeader().getRow(0).getCell(column)
-                            .setWidget(button);
+                    grid.getHeaderRow(0).getCell(column).setWidget(button);
                 }
             }, "Component", "Columns", "Column " + i, "Header Type");
 
@@ -652,14 +649,13 @@ public class GridBasicClientFeaturesWidget extends
             addMenuCommand("Text Footer", new ScheduledCommand() {
                 @Override
                 public void execute() {
-                    grid.getFooter().getRow(0).getCell(column)
-                            .setText("Text Footer");
+                    grid.getFooterRow(0).getCell(column).setText("Text Footer");
                 }
             }, "Component", "Columns", "Column " + i, "Footer Type");
             addMenuCommand("HTML Footer", new ScheduledCommand() {
                 @Override
                 public void execute() {
-                    grid.getFooter().getRow(0).getCell(column)
+                    grid.getFooterRow(0).getCell(column)
                             .setHtml("<b>HTML Footer</b>");
                 }
             }, "Component", "Columns", "Column " + i, "Footer Type");
@@ -674,8 +670,7 @@ public class GridBasicClientFeaturesWidget extends
                             button.setText("Clicked");
                         }
                     });
-                    grid.getFooter().getRow(0).getCell(column)
-                            .setWidget(button);
+                    grid.getFooterRow(0).getCell(column).setWidget(button);
                 }
             }, "Component", "Columns", "Column " + i, "Footer Type");
         }
@@ -719,66 +714,65 @@ public class GridBasicClientFeaturesWidget extends
     }
 
     private void createHeaderMenu() {
-        final GridHeader header = grid.getHeader();
         final String[] menuPath = { "Component", "Header" };
 
         addMenuCommand("Visible", new ScheduledCommand() {
             @Override
             public void execute() {
-                header.setVisible(!header.isVisible());
+                grid.setHeaderVisible(!grid.isHeaderVisible());
             }
         }, menuPath);
 
         addMenuCommand("Top", new ScheduledCommand() {
             @Override
             public void execute() {
-                header.setDefaultRow(header.getRow(0));
+                grid.setDefaultHeaderRow(grid.getHeaderRow(0));
             }
         }, "Component", "Header", "Default row");
         addMenuCommand("Bottom", new ScheduledCommand() {
             @Override
             public void execute() {
-                header.setDefaultRow(header.getRow(header.getRowCount() - 1));
+                grid.setDefaultHeaderRow(grid.getHeaderRow(grid
+                        .getHeaderRowCount() - 1));
             }
         }, "Component", "Header", "Default row");
         addMenuCommand("Unset", new ScheduledCommand() {
             @Override
             public void execute() {
-                header.setDefaultRow(null);
+                grid.setDefaultHeaderRow(null);
             }
         }, "Component", "Header", "Default row");
 
         addMenuCommand("Prepend row", new ScheduledCommand() {
             @Override
             public void execute() {
-                configureHeaderRow(header.prependRow());
+                configureHeaderRow(grid.prependHeaderRow());
             }
         }, menuPath);
         addMenuCommand("Append row", new ScheduledCommand() {
             @Override
             public void execute() {
-                configureHeaderRow(header.appendRow());
+                configureHeaderRow(grid.appendHeaderRow());
             }
         }, menuPath);
         addMenuCommand("Remove top row", new ScheduledCommand() {
             @Override
             public void execute() {
-                header.removeRow(0);
+                grid.removeHeaderRow(0);
             }
         }, menuPath);
         addMenuCommand("Remove bottom row", new ScheduledCommand() {
             @Override
             public void execute() {
-                header.removeRow(header.getRowCount() - 1);
+                grid.removeHeaderRow(grid.getHeaderRowCount() - 1);
             }
         }, menuPath);
 
     }
 
     private void configureHeaderRow(final HeaderRow row) {
-        final GridHeader header = grid.getHeader();
         setHeaderTexts(row);
-        String rowTitle = "Row " + header.getRowCount();
+        String rowTitle = "Row " + grid.getHeaderRowCount();
         final String[] menuPath = { "Component", "Header", rowTitle };
 
         addMenuCommand("Join column cells 0, 1", new ScheduledCommand() {
@@ -828,39 +822,38 @@ public class GridBasicClientFeaturesWidget extends
     }
 
     private void createFooterMenu() {
-        final GridFooter footer = grid.getFooter();
         final String[] menuPath = { "Component", "Footer" };
 
         addMenuCommand("Visible", new ScheduledCommand() {
             @Override
             public void execute() {
-                footer.setVisible(!footer.isVisible());
+                grid.setFooterVisible(!grid.isFooterVisible());
             }
         }, menuPath);
 
         addMenuCommand("Prepend row", new ScheduledCommand() {
             @Override
             public void execute() {
-                configureFooterRow(footer.prependRow());
+                configureFooterRow(grid.prependFooterRow());
             }
         }, menuPath);
         addMenuCommand("Append row", new ScheduledCommand() {
             @Override
             public void execute() {
-                configureFooterRow(footer.appendRow());
+                configureFooterRow(grid.appendFooterRow());
             }
         }, menuPath);
         addMenuCommand("Remove top row", new ScheduledCommand() {
             @Override
             public void execute() {
-                footer.removeRow(0);
+                grid.removeFooterRow(0);
             }
         }, menuPath);
         addMenuCommand("Remove bottom row", new ScheduledCommand() {
             @Override
             public void execute() {
-                assert footer.getRowCount() > 0;
-                footer.removeRow(footer.getRowCount() - 1);
+                assert grid.getFooterRowCount() > 0;
+                grid.removeFooterRow(grid.getFooterRowCount() - 1);
             }
         }, menuPath);
     }
@@ -912,9 +905,8 @@ public class GridBasicClientFeaturesWidget extends
     }
 
     private void configureFooterRow(final FooterRow row) {
-        final GridFooter footer = grid.getFooter();
         setFooterTexts(row);
-        String rowTitle = "Row " + footer.getRowCount();
+        String rowTitle = "Row " + grid.getFooterRowCount();
         final String[] menuPath = { "Component", "Footer", rowTitle };
 
         addMenuCommand("Join column cells 0, 1", new ScheduledCommand() {
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
index bde16b817e..3290c67467 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
@@ -145,12 +145,12 @@ public class GridClientColumnRendererConnector extends
         // Add a column to display the data in
         GridColumn<String, String> c = createColumnWithRenderer(Renderers.TEXT_RENDERER);
         grid.addColumn(c);
-        grid.getHeader().getDefaultRow().getCell(c).setText("Column 1");
+        grid.getDefaultHeaderRow().getCell(c).setText("Column 1");
 
         // Add another column with a custom complex renderer
         c = createColumnWithRenderer(Renderers.CPLX_RENDERER);
         grid.addColumn(c);
-        grid.getHeader().getDefaultRow().getCell(c).setText("Column 2");
+        grid.getDefaultHeaderRow().getCell(c).setText("Column 2");
 
         // Add method for testing sort event firing
         grid.addSortHandler(new SortHandler<String>() {
@@ -161,9 +161,8 @@ public class GridClientColumnRendererConnector extends
                 String text = "Client-side sort event received<br>"
                         + "Columns: " + event.getOrder().size() + ", order: ";
                 for (SortOrder order : event.getOrder()) {
-                    String columnHeader = getWidget().getHeader()
-                            .getDefaultRow().getCell(order.getColumn())
-                            .getText();
+                    String columnHeader = getWidget().getDefaultHeaderRow()
+                            .getCell(order.getColumn()).getText();
                     text += columnHeader + ": "
                             + order.getDirection().toString();
                 }
@@ -189,8 +188,7 @@ public class GridClientColumnRendererConnector extends
                         getWidget().addColumn(column);
 
                         getWidget()
-                                .getHeader()
-                                .getDefaultRow()
+                                .getDefaultHeaderRow()
                                 .getCell(column)
                                 .setText(
                                         "Column "