Removed deprecated header and footer renderers #13334

Removed header and footer renderers as well as some other deprecated
setters which has been replaced with direct access to the header cells.

Change-Id: Ibaec4b098ebddd4b6ba74c96827e55f9808828d8

4 files changed, 16 insertions, 221 deletions

diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java
index dbfaf15813..f800a8cb3b 100644
--- a/client/src/com/vaadin/client/ui/grid/Grid.java
+++ b/client/src/com/vaadin/client/ui/grid/Grid.java
@@ -48,7 +48,6 @@ import com.vaadin.client.ui.SubPartAware;
 import com.vaadin.client.ui.grid.GridHeader.HeaderRow;
 import com.vaadin.client.ui.grid.GridStaticSection.StaticCell;
 import com.vaadin.client.ui.grid.renderers.ComplexRenderer;
-import com.vaadin.client.ui.grid.renderers.TextRenderer;
 import com.vaadin.client.ui.grid.renderers.WidgetRenderer;
 import com.vaadin.client.ui.grid.selection.HasSelectionChangeHandlers;
 import com.vaadin.client.ui.grid.selection.SelectionChangeEvent;
@@ -66,7 +65,6 @@ import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.shared.ui.grid.Range;
 import com.vaadin.shared.ui.grid.ScrollDestination;
 import com.vaadin.shared.ui.grid.SortDirection;
-import com.vaadin.shared.util.SharedUtil;
 
 /**
  * A data grid view that supports columns and lazy loading of data rows from a
@@ -429,16 +427,6 @@ public class Grid<T> extends Composite implements
 
         public SelectionColumn(final Renderer<Boolean> selectColumnRenderer) {
             super(selectColumnRenderer);
-
-            setHeaderRenderer(new Renderer<String>() {
-                @Override
-                public void render(FlyweightCell cell, String data) {
-                    if (cell.getRow() == escalator.getHeader().getRowCount() - 1) {
-                        // TODO: header "select all / select none" logic
-                        selectColumnRenderer.render(cell, Boolean.FALSE);
-                    }
-                }
-            });
         }
 
         public void initDone() {
@@ -446,46 +434,6 @@ public class Grid<T> extends Composite implements
         }
 
         @Override
-        public void setFooterCaption(String caption) {
-            if (!SharedUtil.equals(caption, getFooterCaption()) && initDone) {
-                throw new UnsupportedOperationException("The selection "
-                        + "column cannot be modified after init");
-            } else {
-                super.setFooterCaption(caption);
-            }
-        }
-
-        @Override
-        public void setFooterRenderer(Renderer<String> renderer) {
-            if (!SharedUtil.equals(renderer, getFooterRenderer()) && initDone) {
-                throw new UnsupportedOperationException("The selection "
-                        + "column cannot be modified after init");
-            } else {
-                super.setFooterRenderer(renderer);
-            }
-        }
-
-        @Override
-        public void setHeaderCaption(String caption) {
-            if (!SharedUtil.equals(caption, getHeaderCaption()) && initDone) {
-                throw new UnsupportedOperationException("The selection "
-                        + "column cannot be modified after init");
-            } else {
-                super.setHeaderCaption(caption);
-            }
-        }
-
-        @Override
-        public void setHeaderRenderer(Renderer<String> renderer) {
-            if (!SharedUtil.equals(renderer, getHeaderRenderer()) && initDone) {
-                throw new UnsupportedOperationException("The selection "
-                        + "column cannot be modified after init");
-            } else {
-                super.setHeaderRenderer(renderer);
-            }
-        }
-
-        @Override
         public void setVisible(boolean visible) {
             if (!visible && initDone) {
                 throw new UnsupportedOperationException("The selection "
@@ -917,18 +865,6 @@ public class Grid<T> extends Composite implements
          */
         private Renderer<? super C> bodyRenderer;
 
-        /**
-         * Renderer for rendering the header cell value into the cell
-         */
-        @Deprecated
-        private Renderer<String> headerRenderer = new TextRenderer();
-
-        /**
-         * Renderer for rendering the footer cell value into the cell
-         */
-        @Deprecated
-        private Renderer<String> footerRenderer = new TextRenderer();
-
         private boolean sortable = false;
 
         /**
@@ -945,28 +881,6 @@ public class Grid<T> extends Composite implements
         }
 
         /**
-         * Constructs a new column with custom renderers for rows, header and
-         * footer cells.
-         * 
-         * @param bodyRenderer
-         *            The renderer to use for rendering body cells
-         * @param headerRenderer
-         *            The renderer to use for rendering header cells
-         * @param footerRenderer
-         *            The renderer to use for rendering footer cells
-         */
-        public AbstractGridColumn(Renderer<C> bodyRenderer,
-                Renderer<String> headerRenderer, Renderer<String> footerRenderer) {
-            this(bodyRenderer);
-            if (headerRenderer == null || footerRenderer == null) {
-                throw new IllegalArgumentException("Renderer cannot be null.");
-            }
-
-            this.headerRenderer = headerRenderer;
-            this.footerRenderer = footerRenderer;
-        }
-
-        /**
          * Internally used by the grid to set itself
          * 
          * @param grid
@@ -982,120 +896,6 @@ public class Grid<T> extends Composite implements
         }
 
         /**
-         * Gets text in the header of the column. By default the header caption
-         * is empty.
-         * 
-         * @return the text displayed in the column caption
-         */
-        @Deprecated
-        public String getHeaderCaption() {
-            return header;
-        }
-
-        /**
-         * Returns the renderer used for rendering the header cells
-         * 
-         * @return a renderer that renders header cells
-         */
-        @Deprecated
-        public Renderer<String> getHeaderRenderer() {
-            return headerRenderer;
-        }
-
-        /**
-         * Sets the renderer that renders header cells. Should not be null.
-         * 
-         * @param renderer
-         *            The renderer to use for rendering header cells.
-         */
-        @Deprecated
-        public void setHeaderRenderer(Renderer<String> renderer) {
-            if (renderer == null) {
-                throw new IllegalArgumentException("Renderer cannot be null.");
-            }
-            this.headerRenderer = headerRenderer;
-            if (grid != null) {
-                grid.refreshHeader();
-            }
-        }
-
-        /**
-         * Returns the renderer used for rendering the footer cells
-         * 
-         * @return a renderer that renders footer cells
-         */
-        @Deprecated
-        public Renderer<String> getFooterRenderer() {
-            return footerRenderer;
-        }
-
-        /**
-         * Sets the renderer that renders footer cells. Should not be null.
-         * 
-         * @param renderer
-         *            The renderer to use for rendering footer cells.
-         */
-        @Deprecated
-        public void setFooterRenderer(Renderer<String> renderer) {
-            if (renderer == null) {
-                throw new IllegalArgumentException("Renderer cannot be null.");
-            }
-            footerRenderer = renderer;
-            if (grid != null) {
-                grid.refreshFooter();
-            }
-        }
-
-        /**
-         * Sets the text in the header of the column.
-         * 
-         * @param caption
-         *            the text displayed in the column header
-         */
-        @Deprecated
-        public void setHeaderCaption(String caption) {
-            if (SharedUtil.equals(caption, header)) {
-                return;
-            }
-
-            header = caption;
-
-            if (grid != null) {
-                grid.refreshHeader();
-            }
-        }
-
-        /**
-         * Gets text in the footer of the column. By default the footer caption
-         * is empty.
-         * 
-         * @return The text displayed in the footer of the column
-         */
-        @Deprecated
-        public String getFooterCaption() {
-            return footer;
-        }
-
-        /**
-         * Sets text in the footer of the column.
-         * 
-         * @param caption
-         *            the text displayed in the footer of the column
-         */
-        @Deprecated
-        public void setFooterCaption(String caption) {
-            if (SharedUtil.equals(caption, footer)) {
-                return;
-            }
-
-            footer = caption;
-
-            if (grid != null) {
-                grid.refreshFooter();
-            }
-        }
-
-        /**
          * Is the column visible. By default all columns are visible.
          * 
          * @return <code>true</code> if the column is visible
@@ -1607,9 +1407,7 @@ public class Grid<T> extends Composite implements
 
         // Sink all renderer events
         Set<String> events = new HashSet<String>();
-        events.addAll(getConsumedEventsForRenderer(column.getHeaderRenderer()));
         events.addAll(getConsumedEventsForRenderer(column.getRenderer()));
-        events.addAll(getConsumedEventsForRenderer(column.getFooterRenderer()));
 
         sinkEvents(events);
     }
diff --git a/client/src/com/vaadin/client/ui/grid/GridConnector.java b/client/src/com/vaadin/client/ui/grid/GridConnector.java
index 7582bee0bf..2a06aba3e6 100644
--- a/client/src/com/vaadin/client/ui/grid/GridConnector.java
+++ b/client/src/com/vaadin/client/ui/grid/GridConnector.java
@@ -393,8 +393,6 @@ public class GridConnector extends AbstractComponentConnector {
     private static void updateColumnFromState(GridColumn<?, JSONObject> column,
             GridColumnState state) {
         column.setVisible(state.visible);
-        column.setHeaderCaption(state.header);
-        column.setFooterCaption(state.footer);
         column.setWidth(state.width);
         column.setSortable(state.sortable);
     }
diff --git a/client/src/com/vaadin/client/ui/grid/sort/SortOrder.java b/client/src/com/vaadin/client/ui/grid/sort/SortOrder.java
index 34279bdc04..682beda793 100644
--- a/client/src/com/vaadin/client/ui/grid/sort/SortOrder.java
+++ b/client/src/com/vaadin/client/ui/grid/sort/SortOrder.java
@@ -69,10 +69,4 @@ public class SortOrder {
     public SortDirection getDirection() {
         return direction;
     }
-
-    @Override
-    public String toString() {
-        return column.getHeaderCaption() + " (" + direction + ")";
-    }
-
 }
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 549d6eee85..e685034c7b 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
@@ -136,8 +136,8 @@ public class GridClientColumnRendererConnector extends
 
         // Add a column to display the data in
         GridColumn<String, String> c = createColumnWithRenderer(Renderers.TEXT_RENDERER);
-        c.setHeaderCaption("Column 1");
         grid.addColumn(c);
+        grid.getHeader().getDefaultRow().getCell(0).setText("Column 1");
 
         // Add method for testing sort event firing
         grid.addSortHandler(new SortEventHandler<String>() {
@@ -148,7 +148,11 @@ public class GridClientColumnRendererConnector extends
                 String text = "Client-side sort event received<br>"
                         + "Columns: " + event.getOrder().size() + ", order: ";
                 for (SortOrder order : event.getOrder()) {
-                    text += order.getColumn().getHeaderCaption() + ": "
+                    int colIdx = getWidget().getColumns().indexOf(
+                            order.getColumn());
+                    String columnHeader = getWidget().getHeader()
+                            .getDefaultRow().getCell(colIdx).getText();
+                    text += columnHeader + ": "
                             + order.getDirection().toString();
                 }
                 console.setInnerHTML(text);
@@ -164,25 +168,26 @@ public class GridClientColumnRendererConnector extends
 
                         if (renderer == Renderers.NUMBER_RENDERER) {
                             GridColumn<Number, String> numberColumn = createNumberColumnWithRenderer(renderer);
-                            numberColumn.setHeaderCaption("Column "
-                                    + String.valueOf(getWidget()
-                                            .getColumnCount() + 1));
                             getWidget().addColumn(numberColumn);
 
                         } else if (renderer == Renderers.DATE_RENDERER) {
                             GridColumn<Date, String> dateColumn = createDateColumnWithRenderer(renderer);
-                            dateColumn.setHeaderCaption("Column "
-                                    + String.valueOf(getWidget()
-                                            .getColumnCount() + 1));
                             getWidget().addColumn(dateColumn);
 
                         } else {
                             GridColumn<String, String> column = createColumnWithRenderer(renderer);
-                            column.setHeaderCaption("Column "
-                                    + String.valueOf(getWidget()
-                                            .getColumnCount() + 1));
                             getWidget().addColumn(column);
                         }
+
+                        int idx = getWidget().getColumnCount() - 1;
+                        getWidget()
+                                .getHeader()
+                                .getDefaultRow()
+                                .getCell(idx)
+                                .setText(
+                                        "Column "
+                                                + String.valueOf(getWidget()
+                                                        .getColumnCount() + 1));
                     }
 
                     @Override