renamed method to the related type

svn changeset:12085/svn branch:6.3

diff --git a/src/com/vaadin/event/dd/DragAndDropEvent.java b/src/com/vaadin/event/dd/DragAndDropEvent.java
index 721e00036947432eeccdfd2b9a5c83321a889e8b..321d6002b1dda575ec4637cbcf90e30685f38109 100644 (file)
--- a/src/com/vaadin/event/dd/DragAndDropEvent.java
+++ b/src/com/vaadin/event/dd/DragAndDropEvent.java
@@ -16,8 +16,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
  * <p>
  * DragAndDropEvent instances contains both the dragged data in
  * {@link Transferable} (generated by {@link DragSource} and details about the
- * current drop event in {@link TargetDetails} (generated by
- * {@link DropTarget}.
+ * current drop event in {@link TargetDetails} (generated by {@link DropTarget}.
  * 
  * @since 6.3
  * 
@@ -41,10 +40,10 @@ public class DragAndDropEvent implements Serializable {
     }
 
     /**
-     * @return the DropTargetDetails containing drop target related details of
-     *         drag and drop operation
+     * @return the TargetDetails containing drop target related details of drag
+     *         and drop operation
      */
-    public TargetDetails getDropTargetDetails() {
+    public TargetDetails getTargetDetails() {
         return dropTargetDetails;
     }
 

diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
index edee16498ad2b63f0af1dff5e19e8e228720f43a..0dfb8d6725db39038d8f18cbd999cb84e52f05a7 100644 (file)
--- a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
+++ b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
@@ -39,7 +39,7 @@ public class SourceIsTarget extends ClientSideCriterion {
         if (dragEvent.getTransferable() instanceof TransferableImpl) {
             Component sourceComponent = ((TransferableImpl) dragEvent
                     .getTransferable()).getSourceComponent();
-            DropTarget target = dragEvent.getDropTargetDetails().getTarget();
+            DropTarget target = dragEvent.getTargetDetails().getTarget();
             return sourceComponent == target;
         }
         return false;

diff --git a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
index 89783aefe4e2c11045efc79e621ae1b535cca8dc..74d5b229554d5e119db632d41a7fa0616dcade2f 100644 (file)
--- a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
+++ b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
@@ -61,7 +61,7 @@ public class TargetDetailIs extends ClientSideCriterion {
     }
 
     public boolean accept(DragAndDropEvent dragEvent) {
-        Object data = dragEvent.getDropTargetDetails().getData(propertyName);
+        Object data = dragEvent.getTargetDetails().getData(propertyName);
         return value.equals(data);
     }
 

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 137f415555c0c24254091483ac849ff7b215bcb2..d2b92399632c48e085f7759a7eca7101a9207c61 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -1715,7 +1715,7 @@ public abstract class AbstractSelect extends AbstractField implements
 
         public boolean accept(DragAndDropEvent dragEvent) {
             AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent
-                    .getDropTargetDetails();
+                    .getTargetDetails();
             if (dropTargetData.getTarget() != select) {
                 return false;
             }

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 043df9417215b7094d35f53583d60a50ef239456..00fc9bc24053c34067f1db333744e85feac97ced 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -3470,8 +3470,8 @@ public class Table extends AbstractSelect implements Action.Container,
          */
         public boolean accept(DragAndDropEvent dragEvent) {
             AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent
-                    .getDropTargetDetails();
-            table = (Table) dragEvent.getDropTargetDetails().getTarget();
+                    .getTargetDetails();
+            table = (Table) dragEvent.getTargetDetails().getTarget();
             ArrayList<Object> visibleItemIds = new ArrayList<Object>(table
                     .getPageLength());
             visibleItemIds.size();

diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index 7aef155f61536565316df61760c7211b6b348831..2b38d5a6eb001f8a71a339e3f2afe3474aabb17a 100644 (file)
--- a/src/com/vaadin/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -1327,8 +1327,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
          */
         public boolean accept(DragAndDropEvent dragEvent) {
             AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent
-                    .getDropTargetDetails();
-            tree = (Tree) dragEvent.getDropTargetDetails().getTarget();
+                    .getTargetDetails();
+            tree = (Tree) dragEvent.getTargetDetails().getTarget();
             allowedItemIds = getAllowedItemIds(dragEvent, tree);
 
             return allowedItemIds.contains(dropTargetData.getItemIdOver());
@@ -1393,7 +1393,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                 // bottom
                 // part)
                 TreeTargetDetails eventDetails = (TreeTargetDetails) dragEvent
-                        .getDropTargetDetails();
+                        .getTargetDetails();
 
                 Object itemIdOver = eventDetails.getItemIdOver();
                 if (!eventDetails.getTarget().areChildrenAllowed(itemIdOver)) {
@@ -1452,7 +1452,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         public boolean accept(DragAndDropEvent dragEvent) {
             try {
                 TreeTargetDetails eventDetails = (TreeTargetDetails) dragEvent
-                        .getDropTargetDetails();
+                        .getTargetDetails();
 
                 if (eventDetails.getItemIdOver() != null) {
                     Object itemId = eventDetails.getItemIdOver();

diff --git a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java b/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
index a2f7540b2cca6577bd6e027050bd089694797ae1..fa8cf2ff2eaadb08c1cba170a88a7827bd0b62fe 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
@@ -34,7 +34,7 @@ public class AcceptAnythingWindow extends Window {
 
             public void drop(DragAndDropEvent event) {
                 WrapperTargetDetails ed = (WrapperTargetDetails) event
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 Transferable transferable = event.getTransferable();
                 TransferableImpl ctr = (TransferableImpl) transferable;
                 Component component = ctr.getSourceComponent();

diff --git a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
index e21d083783c8223edd8a984ede9db23d602ac95b..6ba469d594316cc8de0a5e72dbfcae1cbf3b5144 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
@@ -58,7 +58,7 @@ public class AcceptFromComponent extends Window {
             public void drop(DragAndDropEvent event) {
 
                 WrapperTargetDetails ed = (WrapperTargetDetails) event
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 Transferable ctr = event.getTransferable();
                 if (ctr.getSourceComponent() != null) {
                     // use "component" (from DragDropPane) if available, else

diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index 9a9f5cea450fe9a5e0002d63ca2a904bb67d0155..130077309407c8b614dd3b1f224083c0f7ae6490 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -188,7 +188,7 @@ public class DDTest1 extends TestBase {
 
             public void drop(DragAndDropEvent event) {
                 TreeTargetDetails details = (TreeTargetDetails) event
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 // TODO set properties, so same sorter could be used in Table
                 Transferable transferable = event.getTransferable();
                 if (transferable instanceof DataBoundTransferable) {

diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java
index aaf527c494fb33e88db4e35fcf68ed367bd70102..28664892596b1b404c513112f89f40da428493b8 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest2.java
@@ -103,7 +103,7 @@ public class DDTest2 extends TestBase {
                 }
                 tree3.addItem(data);
                 AbstractSelect.AbstractSelectTargetDetails dropTargetData = (AbstractSelect.AbstractSelectTargetDetails) dropEvent
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 tree3.setParent(data, dropTargetData.getItemIdOver());
 
             }
@@ -166,7 +166,7 @@ public class DDTest2 extends TestBase {
                  * is from Tree and it contains itemIdOver.
                  */
                 AbstractSelectTargetDetails details = (AbstractSelectTargetDetails) event
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 Object idOver = details.getItemIdOver();
                 tree1.setParent(itemId, idOver);
 
@@ -191,7 +191,7 @@ public class DDTest2 extends TestBase {
         dropHandler = new DropHandler() {
             public void drop(DragAndDropEvent event) {
                 AbstractSelectTargetDetails details = (AbstractSelectTargetDetails) event
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 Transferable transferable = event.getTransferable();
 
                 if (transferable instanceof DataBoundTransferable) {

diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/src/com/vaadin/tests/dd/DDTest4.java
index a3ed32e87b1547524cf9236075d472dc77e41d4a..a50a81d1eaa6d6cecb0a6a89e7103659c54b7c2b 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest4.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest4.java
@@ -71,7 +71,7 @@ public class DDTest4 extends TestBase {
 
             public void drop(DragAndDropEvent dropEvent) {
                 AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 DataBoundTransferable transferable = (DataBoundTransferable) dropEvent
                         .getTransferable();
                 Object itemIdOver = dropTargetData.getItemIdOver();

diff --git a/tests/src/com/vaadin/tests/dd/DDTest5.java b/tests/src/com/vaadin/tests/dd/DDTest5.java
index ce37f7ae306e8f03346a355a7b89726c67ac036b..475f005e1bb38c28742d0fda196648dd951b4ba5 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest5.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest5.java
@@ -107,7 +107,7 @@ public class DDTest5 extends TestBase {
                     Component draggedComponent = transferable
                             .getDraggedComponent();
 
-                    DropTarget target = dropEvent.getDropTargetDetails()
+                    DropTarget target = dropEvent.getTargetDetails()
                             .getTarget();
 
                     WrappedLabel wrappedLabel = new WrappedLabel(
@@ -130,7 +130,7 @@ public class DDTest5 extends TestBase {
                             cssLayout.removeComponent(sourceComponent);
                             wrappedLabel = (WrappedLabel) sourceComponent;
                         }
-                        if (dropEvent.getDropTargetDetails().getData(
+                        if (dropEvent.getTargetDetails().getData(
                                 "verticalLocation").equals("TOP")) {
                             // before reference if dropped on topmost part
                             i--;

diff --git a/tests/src/com/vaadin/tests/dd/DDTest6.java b/tests/src/com/vaadin/tests/dd/DDTest6.java
index f0283276b9510bfb63741c17ebffa6e05c2937db..74a7e39db13b9a23c02fcd8fac45fe0ae65dfede 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest6.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest6.java
@@ -111,7 +111,7 @@ public class DDTest6 extends TestBase {
                 File file = null;
                 Folder folder = null;
                 TreeTargetDetails dropTargetData = (TreeTargetDetails) dropEvent
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 folder = (Folder) dropTargetData.getItemIdInto();
                 if (dropEvent.getTransferable() instanceof DataBoundTransferable) {
                     DataBoundTransferable transferable = (DataBoundTransferable) dropEvent
@@ -370,7 +370,7 @@ public class DDTest6 extends TestBase {
                         .getMouseDownEvent();
 
                 WrapperTargetDetails dropTargetDetails = (WrapperTargetDetails) dropEvent
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 MouseEventDetails mouseEvent = dropTargetDetails
                         .getMouseEvent();
 

diff --git a/tests/src/com/vaadin/tests/dd/DDTest7.java b/tests/src/com/vaadin/tests/dd/DDTest7.java
index 8178c4e535c6d92b8ac22e6bb3798ab07f4efe6f..e388f3d9ed6bed1347f49621806f3d238467613a 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest7.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest7.java
@@ -101,7 +101,7 @@ public class DDTest7 extends TestBase {
 
             public void drop(DragAndDropEvent dropEvent) {
                 AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 DataBoundTransferable transferable = (DataBoundTransferable) dropEvent
                         .getTransferable();
                 Object itemIdOver = dropTargetData.getItemIdOver();

diff --git a/tests/src/com/vaadin/tests/dd/DDTest8.java b/tests/src/com/vaadin/tests/dd/DDTest8.java
index 1a756998149146146baeaa97a1b635d48572a3fd..87db22e69f8f6f922e46e28c9fced514f9a96434 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest8.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest8.java
@@ -113,7 +113,7 @@ public class DDTest8 extends TestBase {
 
             public void drop(DragAndDropEvent event) {
                 TreeTargetDetails details = (TreeTargetDetails) event
-                        .getDropTargetDetails();
+                        .getTargetDetails();
                 // TODO set properties, so same sorter could be used in Table
                 Transferable transferable = event.getTransferable();
                 if (transferable instanceof DataBoundTransferable) {

diff --git a/tests/src/com/vaadin/tests/dd/DragDropPane.java b/tests/src/com/vaadin/tests/dd/DragDropPane.java
index 5ff1aa92326cf9e034f079b798ac3405ac9adea4..c97273ba185d47036d91ad33aa64cbbe2cd470bc 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DragDropPane.java
+++ b/tests/src/com/vaadin/tests/dd/DragDropPane.java
@@ -55,7 +55,7 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler {
     public void drop(DragAndDropEvent event) {
 
         WrapperTargetDetails ed = (WrapperTargetDetails) event
-                .getDropTargetDetails();
+                .getTargetDetails();
         Transferable ctr = event.getTransferable();
         // use "component" (from DragDropPane) if available, else take
         // the source component

diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index dfc235e8a96000f2814855ed0a5e69d05404f872..75691bd2fe1dbabfd976064a74e948cd389329b0 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
@@ -70,7 +70,7 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
                             .getComponentIterator();
                     Component next = componentIterator.next();
                     TargetDetails dropTargetData = dropEvent
-                            .getDropTargetDetails();
+                            .getTargetDetails();
                     DropTarget target = dropTargetData.getTarget();
                     while (next != target) {
                         if (next != sourceComponent) {

diff --git a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
index ec228a7990603553e3ecc54e38dd2c53d00175bc..75ac4b683e48ff5a69751d5b5e9aeaa9723d0de6 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
+++ b/tests/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
@@ -63,7 +63,7 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window {
                             .getComponentIterator();
                     Component next = componentIterator.next();
                     TargetDetails dropTargetData = dropEvent
-                            .getDropTargetDetails();
+                            .getTargetDetails();
                     DropTarget target = dropTargetData.getTarget();
                     while (next != target) {
                         if (next != sourceComponent) {