renaming criteria

svn changeset:12069/svn branch:6.3

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 4b07365489aeb18ace436abca040a5629c7eeb0f..b12e7e05d871b984a938d0435247c7d8b319bd4d 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -1693,14 +1693,14 @@ public abstract class AbstractSelect extends AbstractField implements
 
     /**
      * Criterion which accepts a drop only if the drop target is (one of) the
-     * given item identifier(s). Criterion can be used only on drop targets that
-     * extends AbstractSelect like {@link Table} and {@link Tree}. The target
-     * and identifiers of valid Items are given in constructor.
+     * given Item identifier(s). Criterion can be used only on a drop targets
+     * that extends AbstractSelect like {@link Table} and {@link Tree}. The
+     * target and identifiers of valid Items are given in constructor.
      * 
      * @since 6.3
      */
     @ClientCriterion(VIsOverId.class)
-    public static class OverItem extends AbstractItemSetCriterion {
+    public static class TargetItemIs extends AbstractItemSetCriterion {
 
         /**
          * @param select
@@ -1708,7 +1708,7 @@ public abstract class AbstractSelect extends AbstractField implements
          * @param itemId
          *            the identifier(s) that are valid drop locations
          */
-        public OverItem(AbstractSelect select, Object... itemId) {
+        public TargetItemIs(AbstractSelect select, Object... itemId) {
             super(select, itemId);
         }
 

diff --git a/tests/src/com/vaadin/tests/dd/DDTest8.java b/tests/src/com/vaadin/tests/dd/DDTest8.java
index b1c550d5276ada84baae3200d141e2900763c052..26207ca499682f8998ec730f78318395a444f8ce 100644 (file)
--- a/tests/src/com/vaadin/tests/dd/DDTest8.java
+++ b/tests/src/com/vaadin/tests/dd/DDTest8.java
@@ -148,7 +148,7 @@ public class DDTest8 extends TestBase {
             }
 
             public AcceptCriterion getAcceptCriterion() {
-                return new Or(new AbstractSelect.OverItem(t, "Foo", "Bar"),
+                return new Or(new AbstractSelect.TargetItemIs(t, "Foo", "Bar"),
                         new AbstractSelect.AcceptItem(t, "Foo"));
             }