From e905e2bb8057d19128bc5bd052d73ee8f29687a8 Mon Sep 17 00:00:00 2001 From: Adam Wagner Date: Fri, 24 Mar 2017 11:28:58 +0200 Subject: Clean DropEvent and DragEndEvent properties (#8925) * Add dropEffect parameter to DragEndEvent (#8895) * Remove drop effect from drop event (#8895) * Make sure that drop effect is not null --- shared/src/main/java/com/vaadin/shared/ui/dnd/DragSourceRpc.java | 6 +++++- shared/src/main/java/com/vaadin/shared/ui/dnd/DropTargetRpc.java | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'shared') diff --git a/shared/src/main/java/com/vaadin/shared/ui/dnd/DragSourceRpc.java b/shared/src/main/java/com/vaadin/shared/ui/dnd/DragSourceRpc.java index 178028b423..4faf7ca139 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/dnd/DragSourceRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/dnd/DragSourceRpc.java @@ -33,6 +33,10 @@ public interface DragSourceRpc extends ServerRpc { /** * Called when dragend event happens on client side. + * + * @param dropEffect + * Drop effect of the dragend event, extracted from {@code + * DataTransfer.dropEffect} parameter. */ - public void dragEnd(); + public void dragEnd(DropEffect dropEffect); } diff --git a/shared/src/main/java/com/vaadin/shared/ui/dnd/DropTargetRpc.java b/shared/src/main/java/com/vaadin/shared/ui/dnd/DropTargetRpc.java index b74fd3a949..7a608068a1 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/dnd/DropTargetRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/dnd/DropTargetRpc.java @@ -32,8 +32,6 @@ public interface DropTargetRpc extends ServerRpc { * @param dataTransferText * Data of type {@code "text"} from the {@code DataTransfer} * object. - * @param dropEffect - * Drop effect set for the drop target where drop happened. */ - public void drop(String dataTransferText, DropEffect dropEffect); + public void drop(String dataTransferText); } -- cgit v1.2.3