refactoring (renaming)

svn changeset:12018/svn branch:6.3

diff --git a/src/com/vaadin/event/dd/DragAndDropEvent.java b/src/com/vaadin/event/dd/DragAndDropEvent.java
index d2b971a689a64e0981205403cee059da42c4d854..5fbdeefe5118dfd22f1cb41733dce46d416adb75 100644 (file)
--- a/src/com/vaadin/event/dd/DragAndDropEvent.java
+++ b/src/com/vaadin/event/dd/DragAndDropEvent.java
@@ -12,7 +12,7 @@ import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
  * DragAndDropEvent wraps information related to drag and drop operation. It is
  * passed by terminal implementation for
  * {@link DropHandler#drop(DragAndDropEvent)} and
- * {@link AcceptCriterion#accepts(DragAndDropEvent)} methods.
+ * {@link AcceptCriterion#accept(DragAndDropEvent)} methods.
  * <p>
  * DragAndDropEvent instances contains both the dragged data in
  * {@link Transferable} (generated by {@link DragSource} and details about the

diff --git a/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java b/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java
index 942a85ee64062110176a2704a7f1ab6b315c30ed..3916d8e7e6baf59b9545f62c74d19dcb043abca9 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java
@@ -31,7 +31,7 @@ public final class AcceptAll extends ClientSideCriterion {
         return singleton;
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         return true;
     }
 }
\ No newline at end of file

diff --git a/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java b/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java
index d65c64d81eb533ada831c145ee62104981ac15b6..5c2ec6a4a83f1e6cb83993a80b14fd0b67779d69 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java
@@ -54,7 +54,7 @@ public interface AcceptCriterion extends Serializable {
      * This needs to be implemented iff criterion does some lazy server side
      * initialization. The UIDL painted in this method will be passed to client
      * side drop handler implementation. Implementation can assume that
-     * {@link #accepts(DragAndDropEvent)} is called before this method.
+     * {@link #accept(DragAndDropEvent)} is called before this method.
      * 
      * @param target
      * @throws PaintException
@@ -71,5 +71,5 @@ public interface AcceptCriterion extends Serializable {
      * @param dragEvent
      * @return
      */
-    public boolean accepts(DragAndDropEvent dragEvent);
+    public boolean accept(DragAndDropEvent dragEvent);
 }
\ No newline at end of file

diff --git a/src/com/vaadin/event/dd/acceptCriteria/And.java b/src/com/vaadin/event/dd/acceptCriteria/And.java
index 4bab63386cfbf28fd018e70775e2fbebe432295d..3db317c2139fa56dd31294d6ba214e715368db77 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/And.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/And.java
@@ -42,9 +42,9 @@ public class And extends ClientSideCriterion {
         }
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         for (ClientSideCriterion crit : criteria) {
-            if (!crit.accepts(dragEvent)) {
+            if (!crit.accept(dragEvent)) {
                 return false;
             }
         }

diff --git a/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java b/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java
index e406535958d535dab6b22c2dff7ece3eacd7c1fb..e98e3c2719972886e977ba16e1b895a2e0fdd120 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java
@@ -15,7 +15,7 @@ import com.vaadin.terminal.PaintTarget;
  * 
  * It is recommended that subclasses of ClientSideCriterion re-validate the
  * condition on the server side in
- * {@link AcceptCriterion#accepts(com.vaadin.event.dd.DragAndDropEvent)} after
+ * {@link AcceptCriterion#accept(com.vaadin.event.dd.DragAndDropEvent)} after
  * the client side validation has accepted a transfer.
  * 
  * @since 6.3

diff --git a/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java b/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java
index 93530791d659d4c5539de47fd8936645997b9da8..806a3b5d2dce072deb717269e9c55d32ce654dd3 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java
@@ -41,7 +41,7 @@ public class ContainsDataFlavor extends ClientSideCriterion {
         target.addAttribute("p", dataFlavorId);
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         return dragEvent.getTransferable().getDataFlavors().contains(
                 dataFlavorId);
     }

diff --git a/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java b/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java
index 5b0ad651edb60eaaf62022de0cc4db5c58d108c0..218133815c7671855bf8e3404cef665c93d373ff 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java
@@ -37,7 +37,7 @@ public class DragSourceIs extends ClientSideCriterion {
         }
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         if (dragEvent.getTransferable() instanceof TransferableImpl) {
             Component sourceComponent = ((TransferableImpl) dragEvent
                     .getTransferable()).getSourceComponent();

diff --git a/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java b/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java
index c18cbc8f7ae6cf5cf0c79240d6a0b6c57dc3a473..a2b24533b3a1e3e2157cdd7801dcf9bb271c4a64 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java
@@ -60,7 +60,7 @@ public class DropTargetDetailEquals extends ClientSideCriterion {
         }
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         Object data = dragEvent.getDropTargetDetails().getData(propertyName);
         return value.equals(data);
     }

diff --git a/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java b/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java
index c8050f94bf73ffc2fffb60b656427bcdb033159d..8615d207ca2f2ac02630306d4a31ce49f780027f 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java
@@ -38,7 +38,7 @@ public final class IsDataBound extends ContainsDataFlavor {
     }
 
     @Override
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         if (dragEvent.getTransferable() instanceof DataBoundTransferable) {
             return ((DataBoundTransferable) dragEvent.getTransferable())
                     .getItemId() != null;

diff --git a/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java b/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java
index 1c14506d38edccdfa6b13cb817f65af39960d98e..2637d27a0b9db43417a1594287f9d75b1cf09481 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java
@@ -35,7 +35,7 @@ public class IsSameSourceAndTarget extends ClientSideCriterion {
     private IsSameSourceAndTarget() {
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         if (dragEvent.getTransferable() instanceof TransferableImpl) {
             Component sourceComponent = ((TransferableImpl) dragEvent
                     .getTransferable()).getSourceComponent();

diff --git a/src/com/vaadin/event/dd/acceptCriteria/Not.java b/src/com/vaadin/event/dd/acceptCriteria/Not.java
index e4828cd83b8500d5799ad28d375a7be936fa1d23..874016c9b7539dc498ab42ba31908ec4ca8c0aa6 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/Not.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/Not.java
@@ -33,8 +33,8 @@ public class Not extends ClientSideCriterion {
         acceptCriterion.paint(target);
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
-        return !acceptCriterion.accepts(dragEvent);
+    public boolean accept(DragAndDropEvent dragEvent) {
+        return !acceptCriterion.accept(dragEvent);
     }
 
 }
\ No newline at end of file

diff --git a/src/com/vaadin/event/dd/acceptCriteria/Or.java b/src/com/vaadin/event/dd/acceptCriteria/Or.java
index 35eee06b4c01bb6999639488dd754a75078b8d28..41aef1073802597c8dbba101f9ac905a8b6fe762 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/Or.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/Or.java
@@ -41,9 +41,9 @@ public class Or extends ClientSideCriterion {
         }
     }
 
-    public boolean accepts(DragAndDropEvent dragEvent) {
+    public boolean accept(DragAndDropEvent dragEvent) {
         for (AcceptCriterion crit : criteria) {
-            if (crit.accepts(dragEvent)) {
+            if (crit.accept(dragEvent)) {
                 return true;
             }
         }

diff --git a/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java b/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java
index a1f3d0e9705becbe6f5c78a076d94b06ca6dcab6..69405db8ed30080aabbded0534df28fcaed86d10 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java
@@ -16,7 +16,7 @@ import com.vaadin.terminal.gwt.client.ui.dd.VServerAccept;
  * {@link Transferable}).
  * <p>
  * Subclasses should implement the
- * {@link AcceptCriterion#accepts(com.vaadin.event.dd.DragAndDropEvent)} method.
+ * {@link AcceptCriterion#accept(com.vaadin.event.dd.DragAndDropEvent)} method.
  * <p>
  * As all server side state can be used to make a decision, this is more
  * flexible than {@link ClientSideCriterion}. However, this does require

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java
index 19dafd27cd86cc09c764258278b4649532d73395..f110d50e804bcec2067d53fbbcc941dfaa0173fa 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java
@@ -11,7 +11,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VAcceptAll extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         return true;
     }
 }
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java
index c78598494acf46696fe3a17f5c187a7b230b03a4..da77d032930d47350b85340434c5d4d61b1f5937 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java
@@ -27,7 +27,7 @@ public abstract class VAcceptCriterion {
             };
             VDragAndDropManager.get().visitServer(acceptCallback);
         } else {
-            boolean validates = validates(drag, configuration);
+            boolean validates = accept(drag, configuration);
             if (validates) {
                 callback.accepted(drag);
             }
@@ -35,7 +35,7 @@ public abstract class VAcceptCriterion {
 
     }
 
-    public abstract boolean validates(VDragEvent drag, UIDL configuration);
+    protected abstract boolean accept(VDragEvent drag, UIDL configuration);
 
     public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL) {
         return false;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java
index a9e6c7827697e73aff5d880fdcf4f3274a0faf35..72baa811edee1a9c2d468145d047788070a7e00e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java
@@ -18,7 +18,7 @@ final public class VAnd extends VAcceptCriterion implements VAcceptCallback {
     }
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         int childCount = configuration.getChildCount();
         for (int i = 0; i < childCount; i++) {
             VAcceptCriterion crit = getCriteria(drag, configuration, i);

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java
index 87a2e08029b6224113f135cc1cf409b1634b70ad..6f3b053d587ac1b01ddabc935c0724aa515f92fb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java
@@ -11,7 +11,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VContainsDataFlavor extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         String name = configuration.getStringAttribute("p");
         return drag.getTransferable().getDataFlavors().contains(name);
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java
index 61310725bb50cac4b0c06ea2e263b342528966d5..50c743928a43b07728af72e9a6bb8a1b8ea2def5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VDragSourceIs extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         try {
             Paintable component = drag.getTransferable().getDragSource();
             int c = configuration.getIntAttribute("c");

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java
index 20efe854cec9089a264e028dcf46c8dbac2bc07e..6d04e4c35e9b043ec0718d2d3abde4b479446476 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java
@@ -11,7 +11,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VDropDetailEquals extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         String name = configuration.getStringAttribute("p");
         String t = configuration.hasAttribute("t") ? configuration
                 .getStringAttribute("t").intern() : "s";

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java
index 673dcbea8bd2c19ab091b0975398b74e8ce80ba4..6ed4b1b7231d5132bea984230d46879cff487c7b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java
@@ -13,7 +13,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VIsOverId extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         try {
             Set<String> stringArrayVariableAsSet = configuration
                     .getStringArrayVariableAsSet("keys");

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java
index 6c6cd6fa0e1b315faa1284222dec9f183580ec41..53a0b68837bf230ed6728ce3b0880684f0333519 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java
@@ -13,7 +13,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VItemIdIs extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         try {
             Object data = drag.getTransferable().getData("itemId");
             Set<String> stringArrayVariableAsSet = configuration

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java
index 659eb97ee09fc8e8e6599d73fc1a0c1792aaf139..eae6179a16ef543299149a3a09c729632cd9021a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java
@@ -59,7 +59,7 @@ final public class VLazyInitItemIdentifiers extends VAcceptCriterion {
     }
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         return false; // not used is this implementation
     }
 }
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java
index 87129807cff0a94142d5d2e22bb1bfcb1a868cd6..da9c01dae3028f4bd3bc443a44b384f9f4c1d885 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java
@@ -55,7 +55,7 @@ final public class VNot extends VAcceptCriterion {
     }
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         return false; // not used
     }
 }
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java
index 3e33cd6b0ca9156777babb668d972504909400ce..cdb23af69b5f4a55cc1060ca417aa04d76ed3839 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java
@@ -35,7 +35,7 @@ final public class VOr extends VAcceptCriterion implements VAcceptCallback {
     }
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         return false; // not used here
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java
index f24ecf87e315b9a68faea44e2e0debe9ae1dbcf6..5236ecc5b1307c59059d2d954e4b82d1898d8fd5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java
@@ -11,7 +11,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VOverTreeNode extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         Boolean containsKey = (Boolean) drag.getDropDetails().get(
                 "itemIdOverIsNode");
         return containsKey != null && containsKey.booleanValue();

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java
index f9cf7a32bb4e34601d6e0551a8169e0cd5d2fd74..163396d846003800bc14df08a90f083d22010537 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java
@@ -29,7 +29,7 @@ final public class VServerAccept extends VAcceptCriterion {
     }
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         return false; // not used
     }
 }
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsSameAsTarget.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsSameAsTarget.java
index 5dd52fa712ef5678278d3a407bf48f41ad1921de..44bae007d6d2ef2fea1c00af94ed708cce1113d2 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsSameAsTarget.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsSameAsTarget.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 final public class VSourceIsSameAsTarget extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
         Paintable dragSource = drag.getTransferable().getDragSource();
         Paintable paintable = VDragAndDropManager.get().getCurrentDropHandler()
                 .getPaintable();

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetNodeIsChildOf.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetNodeIsChildOf.java
index ceec6e9365a006dc6d6a89a2785e90476689e97b..22c0298e65d7bc5930effe90e9aea185d95c8fe2 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetNodeIsChildOf.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetNodeIsChildOf.java
@@ -14,7 +14,7 @@ import com.vaadin.terminal.gwt.client.ui.VTree.TreeNode;
 final public class VTargetNodeIsChildOf extends VAcceptCriterion {
 
     @Override
-    public boolean validates(VDragEvent drag, UIDL configuration) {
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
 
         VTree tree = (VTree) VDragAndDropManager.get().getCurrentDropHandler()
                 .getPaintable();

diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index f639e57e49a9b44d972f8ea54475eab59a5123b7..8c7526986027cdde90ca223334821653355a37d7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
@@ -93,7 +93,7 @@ public class DragAndDropService implements VariableOwner {
                 variables);
         DragAndDropEvent dropEvent = new DragAndDropEvent(transferable,
                 dropData);
-        if (dropHandler.getAcceptCriterion().accepts(dropEvent)) {
+        if (dropHandler.getAcceptCriterion().accept(dropEvent)) {
             dropHandler.drop(dropEvent);
         }
     }
@@ -121,7 +121,7 @@ public class DragAndDropService implements VariableOwner {
 
         dragEvent = new DragAndDropEvent(transferable, dragDropDetails);
 
-        lastVisitAccepted = acceptCriterion.accepts(dragEvent);
+        lastVisitAccepted = acceptCriterion.accept(dragEvent);
     }
 
     /**

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 45ff75a66ebbb9c25a602ffd2426abb0ebfd4e4d..4a13c191f1ded2c52c95f8aede500885a1933031 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -1704,7 +1704,7 @@ public abstract class AbstractSelect extends AbstractField implements
             super(select, itemId);
         }
 
-        public boolean accepts(DragAndDropEvent dragEvent) {
+        public boolean accept(DragAndDropEvent dragEvent) {
             AbstractSelectDropTargetDetails dropTargetData = (AbstractSelectDropTargetDetails) dragEvent
                     .getDropTargetDetails();
             return itemIds.contains(dropTargetData.getItemIdOver());
@@ -1761,7 +1761,7 @@ public abstract class AbstractSelect extends AbstractField implements
             super(select, itemId);
         }
 
-        public boolean accepts(DragAndDropEvent dragEvent) {
+        public boolean accept(DragAndDropEvent dragEvent) {
             DataBoundTransferable transferable = (DataBoundTransferable) dragEvent
                     .getTransferable();
             return itemIds.contains(transferable.getItemId());

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 6ae1362e9aa176d3353cb63831a2e5b1bd7f14b4..d50d0dcf2cfffb5dcc88718a8372ffa1285049e2 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -3461,7 +3461,7 @@ public class Table extends AbstractSelect implements Action.Container,
          * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#accepts(com.vaadin
          * .event.dd.DragAndDropEvent)
          */
-        public boolean accepts(DragAndDropEvent dragEvent) {
+        public boolean accept(DragAndDropEvent dragEvent) {
             AbstractSelectDropTargetDetails dropTargetData = (AbstractSelectDropTargetDetails) dragEvent
                     .getDropTargetDetails();
             table = (Table) dragEvent.getDropTargetDetails().getTarget();

diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index b1e076ea28e7a4bebb7ae311e3d7c0591019dcc5..0b1ee9b10463bce211990349a9ffcb3ceb0eb543 100644 (file)
--- a/src/com/vaadin/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -1325,7 +1325,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
          * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#accepts(com.vaadin
          * .event.dd.DragAndDropEvent)
          */
-        public boolean accepts(DragAndDropEvent dragEvent) {
+        public boolean accept(DragAndDropEvent dragEvent) {
             AbstractSelectDropTargetDetails dropTargetData = (AbstractSelectDropTargetDetails) dragEvent
                     .getDropTargetDetails();
             tree = (Tree) dragEvent.getDropTargetDetails().getTarget();
@@ -1378,7 +1378,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
          * Uses enhanced server side check
          */
         @Override
-        public boolean accepts(DragAndDropEvent dragEvent) {
+        public boolean accept(DragAndDropEvent dragEvent) {
             try {
                 // must be over tree node and in the middle of it (not top or
                 // bottom
@@ -1440,7 +1440,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
             this.depthToCheck = depthToCheck;
         }
 
-        public boolean accepts(DragAndDropEvent dragEvent) {
+        public boolean accept(DragAndDropEvent dragEvent) {
             try {
                 TreeDropTargetDetails eventDetails = (TreeDropTargetDetails) dragEvent
                         .getDropTargetDetails();

diff --git a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
index f1b45a2cc1b039f5cc0d7b105cba0aafa8a23e22..8cf8cb3c5a694b175eacb10340a81aca48222cb2 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java
@@ -37,7 +37,7 @@ public class AcceptFromComponent extends Window {
 
         final ServerSideCriterion serverSideCriterion = new ServerSideCriterion() {
 
-            public boolean accepts(DragAndDropEvent dragEvent) {
+            public boolean accept(DragAndDropEvent dragEvent) {
                 Transferable transferable = dragEvent.getTransferable();
                 if (transferable instanceof TransferableImpl) {
                     TransferableImpl componentTransferrable = (TransferableImpl) transferable;

diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index 3ca5819833360165a3082cd793ea72a8366a4a36..dc46de7e32faa4bd4adb278496574110b9a9746e 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -63,7 +63,7 @@ public class DDTest1 extends TestBase {
              */
             private static final long serialVersionUID = 1L;
 
-            public boolean accepts(DragAndDropEvent dragEvent) {
+            public boolean accept(DragAndDropEvent dragEvent) {
                 Transferable transferable = dragEvent.getTransferable();
                 // System.out.println("Simulating 500ms processing...");
                 // try {