renaming criteria

svn changeset:12070/svn branch:6.3

diff --git a/src/com/vaadin/event/dd/acceptcriteria/IsDataBound.java b/src/com/vaadin/event/dd/acceptcriteria/IsDataBound.java
deleted file mode 100644 (file)
index 6b7121e..0000000
--- a/src/com/vaadin/event/dd/acceptcriteria/IsDataBound.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-@ITMillApache2LicenseForJavaFiles@
- */
-/**
- * 
- */
-package com.vaadin.event.dd.acceptcriteria;
-
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.event.DataBoundTransferable;
-import com.vaadin.event.Transferable;
-import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
-
-/**
- * A simple accept criterion which ensures that {@link Transferable} contains an
- * {@link Item} identifiers. In other words the criterion check that drag is
- * coming from a {@link Container} like {@link Tree} or {@link Table}. TODO
- * Javadoc
- * <p>
- * Note! class is singleton, use {@link #get()} method to get the instance.
- * 
- * @since 6.3
- * 
- */
-public final class IsDataBound extends ContainsDataFlavor {
-    private static final long serialVersionUID = 1952366107184656946L;
-    private static IsDataBound singleton = new IsDataBound();
-
-    private IsDataBound() {
-        super("itemId");
-    }
-
-    public static IsDataBound get() {
-        return singleton;
-    }
-
-    @Override
-    public boolean accept(DragAndDropEvent dragEvent) {
-        if (dragEvent.getTransferable() instanceof DataBoundTransferable) {
-            return ((DataBoundTransferable) dragEvent.getTransferable())
-                    .getItemId() != null;
-        }
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index b12e7e05d871b984a938d0435247c7d8b319bd4d..42bc93a18390bf8c26aa6e05ce12247ef48ec049 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -26,6 +26,7 @@ import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.DropTargetDetailsImpl;
 import com.vaadin.event.dd.acceptcriteria.ClientCriterion;
 import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion;
+import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor;
 import com.vaadin.terminal.KeyMapper;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
@@ -1788,6 +1789,15 @@ public abstract class AbstractSelect extends AbstractField implements
             return itemIds.contains(transferable.getItemId());
         }
 
+        /**
+         * A simple accept criterion which ensures that {@link Transferable}
+         * contains an {@link Item} (or actually its identifier). In other words
+         * the criterion check that drag is coming from a {@link Container} like
+         * {@link Tree} or {@link Table}.
+         */
+        public static final ClientSideCriterion ALL = new ContainsDataFlavor(
+                "itemId");
+
     }
 
     /**

diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java
index 26620aff7efc45039cff4bbbabe1e4d5b4861b0e..cfe6aa20c4d7cd73ba70b115239e549e8e43f613 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest1.java
@@ -9,7 +9,6 @@ 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.ServerSideCriterion;
 import com.vaadin.terminal.ExternalResource;
 import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation;
@@ -21,6 +20,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.AcceptItem;
 import com.vaadin.ui.Table.TableDragMode;
 import com.vaadin.ui.Tree.TreeDragMode;
 import com.vaadin.ui.Tree.TreeDropTargetDetails;
@@ -224,7 +224,7 @@ public class DDTest1 extends TestBase {
 
             public AcceptCriterion getAcceptCriterion() {
                 // TODO should actually check that source is same as target
-                return IsDataBound.get();
+                return AcceptItem.ALL;
             }
 
         };

diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java
index 0c95569ef8f3d6a226cb353d67e24706594db6a4..fb496164436b83d906405209d5e7ff28a80f972c 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest2.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest2.java
@@ -16,7 +16,6 @@ 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.DragSourceIs;
-import com.vaadin.event.dd.acceptcriteria.IsDataBound;
 import com.vaadin.event.dd.acceptcriteria.Or;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.ThemeResource;
@@ -27,6 +26,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.AbstractSelect.AbstractSelectDropTargetDetails;
+import com.vaadin.ui.AbstractSelect.AcceptItem;
 import com.vaadin.ui.Table.TableTransferable;
 import com.vaadin.ui.Tree.OverFolderNode;
 import com.vaadin.ui.Tree.TreeDragMode;
@@ -229,7 +229,7 @@ public class DDTest2 extends TestBase {
             }
 
             public AcceptCriterion getAcceptCriterion() {
-                return IsDataBound.get();
+                return AcceptItem.ALL;
             }
         };