From: Matti Tahvonen Date: Thu, 18 Feb 2010 12:22:59 +0000 (+0000) Subject: fixed english problem with criterion plural X-Git-Tag: 6.7.0.beta1~1988^2~8 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d95fb932d6b88d882659d06801e78fe9a2f152bb;p=vaadin-framework.git 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 ebc58bcbe3..e5cfea6c9c 100644 --- 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 value(); + Class 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 2bf363d1ff..5b02a6055a 100644 --- 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 2a5f993492..78a58cbc4c 100644 --- 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 99d43ab5ee..1b79a577fe 100644 --- 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 6f49cacdf3..0a759b383a 100644 --- 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 15248542cc..aa85923cfc 100644 --- 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 42b77e2db3..d12632349a 100644 --- 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 ce84d7aaab..50abae6d4b 100644 --- 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 51f4bf8cbe..7829a32024 100644 --- 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 a5cfda3815..8b4e7fbc54 100644 --- 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 ba5275d6a4..fab84f17b8 100644 --- 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 ebe8a3e23a..f353e8db9d 100644 --- 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 87b09307bf..e1a5df8d18 100644 --- 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 689ed0eb62..42b5a23801 100644 --- 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 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 8ce753e886..fe6fa8b6fb 100644 --- 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 324dc08d6a..114794f509 100644 --- 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 ebdc6bfed9..db59d526ae 100644 --- 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 238b0c8cb4..b1cea05d54 100644 --- 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 952c159067..5a7608366a 100644 --- 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 91c50f046b..fbdcb07a2e 100644 --- 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 class1 : clientSideVerifiableCriterion) { String canonicalName = class1.getCanonicalName(); - Class clientClass = class1 + Class clientClass = class1 .getAnnotation(ClientCriterion.class).value(); sourceWriter.print("if (\""); sourceWriter.print(canonicalName);