From 0a3ce51e2caf597596f0426d0e59b8de33827b29 Mon Sep 17 00:00:00 2001 From: Aleksi Hietanen Date: Thu, 11 May 2017 08:31:48 +0300 Subject: [PATCH] Rename BodyRowContainer.setNewEscalatorRowCallback to setNewRowCallback --- .../client/connectors/grid/GridDragSourceConnector.java | 6 +++--- .../com/vaadin/client/widget/escalator/RowContainer.java | 2 +- .../src/main/java/com/vaadin/client/widgets/Escalator.java | 2 +- .../vaadin/tests/widgetset/client/grid/EscalatorProxy.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/GridDragSourceConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/GridDragSourceConnector.java index 1a96c1ea66..5e83fef651 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/GridDragSourceConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/GridDragSourceConnector.java @@ -104,8 +104,8 @@ public class GridDragSourceConnector extends DragSourceExtensionConnector { } // Set newly added rows draggable - getGridBody().setNewEscalatorRowCallback( - rows -> rows.forEach(this::addDraggable)); + getGridBody() + .setNewRowCallback(rows -> rows.forEach(this::addDraggable)); // Add drag listeners to body element addDragListeners(getGridBody().getElement()); @@ -363,7 +363,7 @@ public class GridDragSourceConnector extends DragSourceExtensionConnector { removeDragListeners(getGridBody().getElement()); // Remove callback for newly added rows - getGridBody().setNewEscalatorRowCallback(null); + getGridBody().setNewRowCallback(null); if (touchScrollDelayUsed) { gridConnector.getWidget().getEscalator() diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java index d3247605b3..3a87296b2f 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java @@ -129,7 +129,7 @@ public interface RowContainer { * row elements. * @since 8.1 */ - public void setNewEscalatorRowCallback( + public void setNewRowCallback( Consumer> consumer); } diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java index 543808cb18..5239fa9636 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java +++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java @@ -4037,7 +4037,7 @@ public class Escalator extends Widget } @Override - public void setNewEscalatorRowCallback( + public void setNewRowCallback( Consumer> callback) { newEscalatorRowCallback = callback; } diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java index 9895a9ea4f..f15f4c8ddc 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java @@ -130,10 +130,10 @@ public class EscalatorProxy extends Escalator { } @Override - public void setNewEscalatorRowCallback( + public void setNewRowCallback( Consumer> consumer) { throw new UnsupportedOperationException( - "NewEscalatorRowCallback function is not supported"); + "setNewRowCallback is not supported"); } } -- 2.39.5