Transferrable -> Transferable

Renamed HasDropHandler to DropTarget
Split DropHandler into DropHandler and DragDropHandler to provide separate drop and drag events
Split Transferable and DragDropDetails from DragRequest


svn changeset:11110/svn branch:6.3_dd

4 files changed, 34 insertions, 37 deletions

diff --git a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
index 75d516faf6..a2a8d83d47 100644
--- a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.dd;
 
 import com.vaadin.event.ComponentTransferable;
-import com.vaadin.event.DragRequest;
+import com.vaadin.event.DragDropDetails;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.AbstractDropHandler.AcceptCriterion;
 import com.vaadin.ui.DragDropPane;
@@ -16,8 +16,8 @@ public class AcceptFromComponent extends Window {
         DragDropPane pane = new DragDropPane();
         setContent(pane);
         pane.getDropHandler().setAcceptCriterion(new AcceptCriterion() {
-            public boolean accepts(DragRequest request) {
-                Transferable transferable = request.getTransferable();
+            public boolean accepts(Transferable transferable,
+                    DragDropDetails dragDropDetails) {
                 if (transferable instanceof ComponentTransferable) {
                     ComponentTransferable componentTransferrable = (ComponentTransferable) transferable;
                     if (componentTransferrable.getSourceComponent() == tree1) {
diff --git a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
index fb1d70855d..d0c1aa7d46 100644
--- a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.dd;
 
-import java.util.Map;
-
 import com.vaadin.event.AbstractDropHandler;
+import com.vaadin.event.DragDropDetails;
+import com.vaadin.event.DragDropHandler;
 import com.vaadin.event.DragRequest;
 import com.vaadin.event.DropHandler;
-import com.vaadin.event.HasDropHandler;
+import com.vaadin.event.DropTarget;
 import com.vaadin.event.Transferable;
 import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager.DragEventType;
 import com.vaadin.ui.AbstractComponent;
@@ -39,18 +39,14 @@ public class CustomDDImplementation extends CustomComponent {
      * 
      */
     @ClientWidget(VMyDropTarget.class)
-    class MyDropTarget extends AbstractComponent implements HasDropHandler {
-
+    class MyDropTarget extends AbstractComponent implements DropTarget {
         public DropHandler getDropHandler() {
-            return new DropHandler() {
-                public void handleDragRequest(DragRequest dragRequest) {
-                    Transferable transferable = dragRequest.getTransferable();
+            return new DragDropHandler() {
+                public void handleDragRequest(DragRequest dragRequest,
+                        Transferable transferable,
+                        DragDropDetails dragDropDetails) {
                     DragEventType type = dragRequest.getType();
                     switch (type) {
-                    case DROP:
-                        // Do something with data
-
-                        break;
 
                     case ENTER:
                         // eg. validate transferrable
@@ -71,16 +67,13 @@ public class CustomDDImplementation extends CustomComponent {
                     }
 
                 }
-            };
-        }
 
-        public Object getDragEventDetails(Map<String, Object> rawVariables) {
-            /*
-             * If client side sets some event details, translate them to desired
-             * server side presentation here. The returned object will be passed
-             * for drop handler.
-             */
-            return null;
+                public boolean drop(Transferable transferable,
+                        DragDropDetails dropDetails) {
+                    // Do something with data
+                    return true;
+                }
+            };
         }
 
     }
diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index 2eac9b67a0..eb68daf762 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -6,8 +6,8 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.event.AbstractDropHandler;
 import com.vaadin.event.ComponentTransferable;
-import com.vaadin.event.DataBindedTransferrable;
-import com.vaadin.event.DragRequest;
+import com.vaadin.event.DataBindedTransferable;
+import com.vaadin.event.DragDropDetails;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.AbstractDropHandler.AcceptCriterion;
 import com.vaadin.terminal.ExternalResource;
@@ -60,8 +60,8 @@ public class DDTest1 extends TestBase {
                 .setCaption("Pane2 (accept needs server side visit, only \"Bar\")");
 
         AcceptCriterion f = new AcceptCriterion() {
-            public boolean accepts(DragRequest request) {
-                Transferable transferable = request.getTransferable();
+            public boolean accepts(Transferable transferable,
+                    DragDropDetails dragDropDetails) {
                 // System.out.println("Simulating 500ms processing...");
                 // try {
                 // Thread.sleep(200);
@@ -116,11 +116,12 @@ public class DDTest1 extends TestBase {
         AbstractDropHandler itemSorter = new AbstractDropHandler() {
 
             @Override
-            public void receive(Transferable transferable, Object dropdetails) {
+            public void receive(Transferable transferable,
+                    DragDropDetails dropdetails) {
                 TreeDropDetails details = (TreeDropDetails) dropdetails;
                 // TODO set properties, so same sorter could be used in Table
-                if (transferable instanceof DataBindedTransferrable) {
-                    DataBindedTransferrable transferrable2 = (DataBindedTransferrable) transferable;
+                if (transferable instanceof DataBindedTransferable) {
+                    DataBindedTransferable transferrable2 = (DataBindedTransferable) transferable;
 
                     Object itemId = transferrable2.getItemId();
 
diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java
index 04162045f7..02458240bf 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest2.java
@@ -7,7 +7,8 @@ import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.demo.tutorial.addressbook.data.Person;
 import com.vaadin.demo.tutorial.addressbook.data.PersonContainer;
 import com.vaadin.event.AbstractDropHandler;
-import com.vaadin.event.DataBindedTransferrable;
+import com.vaadin.event.DataBindedTransferable;
+import com.vaadin.event.DragDropDetails;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.AbstractDropHandler.AcceptCriterion;
 import com.vaadin.event.AbstractDropHandler.And;
@@ -54,12 +55,13 @@ public class DDTest2 extends TestBase {
 
         AbstractDropHandler dropHandler = new AbstractDropHandler() {
             @Override
-            public void receive(Transferable transferable, Object dropdetails) {
+            public void receive(Transferable transferable,
+                    DragDropDetails dropdetails) {
                 /*
                  * We know transferrable is from table, so it is of type
                  * DataBindedTransferrable
                  */
-                DataBindedTransferrable tr = (DataBindedTransferrable) transferable;
+                DataBindedTransferable tr = (DataBindedTransferable) transferable;
                 Object itemId = tr.getItemId();
                 Table fromTable = (Table) tr.getSourceComponent();
                 String name = fromTable.getItem(itemId).getItemProperty("Name")
@@ -102,11 +104,12 @@ public class DDTest2 extends TestBase {
 
         dropHandler = new AbstractDropHandler() {
             @Override
-            public void receive(Transferable transferable, Object dropdetails) {
+            public void receive(Transferable transferable,
+                    DragDropDetails dropdetails) {
                 TreeDropDetails details = (TreeDropDetails) dropdetails;
 
-                if (transferable instanceof DataBindedTransferrable) {
-                    DataBindedTransferrable tr = (DataBindedTransferrable) transferable;
+                if (transferable instanceof DataBindedTransferable) {
+                    DataBindedTransferable tr = (DataBindedTransferable) transferable;
 
                     Object itemId = tree2.addItem();
                     tree2.setParent(itemId, details.getItemIdOver());