diff options
Diffstat (limited to 'src/com/vaadin/event')
13 files changed, 17 insertions, 17 deletions
diff --git a/src/com/vaadin/event/dd/DragAndDropEvent.java b/src/com/vaadin/event/dd/DragAndDropEvent.java index d2b971a689..5fbdeefe51 100644 --- a/src/com/vaadin/event/dd/DragAndDropEvent.java +++ b/src/com/vaadin/event/dd/DragAndDropEvent.java @@ -12,7 +12,7 @@ import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; * DragAndDropEvent wraps information related to drag and drop operation. It is * passed by terminal implementation for * {@link DropHandler#drop(DragAndDropEvent)} and - * {@link AcceptCriterion#accepts(DragAndDropEvent)} methods. + * {@link AcceptCriterion#accept(DragAndDropEvent)} methods. * <p> * DragAndDropEvent instances contains both the dragged data in * {@link Transferable} (generated by {@link DragSource} and details about the diff --git a/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java b/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java index 942a85ee64..3916d8e7e6 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java +++ b/src/com/vaadin/event/dd/acceptCriteria/AcceptAll.java @@ -31,7 +31,7 @@ public final class AcceptAll extends ClientSideCriterion { return singleton; } - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { return true; } }
\ No newline at end of file diff --git a/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java b/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java index d65c64d81e..5c2ec6a4a8 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java +++ b/src/com/vaadin/event/dd/acceptCriteria/AcceptCriterion.java @@ -54,7 +54,7 @@ public interface AcceptCriterion extends Serializable { * This needs to be implemented iff criterion does some lazy server side * initialization. The UIDL painted in this method will be passed to client * side drop handler implementation. Implementation can assume that - * {@link #accepts(DragAndDropEvent)} is called before this method. + * {@link #accept(DragAndDropEvent)} is called before this method. * * @param target * @throws PaintException @@ -71,5 +71,5 @@ public interface AcceptCriterion extends Serializable { * @param dragEvent * @return */ - public boolean accepts(DragAndDropEvent dragEvent); + public boolean accept(DragAndDropEvent dragEvent); }
\ No newline at end of file diff --git a/src/com/vaadin/event/dd/acceptCriteria/And.java b/src/com/vaadin/event/dd/acceptCriteria/And.java index 4bab63386c..3db317c213 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/And.java +++ b/src/com/vaadin/event/dd/acceptCriteria/And.java @@ -42,9 +42,9 @@ public class And extends ClientSideCriterion { } } - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { for (ClientSideCriterion crit : criteria) { - if (!crit.accepts(dragEvent)) { + if (!crit.accept(dragEvent)) { return false; } } diff --git a/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java b/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java index e406535958..e98e3c2719 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptCriteria/ClientSideCriterion.java @@ -15,7 +15,7 @@ import com.vaadin.terminal.PaintTarget; * * It is recommended that subclasses of ClientSideCriterion re-validate the * condition on the server side in - * {@link AcceptCriterion#accepts(com.vaadin.event.dd.DragAndDropEvent)} after + * {@link AcceptCriterion#accept(com.vaadin.event.dd.DragAndDropEvent)} after * the client side validation has accepted a transfer. * * @since 6.3 diff --git a/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java b/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java index 93530791d6..806a3b5d2d 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java +++ b/src/com/vaadin/event/dd/acceptCriteria/ContainsDataFlavor.java @@ -41,7 +41,7 @@ public class ContainsDataFlavor extends ClientSideCriterion { target.addAttribute("p", dataFlavorId); } - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { return dragEvent.getTransferable().getDataFlavors().contains( dataFlavorId); } diff --git a/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java b/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java index 5b0ad651ed..218133815c 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java +++ b/src/com/vaadin/event/dd/acceptCriteria/DragSourceIs.java @@ -37,7 +37,7 @@ public class DragSourceIs extends ClientSideCriterion { } } - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { Component sourceComponent = ((TransferableImpl) dragEvent .getTransferable()).getSourceComponent(); diff --git a/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java b/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java index c18cbc8f7a..a2b24533b3 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java +++ b/src/com/vaadin/event/dd/acceptCriteria/DropTargetDetailEquals.java @@ -60,7 +60,7 @@ public class DropTargetDetailEquals extends ClientSideCriterion { } } - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { Object data = dragEvent.getDropTargetDetails().getData(propertyName); return value.equals(data); } diff --git a/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java b/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java index c8050f94bf..8615d207ca 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java +++ b/src/com/vaadin/event/dd/acceptCriteria/IsDataBound.java @@ -38,7 +38,7 @@ public final class IsDataBound extends ContainsDataFlavor { } @Override - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof DataBoundTransferable) { return ((DataBoundTransferable) dragEvent.getTransferable()) .getItemId() != null; diff --git a/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java b/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java index 1c14506d38..2637d27a0b 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java +++ b/src/com/vaadin/event/dd/acceptCriteria/IsSameSourceAndTarget.java @@ -35,7 +35,7 @@ public class IsSameSourceAndTarget extends ClientSideCriterion { private IsSameSourceAndTarget() { } - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { Component sourceComponent = ((TransferableImpl) dragEvent .getTransferable()).getSourceComponent(); diff --git a/src/com/vaadin/event/dd/acceptCriteria/Not.java b/src/com/vaadin/event/dd/acceptCriteria/Not.java index e4828cd83b..874016c9b7 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/Not.java +++ b/src/com/vaadin/event/dd/acceptCriteria/Not.java @@ -33,8 +33,8 @@ public class Not extends ClientSideCriterion { acceptCriterion.paint(target); } - public boolean accepts(DragAndDropEvent dragEvent) { - return !acceptCriterion.accepts(dragEvent); + public boolean accept(DragAndDropEvent dragEvent) { + return !acceptCriterion.accept(dragEvent); } }
\ No newline at end of file diff --git a/src/com/vaadin/event/dd/acceptCriteria/Or.java b/src/com/vaadin/event/dd/acceptCriteria/Or.java index 35eee06b4c..41aef10738 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/Or.java +++ b/src/com/vaadin/event/dd/acceptCriteria/Or.java @@ -41,9 +41,9 @@ public class Or extends ClientSideCriterion { } } - public boolean accepts(DragAndDropEvent dragEvent) { + public boolean accept(DragAndDropEvent dragEvent) { for (AcceptCriterion crit : criteria) { - if (crit.accepts(dragEvent)) { + if (crit.accept(dragEvent)) { return true; } } diff --git a/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java b/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java index a1f3d0e970..69405db8ed 100644 --- a/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptCriteria/ServerSideCriterion.java @@ -16,7 +16,7 @@ import com.vaadin.terminal.gwt.client.ui.dd.VServerAccept; * {@link Transferable}). * <p> * Subclasses should implement the - * {@link AcceptCriterion#accepts(com.vaadin.event.dd.DragAndDropEvent)} method. + * {@link AcceptCriterion#accept(com.vaadin.event.dd.DragAndDropEvent)} method. * <p> * As all server side state can be used to make a decision, this is more * flexible than {@link ClientSideCriterion}. However, this does require |