Rename method to be consistent with Container.Viewer (#13334)

Change-Id: If5431f81e4e799508eb6a067748dec356de43b2f

3 files changed, 13 insertions, 13 deletions

diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 04b0e65a1e..9732aa4612 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -652,7 +652,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
             rows.add(index, row);
             getSectionState().rows.add(index, row.getRowState());
 
-            Indexed dataSource = grid.getContainerDatasource();
+            Indexed dataSource = grid.getContainerDataSource();
             for (Object id : dataSource.getContainerPropertyIds()) {
                 row.addCell(id);
             }
@@ -1309,7 +1309,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
         }
 
         private Class<?> getModelType() {
-            return grid.getContainerDatasource().getType(
+            return grid.getContainerDataSource().getType(
                     grid.getPropertyIdByColumnId(state.id));
         }
 
@@ -1645,7 +1645,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
             internalEditItem(itemId);
 
             grid.getEditorRowRpc().bind(
-                    grid.getContainerDatasource().indexOfId(itemId));
+                    grid.getContainerDataSource().indexOfId(itemId));
         }
 
         protected void internalEditItem(Object itemId) {
@@ -1692,7 +1692,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
             checkDetached();
             if (isEditing()) {
                 grid.getEditorRowRpc().cancel(
-                        grid.getContainerDatasource().indexOfId(editedItemId));
+                        grid.getContainerDataSource().indexOfId(editedItemId));
                 internalCancel();
             }
         }
@@ -1738,7 +1738,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
         }
 
         private Container getContainer() {
-            return grid.getContainerDatasource();
+            return grid.getContainerDataSource();
         }
 
         private void checkDetached() throws IllegalStateException {
@@ -2110,7 +2110,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
             @Override
             public void bind(int rowIndex) {
                 try {
-                    Object id = getContainerDatasource().getIdByIndex(rowIndex);
+                    Object id = getContainerDataSource().getIdByIndex(rowIndex);
                     getEditorRow().internalEditItem(id);
                     getEditorRowRpc().confirmBind();
                 } catch (Exception e) {
@@ -2237,7 +2237,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
             // container. If the new container does not support an item in the
             // current sort order, that item is removed from the current sort
             // order list.
-            Collection<?> sortableProps = ((Container.Sortable) getContainerDatasource())
+            Collection<?> sortableProps = ((Container.Sortable) getContainerDataSource())
                     .getSortableContainerPropertyIds();
 
             Iterator<SortOrder> i = sortOrder.iterator();
@@ -2311,7 +2311,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
      * 
      * @return the container data source of the grid
      */
-    public Container.Indexed getContainerDatasource() {
+    public Container.Indexed getContainerDataSource() {
         return datasource;
     }
 
@@ -3097,7 +3097,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
 
     private void setSortOrder(List<SortOrder> order,
             SortEventOriginator originator) {
-        if (!(getContainerDatasource() instanceof Container.Sortable)) {
+        if (!(getContainerDataSource() instanceof Container.Sortable)) {
             throw new IllegalStateException(
                     "Attached container is not sortable (does not implement Container.Sortable)");
         }
@@ -3108,7 +3108,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
 
         sortOrder.clear();
 
-        Collection<?> sortableProps = ((Container.Sortable) getContainerDatasource())
+        Collection<?> sortableProps = ((Container.Sortable) getContainerDataSource())
                 .getSortableContainerPropertyIds();
 
         for (SortOrder o : order) {
@@ -3138,7 +3138,7 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
      */
     private void sort(SortEventOriginator originator) {
 
-        Container c = getContainerDatasource();
+        Container c = getContainerDataSource();
         if (c instanceof Container.Sortable) {
             Container.Sortable cs = (Container.Sortable) c;
 
diff --git a/server/src/com/vaadin/ui/components/grid/renderers/ClickableRenderer.java b/server/src/com/vaadin/ui/components/grid/renderers/ClickableRenderer.java
index 7f99a942de..c08ef73ae2 100644
--- a/server/src/com/vaadin/ui/components/grid/renderers/ClickableRenderer.java
+++ b/server/src/com/vaadin/ui/components/grid/renderers/ClickableRenderer.java
@@ -89,7 +89,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
                     MouseEventDetails mouseDetails) {
 
                 Grid grid = (Grid) getParent();
-                Object itemId = grid.getContainerDatasource().getIdByIndex(row);
+                Object itemId = grid.getContainerDataSource().getIdByIndex(row);
                 // TODO map column index to property ID or send column ID
                 // instead of index from the client
                 fireEvent(new RendererClickEvent(grid, itemId, mouseDetails));
diff --git a/server/src/com/vaadin/ui/components/grid/selection/MultiSelectionModel.java b/server/src/com/vaadin/ui/components/grid/selection/MultiSelectionModel.java
index 602e5ca169..41fb7b7200 100644
--- a/server/src/com/vaadin/ui/components/grid/selection/MultiSelectionModel.java
+++ b/server/src/com/vaadin/ui/components/grid/selection/MultiSelectionModel.java
@@ -92,7 +92,7 @@ public class MultiSelectionModel extends AbstractSelectionModel implements
     @Override
     public boolean selectAll() {
         // select will fire the event
-        final Indexed container = grid.getContainerDatasource();
+        final Indexed container = grid.getContainerDataSource();
         if (container != null) {
             return select(container.getItemIds());
         } else if (selection.isEmpty()) {