From 736afb7f922c1043a69109446ebe224e5730526f Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 1 Feb 2010 12:54:36 +0000 Subject: [PATCH] Transferrable -> Transferable svn changeset:11077/svn branch:6.3_dd --- src/com/vaadin/event/AbstractDropHandler.java | 6 +++--- ...mponentTransferrable.java => ComponentTransferable.java} | 2 +- src/com/vaadin/event/DataBindedTransferrable.java | 2 +- src/com/vaadin/event/DragRequest.java | 2 +- src/com/vaadin/terminal/gwt/server/DragAndDropService.java | 6 +++--- src/com/vaadin/ui/DragDropPane.java | 6 +++--- tests/src/com/vaadin/tests/dd/AcceptFromComponent.java | 6 +++--- tests/src/com/vaadin/tests/dd/CustomDDImplementation.java | 2 +- tests/src/com/vaadin/tests/dd/DDTest1.java | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) rename src/com/vaadin/event/{ComponentTransferrable.java => ComponentTransferable.java} (74%) diff --git a/src/com/vaadin/event/AbstractDropHandler.java b/src/com/vaadin/event/AbstractDropHandler.java index 9023183f50..ff77a8be30 100644 --- 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/ComponentTransferrable.java b/src/com/vaadin/event/ComponentTransferable.java similarity index 74% rename from src/com/vaadin/event/ComponentTransferrable.java rename to src/com/vaadin/event/ComponentTransferable.java index e0048d933d..f3d7e04162 100644 --- a/src/com/vaadin/event/ComponentTransferrable.java +++ b/src/com/vaadin/event/ComponentTransferable.java @@ -2,7 +2,7 @@ package com.vaadin.event; import com.vaadin.ui.Component; -public interface ComponentTransferrable extends Transferable { +public interface ComponentTransferable extends Transferable { /** * @return the component where the drag operation started diff --git a/src/com/vaadin/event/DataBindedTransferrable.java b/src/com/vaadin/event/DataBindedTransferrable.java index 8d131eb741..9a2908bcc2 100644 --- 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 c9a918aa23..c1d2763b7f 100644 --- 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 64df92ed48..91efd6824d 100644 --- 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 td = new HashMap(); diff --git a/src/com/vaadin/ui/DragDropPane.java b/src/com/vaadin/ui/DragDropPane.java index 4111955335..8613547542 100644 --- 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 28bc8b53c8..75d516faf6 100644 --- 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 53c18fdfc8..fb1d70855d 100644 --- 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 0dcf7aaf7f..2eac9b67a0 100644 --- 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) { -- 2.39.5