some refactoring

svn changeset:11384/svn branch:6.3_dd

7 files changed, 21 insertions, 23 deletions

diff --git a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
index ca8c9a583a..7f91471b5d 100644
--- a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.dd;
 
 import java.util.Map;
 
-import com.vaadin.event.dd.DropEvent;
+import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
-import com.vaadin.event.dd.TargetDetails;
+import com.vaadin.event.dd.DropTargetDetails;
 import com.vaadin.event.dd.acceptCriteria.AcceptAll;
 import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
 import com.vaadin.ui.AbstractComponent;
@@ -43,7 +43,7 @@ public class CustomDDImplementation extends CustomComponent {
         public DropHandler getDropHandler() {
             return new DropHandler() {
 
-                public void drop(DropEvent event) {
+                public void drop(DragAndDropEvent event) {
                     // Do something with data
                     return;
                 }
@@ -55,7 +55,7 @@ public class CustomDDImplementation extends CustomComponent {
             };
         }
 
-        public TargetDetails translateDragDropDetails(
+        public DropTargetDetails translateDragDropDetails(
                 Map<String, Object> clientVariables) {
             // If component has some special drop details that it needs to
             // translate for server side use, developer must return a
diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index 18d0286012..d8e387f962 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -8,7 +8,6 @@ import com.vaadin.event.ComponentTransferable;
 import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.event.dd.DropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptCriteria.IsDatabound;
@@ -65,7 +64,7 @@ public class DDTest1 extends TestBase {
                     Transferable transferable = dragEvent.getTransferable();
                     // System.out.println("Simulating 500ms processing...");
                     // try {
-                    // Thread.sleep(200);
+                    // Thread.sleep(9000);
                     // } catch (InterruptedException e) {
                     // // TODO Auto-generated catch block
                     // e.printStackTrace();
@@ -187,7 +186,7 @@ public class DDTest1 extends TestBase {
 
             }
 
-            public void drop(DropEvent event) {
+            public void drop(DragAndDropEvent event) {
                 AbstractSelectDropDetails details = (AbstractSelectDropDetails) event
                         .getDropTargetData();
                 // TODO set properties, so same sorter could be used in Table
diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java
index ff0ed0d4ba..e88026ecd2 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest2.java
@@ -12,7 +12,6 @@ import com.vaadin.demo.tutorial.addressbook.data.PersonContainer;
 import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.event.dd.DropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptCriteria.And;
@@ -82,7 +81,7 @@ public class DDTest2 extends TestBase {
         };
 
         tree3.setDropHandler(new DropHandler() {
-            public void drop(DropEvent dropEvent) {
+            public void drop(DragAndDropEvent dropEvent) {
                 Transferable transferable = dropEvent.getTransferable();
                 String data = (String) transferable.getData("Text");
                 if (data == null) {
@@ -116,7 +115,7 @@ public class DDTest2 extends TestBase {
 
         DropHandler dropHandler = new DropHandler() {
 
-            public void drop(DropEvent event) {
+            public void drop(DragAndDropEvent event) {
                 /*
                  * We know transferrable is from table, so it is of type
                  * DataBindedTransferrable
@@ -172,7 +171,7 @@ public class DDTest2 extends TestBase {
          */
 
         dropHandler = new DropHandler() {
-            public void drop(DropEvent event) {
+            public void drop(DragAndDropEvent event) {
                 AbstractSelectDropDetails details = (AbstractSelectDropDetails) event
                         .getDropTargetData();
                 Transferable transferable = event.getTransferable();
diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/src/com/vaadin/tests/dd/DDTest4.java
index 84e49cf192..0b5022caaa 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest4.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest4.java
@@ -5,7 +5,7 @@ import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.demo.tutorial.addressbook.data.Person;
 import com.vaadin.demo.tutorial.addressbook.data.PersonContainer;
 import com.vaadin.event.DataBoundTransferable;
-import com.vaadin.event.dd.DropEvent;
+import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptCriteria.ComponentFilter;
@@ -56,7 +56,7 @@ public class DDTest4 extends TestBase {
                 return crit;
             }
 
-            public void drop(DropEvent dropEvent) {
+            public void drop(DragAndDropEvent dropEvent) {
                 AbstractSelectDropDetails dropTargetData = (AbstractSelectDropDetails) dropEvent
                         .getDropTargetData();
                 DataBoundTransferable transferable = (DataBoundTransferable) dropEvent
diff --git a/tests/src/com/vaadin/tests/dd/DDTest5.java b/tests/src/com/vaadin/tests/dd/DDTest5.java
index 7c7ffa3ba3..77b4d0b11a 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest5.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest5.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.dd;
 
 import java.util.Iterator;
 
-import com.vaadin.event.dd.DropEvent;
+import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.acceptCriteria.AcceptAll;
@@ -91,7 +91,7 @@ public class DDTest5 extends TestBase {
                 return AcceptAll.get();
             }
 
-            public void drop(DropEvent dropEvent) {
+            public void drop(DragAndDropEvent dropEvent) {
 
                 /*
                  * TODO wrap componentns in wrappers (so we can build reordering
diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index 5caeaf4432..32f02a29b9 100644
--- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
@@ -4,10 +4,10 @@ import java.util.Iterator;
 
 import com.vaadin.event.ComponentTransferable;
 import com.vaadin.event.Transferable;
-import com.vaadin.event.dd.DropEvent;
+import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
-import com.vaadin.event.dd.TargetDetails;
+import com.vaadin.event.dd.DropTargetDetails;
 import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptCriteria.And;
 import com.vaadin.event.dd.acceptCriteria.DropDetailEquals;
@@ -59,7 +59,7 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
             return crit;
         }
 
-        public void drop(DropEvent dropEvent) {
+        public void drop(DragAndDropEvent dropEvent) {
             Transferable transferable = dropEvent.getTransferable();
             if (transferable instanceof ComponentTransferable) {
                 ComponentTransferable ct = (ComponentTransferable) transferable;
@@ -69,7 +69,7 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
                     Iterator<Component> componentIterator = layout
                             .getComponentIterator();
                     Component next = componentIterator.next();
-                    TargetDetails dropTargetData = dropEvent
+                    DropTargetDetails dropTargetData = dropEvent
                             .getDropTargetData();
                     DropTarget target = dropTargetData.getTarget();
                     while (next != target) {
diff --git a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
index 8673ffb71f..10c3dd5956 100644
--- a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
+++ b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
@@ -4,10 +4,10 @@ import java.util.Iterator;
 
 import com.vaadin.event.ComponentTransferable;
 import com.vaadin.event.Transferable;
-import com.vaadin.event.dd.DropEvent;
+import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
-import com.vaadin.event.dd.TargetDetails;
+import com.vaadin.event.dd.DropTargetDetails;
 import com.vaadin.event.dd.acceptCriteria.AcceptAll;
 import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
 import com.vaadin.ui.Component;
@@ -52,7 +52,7 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window {
             return AcceptAll.get();
         }
 
-        public void drop(DropEvent dropEvent) {
+        public void drop(DragAndDropEvent dropEvent) {
             Transferable transferable = dropEvent.getTransferable();
             if (transferable instanceof ComponentTransferable) {
                 ComponentTransferable ct = (ComponentTransferable) transferable;
@@ -62,7 +62,7 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window {
                     Iterator<Component> componentIterator = cssLayout
                             .getComponentIterator();
                     Component next = componentIterator.next();
-                    TargetDetails dropTargetData = dropEvent
+                    DropTargetDetails dropTargetData = dropEvent
                             .getDropTargetData();
                     DropTarget target = dropTargetData.getTarget();
                     while (next != target) {