renaming criteria

svn changeset:12073/svn branch:6.3

diff --git a/src/com/vaadin/event/dd/acceptcriteria/IsSameSourceAndTarget.java b/src/com/vaadin/event/dd/acceptcriteria/IsSameSourceAndTarget.java
deleted file mode 100644 (file)
index ac522da..0000000
--- a/src/com/vaadin/event/dd/acceptcriteria/IsSameSourceAndTarget.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-@ITMillApache2LicenseForJavaFiles@
- */
-/**
- * 
- */
-package com.vaadin.event.dd.acceptcriteria;
-
-import com.vaadin.event.Transferable;
-import com.vaadin.event.TransferableImpl;
-import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.event.dd.DropTarget;
-import com.vaadin.terminal.gwt.client.ui.dd.VSourceIsSameAsTarget;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
-
-/**
- * 
- * A criterion that ensures the drag source is the same as drop target. Eg.
- * {@link Tree} or {@link Table} could support only re-ordering of items, but no
- * {@link Transferable}s coming outside.
- * <p>
- * Note! Class is singleton, use {@link #get()} method to get the instance.
- * 
- * @since 6.3
- * 
- */
-@ClientCriterion(VSourceIsSameAsTarget.class)
-public class IsSameSourceAndTarget extends ClientSideCriterion {
-
-    private static final long serialVersionUID = -451399314705532584L;
-    private static IsSameSourceAndTarget instance = new IsSameSourceAndTarget();
-
-    private IsSameSourceAndTarget() {
-    }
-
-    public boolean accept(DragAndDropEvent dragEvent) {
-        if (dragEvent.getTransferable() instanceof TransferableImpl) {
-            Component sourceComponent = ((TransferableImpl) dragEvent
-                    .getTransferable()).getSourceComponent();
-            DropTarget target = dragEvent.getDropTargetDetails().getTarget();
-            return sourceComponent == target;
-        }
-        return false;
-    }
-
-    public static synchronized IsSameSourceAndTarget get() {
-        return instance;
-    }
-
-}
\ No newline at end of file

diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
new file mode 100644 (file)
index 0000000..edee164
--- /dev/null
+++ b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
@@ -0,0 +1,52 @@
+/*
+@ITMillApache2LicenseForJavaFiles@
+ */
+/**
+ * 
+ */
+package com.vaadin.event.dd.acceptcriteria;
+
+import com.vaadin.event.Transferable;
+import com.vaadin.event.TransferableImpl;
+import com.vaadin.event.dd.DragAndDropEvent;
+import com.vaadin.event.dd.DropTarget;
+import com.vaadin.terminal.gwt.client.ui.dd.VSourceIsTarget;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+
+/**
+ * 
+ * A criterion that ensures the drag source is the same as drop target. Eg.
+ * {@link Tree} or {@link Table} could support only re-ordering of items, but no
+ * {@link Transferable}s coming outside.
+ * <p>
+ * Note! Class is singleton, use {@link #get()} method to get the instance.
+ * 
+ * @since 6.3
+ * 
+ */
+@ClientCriterion(VSourceIsTarget.class)
+public class SourceIsTarget extends ClientSideCriterion {
+
+    private static final long serialVersionUID = -451399314705532584L;
+    private static SourceIsTarget instance = new SourceIsTarget();
+
+    private SourceIsTarget() {
+    }
+
+    public boolean accept(DragAndDropEvent dragEvent) {
+        if (dragEvent.getTransferable() instanceof TransferableImpl) {
+            Component sourceComponent = ((TransferableImpl) dragEvent
+                    .getTransferable()).getSourceComponent();
+            DropTarget target = dragEvent.getDropTargetDetails().getTarget();
+            return sourceComponent == target;
+        }
+        return false;
+    }
+
+    public static synchronized SourceIsTarget get() {
+        return instance;
+    }
+
+}
\ 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
deleted file mode 100644 (file)
index 44bae00..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsSameAsTarget.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-@ITMillApache2LicenseForJavaFiles@
- */
-/**
- * 
- */
-package com.vaadin.terminal.gwt.client.ui.dd;
-
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-
-final public class VSourceIsSameAsTarget extends VAcceptCriterion {
-
-    @Override
-    protected boolean accept(VDragEvent drag, UIDL configuration) {
-        Paintable dragSource = drag.getTransferable().getDragSource();
-        Paintable paintable = VDragAndDropManager.get().getCurrentDropHandler()
-                .getPaintable();
-
-        return paintable == dragSource;
-    }
-}
\ No newline at end of file

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java
new file mode 100644 (file)
index 0000000..19a8206
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java
@@ -0,0 +1,22 @@
+/*
+@ITMillApache2LicenseForJavaFiles@
+ */
+/**
+ * 
+ */
+package com.vaadin.terminal.gwt.client.ui.dd;
+
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+
+final public class VSourceIsTarget extends VAcceptCriterion {
+
+    @Override
+    protected boolean accept(VDragEvent drag, UIDL configuration) {
+        Paintable dragSource = drag.getTransferable().getDragSource();
+        Paintable paintable = VDragAndDropManager.get().getCurrentDropHandler()
+                .getPaintable();
+
+        return paintable == dragSource;
+    }
+}
\ No newline at end of file

diff --git a/tests/src/com/vaadin/tests/dd/DDTest6.java b/tests/src/com/vaadin/tests/dd/DDTest6.java
index 58e6e1b5cccf54c763438e0e39497a4131ceb42b..475ee52a8774d54d1a9a06750c0ab53eff12418a 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest6.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest6.java
@@ -24,7 +24,7 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.event.dd.acceptcriteria.IsSameSourceAndTarget;
+import com.vaadin.event.dd.acceptcriteria.SourceIsTarget;
 import com.vaadin.event.dd.acceptcriteria.Not;
 import com.vaadin.terminal.ApplicationResource;
 import com.vaadin.terminal.Resource;
@@ -491,7 +491,7 @@ public class DDTest6 extends TestBase {
                 setDropHandler(new DropHandler() {
 
                     public AcceptCriterion getAcceptCriterion() {
-                        return new Not(IsSameSourceAndTarget.get());
+                        return new Not(SourceIsTarget.get());
                     }
 
                     public void drop(DragAndDropEvent dropEvent) {

diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index 2f2baa581c643e37bb67772cd994531e4aefd0cd..db21ea743f73bbaf81a506f827ef6c32bfe247de 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
@@ -11,7 +11,7 @@ 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.TargetDetailIs;
-import com.vaadin.event.dd.acceptcriteria.IsSameSourceAndTarget;
+import com.vaadin.event.dd.acceptcriteria.SourceIsTarget;
 import com.vaadin.event.dd.acceptcriteria.Not;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DragAndDropWrapper;
@@ -52,7 +52,7 @@ public class HorizontalLayoutSortableWithWrappers extends Window {
 
     private DropHandler dh = new DropHandler() {
         AcceptCriterion crit = new And(new TargetDetailIs(
-                "horizontalLocation", "LEFT"), new Not(IsSameSourceAndTarget
+                "horizontalLocation", "LEFT"), new Not(SourceIsTarget
                 .get()));
 
         public AcceptCriterion getAcceptCriterion() {