fixed english problem with criterion plural

svn changeset:11377/svn branch:6.3_dd

diff --git a/src/com/vaadin/event/dd/acceptCriteria/ClientCriterion.java b/src/com/vaadin/event/dd/acceptCriteria/ClientCriterion.java
index ebc58bcbe3e7c0e4324411d19986aa1e30ca8e82..e5cfea6c9ca336cde6505cc465e01b3e98e44f44 100644 (file)
--- a/src/com/vaadin/event/dd/acceptCriteria/ClientCriterion.java
+++ b/src/com/vaadin/event/dd/acceptCriteria/ClientCriterion.java
@@ -5,7 +5,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriteria;
+import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion;
 
 /**
  * TODO
@@ -18,5 +18,5 @@ public @interface ClientCriterion {
     /**
      * @return the client side counterpart for the annotated criterion
      */
-    Class<? extends VAcceptCriteria> value();
+    Class<? extends VAcceptCriterion> value();
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java
index 2bf363d1ff2b84c92ee69b5f35b0a39359281738..5b02a6055a10288aa3b7abdb92c112eee9a92abb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 public abstract class VAbstractDropHandler implements VDropHandler {
 
     private UIDL criterioUIDL;
-    private VAcceptCriteria acceptCriteria = new VAcceptAll();
+    private VAcceptCriterion acceptCriteria = new VAcceptAll();
 
     /**
      * Implementor/user of {@link VAbstractDropHandler} must pass the UIDL
@@ -33,7 +33,7 @@ public abstract class VAbstractDropHandler implements VDropHandler {
                 uidl = (UIDL) childIterator.next();
             }
         }
-        acceptCriteria = VAcceptCriterion.get(uidl.getStringAttribute("name"));
+        acceptCriteria = VAcceptCriteria.get(uidl.getStringAttribute("name"));
         if (acceptCriteria == null) {
             throw new IllegalArgumentException(
                     "No accept criteria found with given name "

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 2a5f9934929d58bef6712f62d3abfeadd1f08867..78a58cbc4c014d38ce57350e62b61e28dee22430 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VAcceptAll implements VAcceptCriteria {
+final public class VAcceptAll implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         callback.accepted(drag);

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java
index 99d43ab5ee6b97c9acc441dd74ca84af8c86279d..1b79a577fe48dee04af567c18ba9e63a62a883ef 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java
@@ -1,20 +1,19 @@
 package com.vaadin.terminal.gwt.client.ui.dd;
 
-import com.vaadin.terminal.gwt.client.UIDL;
+import com.google.gwt.core.client.GWT;
 
-public interface VAcceptCriteria {
+/**
+ * A class via all AcceptCriteria instances are fetched by an identifier.
+ */
+public class VAcceptCriteria {
+    private static VAcceptCriterionFactory impl;
 
-    /**
-     * Checks if current drag event has valid drop target and target accepts the
-     * transferable. If drop target is valid, callback is used.
-     * 
-     * @param drag
-     * @param configuration
-     * @param callback
-     */
-    public void accept(VDragEvent drag, UIDL configuration,
-            VAcceptCallback callback);
+    static {
+        impl = GWT.create(VAcceptCriterionFactory.class);
+    }
 
-    public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL);
+    public static VAcceptCriterion get(String name) {
+        return impl.get(name);
+    }
 
 }

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 6f49cacdf349c90de2e0bac01f1ffc67308dccd0..0a759b383a7261cee8ebf074f52505be59229ebf 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java
@@ -1,19 +1,20 @@
 package com.vaadin.terminal.gwt.client.ui.dd;
 
-import com.google.gwt.core.client.GWT;
+import com.vaadin.terminal.gwt.client.UIDL;
 
-/**
- * A class via all AcceptCriteria instances are fetched by an identifier.
- */
-public class VAcceptCriterion {
-    private static VAcceptCriterionFactory impl;
+public interface VAcceptCriterion {
 
-    static {
-        impl = GWT.create(VAcceptCriterionFactory.class);
-    }
+    /**
+     * Checks if current drag event has valid drop target and target accepts the
+     * transferable. If drop target is valid, callback is used.
+     * 
+     * @param drag
+     * @param configuration
+     * @param callback
+     */
+    public void accept(VDragEvent drag, UIDL configuration,
+            VAcceptCallback callback);
 
-    public static VAcceptCriteria get(String name) {
-        return impl.get(name);
-    }
+    public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL);
 
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
index 15248542cc6cd98be8e3377ec15d32eebac4e673..aa85923cfc95bc095f16febbb73499e651513bd9 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
@@ -2,7 +2,7 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 
 public abstract class VAcceptCriterionFactory {
 
-    public abstract VAcceptCriteria get(String name);
+    public abstract VAcceptCriterion get(String name);
     // name = name.intern();
     // // FIXME make all lazy inited and possibility to use instances per
     // // handler

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 42b77e2db3c4bd6389f1a2d25787c7dea0ddc95c..d12632349a6c936f769af37d41baba58993985ae 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java
@@ -6,11 +6,11 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VAnd implements VAcceptCriteria {
+final public class VAnd implements VAcceptCriterion {
     private boolean b1;
     private boolean b2;
-    private VAcceptCriteria crit1;
-    private VAcceptCriteria crit2;
+    private VAcceptCriterion crit1;
+    private VAcceptCriterion crit2;
 
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
@@ -45,10 +45,10 @@ final public class VAnd implements VAcceptCriteria {
         }
     }
 
-    private VAcceptCriteria getCriteria(VDragEvent drag, UIDL configuration,
+    private VAcceptCriterion getCriteria(VDragEvent drag, UIDL configuration,
             int i) {
         UIDL childUIDL = configuration.getChildUIDL(i);
-        return VAcceptCriterion.get(childUIDL.getStringAttribute("name"));
+        return VAcceptCriteria.get(childUIDL.getStringAttribute("name"));
     }
 
     public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL) {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VComponentFilter.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VComponentFilter.java
index ce84d7aaabf48c38cbf5640d7a5b6c3ab3fb5367..50abae6d4b11b4c7e2b03435197b01bf005dd5e0 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VComponentFilter.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VComponentFilter.java
@@ -6,7 +6,7 @@ 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 VComponentFilter implements VAcceptCriteria {
+final public class VComponentFilter implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         try {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlawor.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlawor.java
index 51f4bf8cbe994dfd7c18bd097dfebd611853cdf2..7829a3202437022f093d9e77fbbf413d064abcd5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlawor.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlawor.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VContainsDataFlawor implements VAcceptCriteria {
+final public class VContainsDataFlawor implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         String name = configuration.getStringAttribute("p");

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDataBound.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDataBound.java
index a5cfda3815e8634fbef876f44e76467a6a52aec5..8b4e7fbc54b4bb3067a6c9504eb87eb6205250a3 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDataBound.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDataBound.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VDataBound implements VAcceptCriteria {
+final public class VDataBound implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         if (drag.getTransferable().getData("itemId") != null) {

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 ba5275d6a421a720e49d558b1fbc1d5aaf40ca81..fab84f17b81e0c84c195606f12903f17acddb5eb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VDropDetailEquals implements VAcceptCriteria {
+final public class VDropDetailEquals implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         String name = configuration.getStringAttribute("p");

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VIdentifierIs.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VIdentifierIs.java
index ebe8a3e23af9f3de3c9a19a472d902fa865bc01b..f353e8db9de6adfdc2adbe41a4b1b736d57b0d83 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VIdentifierIs.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VIdentifierIs.java
@@ -7,7 +7,7 @@ import java.util.Set;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VIdentifierIs implements VAcceptCriteria {
+final public class VIdentifierIs implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         try {

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 87b09307bf17c5e0d70589a2842d5923f36960b7..e1a5df8d181e292731205461b6fc57665c2c951e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java
@@ -7,7 +7,7 @@ import java.util.Set;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VIsOverId implements VAcceptCriteria {
+final public class VIsOverId implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         try {

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 689ed0eb620ca7a0420dad4d7fb39d6470b9a16a..42b5a23801c3ca7a6f0d84a20027661e7bfda9c8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
  * @deprecated example class testing custom behavior
  */
 @Deprecated
-final public class VLazyInitItemIdentifiers implements VAcceptCriteria {
+final public class VLazyInitItemIdentifiers implements VAcceptCriterion {
     private boolean loaded = false;
     private HashSet<String> hashSet;
     private VDragEvent lastDragEvent;

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 8ce753e886f6112a896a3ffdc48427661d66d01d..fe6fa8b6fbb3bf2758cd07e516117fe1aba75442 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java
@@ -6,9 +6,9 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VNot implements VAcceptCriteria {
+final public class VNot implements VAcceptCriterion {
     private boolean b1;
-    private VAcceptCriteria crit1;
+    private VAcceptCriterion crit1;
 
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
@@ -35,10 +35,10 @@ final public class VNot implements VAcceptCriteria {
         }
     }
 
-    private VAcceptCriteria getCriteria(VDragEvent drag, UIDL configuration,
+    private VAcceptCriterion getCriteria(VDragEvent drag, UIDL configuration,
             int i) {
         UIDL childUIDL = configuration.getChildUIDL(i);
-        return VAcceptCriterion.get(childUIDL.getStringAttribute("name"));
+        return VAcceptCriteria.get(childUIDL.getStringAttribute("name"));
     }
 
     public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL) {

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 324dc08d6a00040099b792a774d754a95e26c2fe..114794f509f30b3f3b6f69b728c958f85bdf1086 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java
@@ -6,11 +6,11 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VOr implements VAcceptCriteria {
+final public class VOr implements VAcceptCriterion {
     private boolean b1;
     private boolean b2;
-    private VAcceptCriteria crit1;
-    private VAcceptCriteria crit2;
+    private VAcceptCriterion crit1;
+    private VAcceptCriterion crit2;
 
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
@@ -45,10 +45,10 @@ final public class VOr implements VAcceptCriteria {
         }
     }
 
-    private VAcceptCriteria getCriteria(VDragEvent drag, UIDL configuration,
+    private VAcceptCriterion getCriteria(VDragEvent drag, UIDL configuration,
             int i) {
         UIDL childUIDL = configuration.getChildUIDL(i);
-        return VAcceptCriterion.get(childUIDL.getStringAttribute("name"));
+        return VAcceptCriteria.get(childUIDL.getStringAttribute("name"));
     }
 
     public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL) {

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 ebdc6bfed9ff27f4aa2555b1475774cf759d93c1..db59d526aebc72b68b6dc10451737a2d30edf775 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VOverTreeNode implements VAcceptCriteria {
+final public class VOverTreeNode implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         Boolean containsKey = (Boolean) drag.getDropDetails().get(

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 238b0c8cb499580a99760b51da90f7909f00ddee..b1cea05d54aacb9954cd32bc4608f17458b62630 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd;
 
 import com.vaadin.terminal.gwt.client.UIDL;
 
-final public class VServerAccept implements VAcceptCriteria {
+final public class VServerAccept implements VAcceptCriterion {
     public void accept(final VDragEvent drag, UIDL configuration,
             final VAcceptCallback callback) {
 

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 952c159067f4e633cb42047b2a3f8920f8e1c274..5a7608366ad8707723553ab5269337a687fd370b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsSameAsTarget.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsSameAsTarget.java
@@ -6,7 +6,7 @@ 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 implements VAcceptCriteria {
+final public class VSourceIsSameAsTarget implements VAcceptCriterion {
     public void accept(VDragEvent drag, UIDL configuration,
             VAcceptCallback callback) {
         Paintable dragSource = drag.getTransferable().getDragSource();

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java
index 91c50f046b5ad9c8bdbe3911cb0c97b9710c5f81..fbdcb07a2e3fc1f587633c610d482921e2095950 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriterionGenerator.java
@@ -15,7 +15,7 @@ import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.vaadin.event.dd.acceptCriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptCriteria.ClientCriterion;
-import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriteria;
+import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion;
 import com.vaadin.ui.ClientWidget;
 
 /**
@@ -93,7 +93,7 @@ public class AcceptCriterionGenerator extends Generator {
     private void generateInstantiatorMethod(SourceWriter sourceWriter,
             GeneratorContext context, TreeLogger logger) {
 
-        sourceWriter.println("public VAcceptCriteria get(String name) {");
+        sourceWriter.println("public VAcceptCriterion get(String name) {");
         sourceWriter.indent();
 
         sourceWriter.println("name = name.intern();");
@@ -103,7 +103,7 @@ public class AcceptCriterionGenerator extends Generator {
 
         for (Class<? extends AcceptCriterion> class1 : clientSideVerifiableCriterion) {
             String canonicalName = class1.getCanonicalName();
-            Class<? extends VAcceptCriteria> clientClass = class1
+            Class<? extends VAcceptCriterion> clientClass = class1
                     .getAnnotation(ClientCriterion.class).value();
             sourceWriter.print("if (\"");
             sourceWriter.print(canonicalName);