From 15f833480da7a5eff0d29c527cd956b9e9658401 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Fri, 16 Nov 2012 16:42:21 +0200 Subject: @Connect lastonly -> lastOnly (#10244) Change-Id: I5d587852d00b485eb57e10ad3ba874ea1b500a19 --- shared/src/com/vaadin/shared/annotations/Delayed.java | 4 ++-- .../shared/communication/LegacyChangeVariablesInvocation.java | 4 ++-- shared/src/com/vaadin/shared/communication/MethodInvocation.java | 6 +++--- shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'shared/src/com/vaadin') diff --git a/shared/src/com/vaadin/shared/annotations/Delayed.java b/shared/src/com/vaadin/shared/annotations/Delayed.java index 706ffc1c53..a9914ac35f 100644 --- a/shared/src/com/vaadin/shared/annotations/Delayed.java +++ b/shared/src/com/vaadin/shared/annotations/Delayed.java @@ -37,7 +37,7 @@ import com.vaadin.shared.communication.ServerRpc; @Documented public @interface Delayed { /** - * By setting lastonly to true, any previous invocations of the + * By setting lastOnly to true, any previous invocations of the * same method will be removed from the queue when a new invocation is * added. This can be used in cases where only the last value is of * interest. @@ -50,5 +50,5 @@ public @interface Delayed { * method should be sent to the server, false if all * enqueued invocations should be sent. */ - public boolean lastonly() default false; + public boolean lastOnly() default false; } diff --git a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java b/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java index 2ffc56dd71..c41087e284 100644 --- a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java +++ b/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java @@ -48,9 +48,9 @@ public class LegacyChangeVariablesInvocation extends MethodInvocation { } @Override - public String getLastonlyTag() { + public String getLastOnlyTag() { assert variableChanges.size() == 1; - return super.getLastonlyTag() + return super.getLastOnlyTag() + variableChanges.keySet().iterator().next(); } diff --git a/shared/src/com/vaadin/shared/communication/MethodInvocation.java b/shared/src/com/vaadin/shared/communication/MethodInvocation.java index c4da937c27..1e683ce231 100644 --- a/shared/src/com/vaadin/shared/communication/MethodInvocation.java +++ b/shared/src/com/vaadin/shared/communication/MethodInvocation.java @@ -74,14 +74,14 @@ public class MethodInvocation implements Serializable { /** * Gets a String tag that is used to uniquely identify previous method * invocations that should be purged from the queue if - * {@literal @}Delay(lastonly = true) is used. + * {@literal @}Delay(lastOnly = true) is used. *

* The returned string should contain at least one non-number char to ensure - * it doesn't collide with the keys used for invocations without lastonly. + * it doesn't collide with the keys used for invocations without lastOnly. * * @return a string identifying this method invocation */ - public String getLastonlyTag() { + public String getLastOnlyTag() { return connectorId + "-" + getInterfaceName() + "-" + getMethodName(); } diff --git a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java b/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java index ef28a12415..11a400bbe0 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java @@ -20,7 +20,7 @@ import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.ui.ClickRpc; public interface UIServerRpc extends ClickRpc, ServerRpc { - @Delayed(lastonly = true) + @Delayed(lastOnly = true) public void resize(int viewWidth, int viewHeight, int windowWidth, int windowHeight); } \ No newline at end of file -- cgit v1.2.3