Transferrable -> Transferable

svn changeset:11077/svn branch:6.3_dd

diff --git a/src/com/vaadin/event/AbstractDropHandler.java b/src/com/vaadin/event/AbstractDropHandler.java
index 9023183f509fbca792ae97fd0afc54a0da469ae2..ff77a8be30248bfda11440d79ac14993d1435b84 100644 (file)
--- a/src/com/vaadin/event/AbstractDropHandler.java
+++ b/src/com/vaadin/event/AbstractDropHandler.java
@@ -2,7 +2,7 @@ package com.vaadin.event;
 
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.gwt.client.ui.dd.DragAndDropManager.DragEventType;
+import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager.DragEventType;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Tree.Location;
 import com.vaadin.ui.Tree.TreeDropDetails;
@@ -95,8 +95,8 @@ public abstract class AbstractDropHandler implements DropHandler {
         }
 
         public boolean accepts(DragRequest event) {
-            if (event.getTransferable() instanceof ComponentTransferrable) {
-                return ((ComponentTransferrable) event.getTransferable())
+            if (event.getTransferable() instanceof ComponentTransferable) {
+                return ((ComponentTransferable) event.getTransferable())
                         .getSourceComponent() == component;
             } else {
                 return false;

diff --git a/src/com/vaadin/event/ComponentTransferable.java b/src/com/vaadin/event/ComponentTransferable.java
new file mode 100644 (file)
index 0000000..f3d7e04
--- /dev/null
+++ b/src/com/vaadin/event/ComponentTransferable.java
@@ -0,0 +1,12 @@
+package com.vaadin.event;
+
+import com.vaadin.ui.Component;
+
+public interface ComponentTransferable extends Transferable {
+
+    /**
+     * @return the component where the drag operation started
+     */
+    public Component getSourceComponent();
+
+}

diff --git a/src/com/vaadin/event/ComponentTransferrable.java b/src/com/vaadin/event/ComponentTransferrable.java
deleted file mode 100644 (file)
index e0048d9..0000000
--- a/src/com/vaadin/event/ComponentTransferrable.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.vaadin.event;
-
-import com.vaadin.ui.Component;
-
-public interface ComponentTransferrable extends Transferable {
-
-    /**
-     * @return the component where the drag operation started
-     */
-    public Component getSourceComponent();
-
-}

diff --git a/src/com/vaadin/event/DataBindedTransferrable.java b/src/com/vaadin/event/DataBindedTransferrable.java
index 8d131eb741edf2e98a892d0790813de8875020e8..9a2908bcc2652851ec4e8e7380508b95648e7c6d 100644 (file)
--- a/src/com/vaadin/event/DataBindedTransferrable.java
+++ b/src/com/vaadin/event/DataBindedTransferrable.java
@@ -1,6 +1,6 @@
 package com.vaadin.event;
 
-public interface DataBindedTransferrable extends ComponentTransferrable {
+public interface DataBindedTransferrable extends ComponentTransferable {
 
     public Object getItemId();
 

diff --git a/src/com/vaadin/event/DragRequest.java b/src/com/vaadin/event/DragRequest.java
index c9a918aa23e0771f47af8676ae8a66c541fccb8b..c1d2763b7f97979d8311842fef9bd4616049df58 100644 (file)
--- a/src/com/vaadin/event/DragRequest.java
+++ b/src/com/vaadin/event/DragRequest.java
@@ -3,7 +3,7 @@ package com.vaadin.event;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.terminal.gwt.client.ui.dd.DragAndDropManager.DragEventType;
+import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager.DragEventType;
 
 public class DragRequest {
 

diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index 64df92ed48ceebe5560bd5dbf9cff3fa73c1fe3e..91efd6824d58a5f980f27c65a7f0d2688968b5a8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
@@ -5,14 +5,14 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.event.ComponentTransferrable;
+import com.vaadin.event.ComponentTransferable;
 import com.vaadin.event.DragRequest;
 import com.vaadin.event.DropHandler;
 import com.vaadin.event.HasDropHandler;
 import com.vaadin.event.Transferable;
 import com.vaadin.terminal.DragSource;
 import com.vaadin.terminal.VariableOwner;
-import com.vaadin.terminal.gwt.client.ui.dd.DragAndDropManager.DragEventType;
+import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager.DragEventType;
 import com.vaadin.ui.Component;
 
 public class DragAndDropService implements VariableOwner {
@@ -86,7 +86,7 @@ public class DragAndDropService implements VariableOwner {
         } else {
             if (transferable == null) {
                 if (sourceComponent != null) {
-                    transferable = new ComponentTransferrable() {
+                    transferable = new ComponentTransferable() {
 
                         private Map<String, Object> td = new HashMap<String, Object>();
 

diff --git a/src/com/vaadin/ui/DragDropPane.java b/src/com/vaadin/ui/DragDropPane.java
index 41119553354303e509cdb88e7d2fe39d45ea68bd..861354754281e297cb93b05a8144a7c5115834ed 100644 (file)
--- a/src/com/vaadin/ui/DragDropPane.java
+++ b/src/com/vaadin/ui/DragDropPane.java
@@ -3,7 +3,7 @@ package com.vaadin.ui;
 import java.util.Map;
 
 import com.vaadin.event.AbstractDropHandler;
-import com.vaadin.event.ComponentTransferrable;
+import com.vaadin.event.ComponentTransferable;
 import com.vaadin.event.DataBindedTransferrable;
 import com.vaadin.event.HasDropHandler;
 import com.vaadin.event.Transferable;
@@ -49,8 +49,8 @@ public class DragDropPane extends AbsoluteLayout implements HasDropHandler {
                         Object dropDetails) {
 
                     DragEventDetails ed = (DragEventDetails) dropDetails;
-                    if (transferable instanceof ComponentTransferrable) {
-                        ComponentTransferrable ctr = (ComponentTransferrable) transferable;
+                    if (transferable instanceof ComponentTransferable) {
+                        ComponentTransferable ctr = (ComponentTransferable) transferable;
                         Component component = ctr.getSourceComponent();
 
                         if (component.getParent() != DragDropPane.this) {

diff --git a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
index 28bc8b53c86c7d5671e2f9a54bf5b58d26e431ff..75d516faf6702ab419d9080ee252df91cacda0b9 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.dd;
 
-import com.vaadin.event.ComponentTransferrable;
+import com.vaadin.event.ComponentTransferable;
 import com.vaadin.event.DragRequest;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.AbstractDropHandler.AcceptCriterion;
@@ -18,8 +18,8 @@ public class AcceptFromComponent extends Window {
         pane.getDropHandler().setAcceptCriterion(new AcceptCriterion() {
             public boolean accepts(DragRequest request) {
                 Transferable transferable = request.getTransferable();
-                if (transferable instanceof ComponentTransferrable) {
-                    ComponentTransferrable componentTransferrable = (ComponentTransferrable) transferable;
+                if (transferable instanceof ComponentTransferable) {
+                    ComponentTransferable componentTransferrable = (ComponentTransferable) transferable;
                     if (componentTransferrable.getSourceComponent() == tree1) {
                         return true;
                     }

diff --git a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
index 53c18fdfc863991b2a9acbca72240f4369f8bb9b..fb1d70855d1fd15a272ce9f0cbfd7e02ba8bd5e4 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
@@ -7,7 +7,7 @@ import com.vaadin.event.DragRequest;
 import com.vaadin.event.DropHandler;
 import com.vaadin.event.HasDropHandler;
 import com.vaadin.event.Transferable;
-import com.vaadin.terminal.gwt.client.ui.dd.DragAndDropManager.DragEventType;
+import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager.DragEventType;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.ClientWidget;
 import com.vaadin.ui.Component;

diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index 0dcf7aaf7f970be59146d6dfca29e7bf7a65c37b..2eac9b67a05a4fb71e0e97f576935585c20798eb 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.event.AbstractDropHandler;
-import com.vaadin.event.ComponentTransferrable;
+import com.vaadin.event.ComponentTransferable;
 import com.vaadin.event.DataBindedTransferrable;
 import com.vaadin.event.DragRequest;
 import com.vaadin.event.Transferable;
@@ -70,8 +70,8 @@ public class DDTest1 extends TestBase {
                 // e.printStackTrace();
                 // }
                 // System.out.println("Done get to work.");
-                if (transferable instanceof ComponentTransferrable) {
-                    ComponentTransferrable ct = (ComponentTransferrable) transferable;
+                if (transferable instanceof ComponentTransferable) {
+                    ComponentTransferable ct = (ComponentTransferable) transferable;
 
                     Component component = ct.getSourceComponent();
                     if (component != null) {