Unified naming

Added javadoc + comments about missing javadoc


svn changeset:11455/svn branch:6.3_dd

8 files changed, 36 insertions, 36 deletions

diff --git a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java b/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
index b9e63d9dda..c07051ef32 100644
--- 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) {
                 WrapperDropDetails ed = (WrapperDropDetails) event
-                        .getDropTargetData();
+                        .getDropTargetDetails();
                 Transferable transferable = event.getTransferable();
                 TransferableImpl ctr = (TransferableImpl) transferable;
                 Component component = ctr.getSourceComponent();
diff --git a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
index 7f91471b5d..6c116d1546 100644
--- a/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/tests/src/com/vaadin/tests/dd/CustomDDImplementation.java
@@ -55,7 +55,7 @@ public class CustomDDImplementation extends CustomComponent {
             };
         }
 
-        public DropTargetDetails translateDragDropDetails(
+        public DropTargetDetails translateDropTargetDetails(
                 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 3943098eac..51568cbae0 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -10,7 +10,7 @@ import com.vaadin.event.Transferable;
 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.IsDatabound;
+import com.vaadin.event.dd.acceptCriteria.IsDataBound;
 import com.vaadin.event.dd.acceptCriteria.ServerSideCriterion;
 import com.vaadin.terminal.ExternalResource;
 import com.vaadin.tests.components.TestBase;
@@ -22,7 +22,7 @@ import com.vaadin.ui.Layout;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Tree;
-import com.vaadin.ui.AbstractSelect.AbstractSelectDropDetails;
+import com.vaadin.ui.AbstractSelect.AbstractSelectDropTargetDetails;
 import com.vaadin.ui.Table.DragModes;
 import com.vaadin.ui.Tree.Location;
 
@@ -187,8 +187,8 @@ public class DDTest1 extends TestBase {
             }
 
             public void drop(DragAndDropEvent event) {
-                AbstractSelectDropDetails details = (AbstractSelectDropDetails) event
-                        .getDropTargetData();
+                AbstractSelectDropTargetDetails details = (AbstractSelectDropTargetDetails) event
+                        .getDropTargetDetails();
                 // TODO set properties, so same sorter could be used in Table
                 Transferable transferable = event.getTransferable();
                 if (transferable instanceof DataBoundTransferable) {
@@ -237,7 +237,7 @@ public class DDTest1 extends TestBase {
 
             public AcceptCriterion getAcceptCriterion() {
                 // TODO should actually check that source is same as target
-                return IsDatabound.get();
+                return IsDataBound.get();
             }
 
         };
diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java
index e580e6654d..58057aa29d 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest2.java
@@ -13,10 +13,9 @@ 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.And;
-import com.vaadin.event.dd.acceptCriteria.ComponentFilter;
-import com.vaadin.event.dd.acceptCriteria.IsDatabound;
+import com.vaadin.event.dd.acceptCriteria.IsDragSource;
+import com.vaadin.event.dd.acceptCriteria.IsDataBound;
 import com.vaadin.event.dd.acceptCriteria.Or;
-import com.vaadin.event.dd.acceptCriteria.OverTreeNode;
 import com.vaadin.event.dd.acceptCriteria.ServerSideCriterion;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.ThemeResource;
@@ -26,8 +25,9 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Window;
-import com.vaadin.ui.AbstractSelect.AbstractSelectDropDetails;
-import com.vaadin.ui.Tree.TreeDropDetails;
+import com.vaadin.ui.AbstractSelect.AbstractSelectDropTargetDetails;
+import com.vaadin.ui.Tree.OverTreeNode;
+import com.vaadin.ui.Tree.TreeDropTargetDetails;
 
 public class DDTest2 extends TestBase {
 
@@ -73,8 +73,8 @@ public class DDTest2 extends TestBase {
         final AcceptCriterion crit = new ServerSideCriterion() {
             public boolean accepts(DragAndDropEvent dragEvent) {
 
-                TreeDropDetails dropTargetData = (TreeDropDetails) dragEvent
-                        .getDropTargetData();
+                TreeDropTargetDetails dropTargetData = (TreeDropTargetDetails) dragEvent
+                        .getDropTargetDetails();
 
                 Object itemIdOver = dropTargetData.getItemIdOver();
 
@@ -94,8 +94,8 @@ public class DDTest2 extends TestBase {
                     data = "-no Text data flawor-";
                 }
                 tree3.addItem(data);
-                AbstractSelect.AbstractSelectDropDetails dropTargetData = (AbstractSelect.AbstractSelectDropDetails) dropEvent
-                        .getDropTargetData();
+                AbstractSelect.AbstractSelectDropTargetDetails dropTargetData = (AbstractSelect.AbstractSelectDropTargetDetails) dropEvent
+                        .getDropTargetDetails();
                 tree3.setParent(data, dropTargetData.getItemIdOver());
 
             }
@@ -113,9 +113,9 @@ public class DDTest2 extends TestBase {
         table.setDragMode(Table.DragModes.ROWS);
 
         OverTreeNode onNode = new OverTreeNode();
-        ComponentFilter fromTable = new ComponentFilter(table);
+        IsDragSource fromTable = new IsDragSource(table);
 
-        ComponentFilter fromTree = new ComponentFilter(tree1);
+        IsDragSource fromTree = new IsDragSource(tree1);
         final Or fromTree1OrTable = new Or(fromTable, fromTree);
         final And and = new And(fromTree1OrTable, onNode);
 
@@ -153,8 +153,8 @@ public class DDTest2 extends TestBase {
                  * As we also accept only drops on folders, we know dropDetails
                  * is from Tree and it contains itemIdOver.
                  */
-                AbstractSelectDropDetails details = (AbstractSelectDropDetails) event
-                        .getDropTargetData();
+                AbstractSelectDropTargetDetails details = (AbstractSelectDropTargetDetails) event
+                        .getDropTargetDetails();
                 Object idOver = details.getItemIdOver();
                 tree1.setParent(itemId, idOver);
 
@@ -178,8 +178,8 @@ public class DDTest2 extends TestBase {
 
         dropHandler = new DropHandler() {
             public void drop(DragAndDropEvent event) {
-                AbstractSelectDropDetails details = (AbstractSelectDropDetails) event
-                        .getDropTargetData();
+                AbstractSelectDropTargetDetails details = (AbstractSelectDropTargetDetails) event
+                        .getDropTargetDetails();
                 Transferable transferable = event.getTransferable();
 
                 if (transferable instanceof DataBoundTransferable) {
@@ -217,7 +217,7 @@ public class DDTest2 extends TestBase {
             }
 
             public AcceptCriterion getAcceptCriterion() {
-                return IsDatabound.get();
+                return IsDataBound.get();
             }
         };
 
diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/src/com/vaadin/tests/dd/DDTest4.java
index 0b5022caaa..905aef5381 100644
--- a/tests/src/com/vaadin/tests/dd/DDTest4.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest4.java
@@ -8,14 +8,14 @@ import com.vaadin.event.DataBoundTransferable;
 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;
+import com.vaadin.event.dd.acceptCriteria.IsDragSource;
 import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Window;
-import com.vaadin.ui.AbstractSelect.AbstractSelectDropDetails;
+import com.vaadin.ui.AbstractSelect.AbstractSelectDropTargetDetails;
 import com.vaadin.ui.Tree.Location;
 
 public class DDTest4 extends TestBase {
@@ -50,15 +50,15 @@ public class DDTest4 extends TestBase {
 
         table.setDropHandler(new DropHandler() {
             // accept only drags from this table
-            AcceptCriterion crit = new ComponentFilter(table);
+            AcceptCriterion crit = new IsDragSource(table);
 
             public AcceptCriterion getAcceptCriterion() {
                 return crit;
             }
 
             public void drop(DragAndDropEvent dropEvent) {
-                AbstractSelectDropDetails dropTargetData = (AbstractSelectDropDetails) dropEvent
-                        .getDropTargetData();
+                AbstractSelectDropTargetDetails dropTargetData = (AbstractSelectDropTargetDetails) dropEvent
+                        .getDropTargetDetails();
                 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 83f762406a..052cb0ca83 100644
--- 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.getDropTargetData()
+                    DropTarget target = dropEvent.getDropTargetDetails()
                             .getTarget();
 
                     WrappedLabel wrappedLabel = new WrappedLabel(
@@ -130,7 +130,7 @@ public class DDTest5 extends TestBase {
                             cssLayout.removeComponent(sourceComponent);
                             wrappedLabel = (WrappedLabel) sourceComponent;
                         }
-                        if (dropEvent.getDropTargetData().getData(
+                        if (dropEvent.getDropTargetDetails().getData(
                                 "verticalLocation").equals("TOP")) {
                             // before reference if dropped on topmost part
                             i--;
diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index fba2b0cf43..715fbe60e1 100644
--- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
@@ -10,9 +10,9 @@ import com.vaadin.event.dd.DropTarget;
 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;
+import com.vaadin.event.dd.acceptCriteria.DropTargetDetailEquals;
 import com.vaadin.event.dd.acceptCriteria.Not;
-import com.vaadin.event.dd.acceptCriteria.SourceIsSameAsTarget;
+import com.vaadin.event.dd.acceptCriteria.IsSameSourceAndTarget;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.HorizontalLayout;
@@ -51,9 +51,9 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
     }
 
     private DropHandler dh = new DropHandler() {
-        AcceptCriterion crit = new And(new DropDetailEquals(
+        AcceptCriterion crit = new And(new DropTargetDetailEquals(
                 "horizontalLocation", "LEFT"), new Not(
-                new SourceIsSameAsTarget()));
+                new IsSameSourceAndTarget()));
 
         public AcceptCriterion getAcceptCriterion() {
             return crit;
@@ -70,7 +70,7 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
                             .getComponentIterator();
                     Component next = componentIterator.next();
                     DropTargetDetails dropTargetData = dropEvent
-                            .getDropTargetData();
+                            .getDropTargetDetails();
                     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 60209d4b7a..013ab32cea 100644
--- 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();
                     DropTargetDetails dropTargetData = dropEvent
-                            .getDropTargetData();
+                            .getDropTargetDetails();
                     DropTarget target = dropTargetData.getTarget();
                     while (next != target) {
                         if (next != sourceComponent) {