diff options
10 files changed, 25 insertions, 25 deletions
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java index 0e29c07405..652eb38b5c 100644 --- a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java +++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java @@ -337,8 +337,8 @@ public class ConnectorBundleLoaderFactory extends Generator { w.print(escape(method.getName())); w.println("\");"); - if (annotation.lastonly()) { - w.print("store.setLastonly("); + if (annotation.lastOnly()) { + w.print("store.setLastOnly("); writeClassLiteral(w, type); w.print(", \""); w.print(escape(method.getName())); diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index e35fd82424..c8206f96f6 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -146,7 +146,7 @@ public class ApplicationConnection { * The pending method invocations that will be send to the server by * {@link #sendPendingCommand}. The key is defined differently based on * whether the method invocation is enqueued with lastonly. With lastonly - * enabled, the method signature ( {@link MethodInvocation#getLastonlyTag()} + * enabled, the method signature ( {@link MethodInvocation#getLastOnlyTag()} * ) is used as the key to make enable removing a previously enqueued * invocation. Without lastonly, an incremental id based on * {@link #lastInvocationTag} is used to get unique values. @@ -2091,7 +2091,7 @@ public class ApplicationConnection { * request), <code>true</code> to let the framework delay sending * of RPC calls and variable changes until the next non-delayed * change - * @param lastonly + * @param lastOnly * <code>true</code> to remove all previously delayed invocations * of the same method that were also enqueued with lastonly set * to <code>true</code>. <code>false</code> to add invocation to @@ -2099,11 +2099,11 @@ public class ApplicationConnection { * invocations. */ public void addMethodInvocationToQueue(MethodInvocation invocation, - boolean delayed, boolean lastonly) { + boolean delayed, boolean lastOnly) { String tag; - if (lastonly) { - tag = invocation.getLastonlyTag(); - assert !tag.matches("\\d+") : "getLastonlyTag value must have at least one non-digit character"; + if (lastOnly) { + tag = invocation.getLastOnlyTag(); + assert !tag.matches("\\d+") : "getLastOnlyTag value must have at least one non-digit character"; pendingInvocations.remove(tag); } else { tag = Integer.toString(lastInvocationTag++); diff --git a/client/src/com/vaadin/client/communication/RpcProxy.java b/client/src/com/vaadin/client/communication/RpcProxy.java index 0e53ea0013..9196155063 100644 --- a/client/src/com/vaadin/client/communication/RpcProxy.java +++ b/client/src/com/vaadin/client/communication/RpcProxy.java @@ -59,7 +59,7 @@ public class RpcProxy { connector.getConnectorId(), rpcInterface.getName(), method.getName(), params); connector.getConnection().addMethodInvocationToQueue(invocation, - method.isDelayed(), method.isLastonly()); + method.isDelayed(), method.isLastOnly()); // No RPC iface should have a return value return null; } diff --git a/client/src/com/vaadin/client/metadata/Method.java b/client/src/com/vaadin/client/metadata/Method.java index 902205cea1..365bd43898 100644 --- a/client/src/com/vaadin/client/metadata/Method.java +++ b/client/src/com/vaadin/client/metadata/Method.java @@ -64,8 +64,8 @@ public class Method { return TypeDataStore.isDelayed(this); } - public boolean isLastonly() { - return TypeDataStore.isLastonly(this); + public boolean isLastOnly() { + return TypeDataStore.isLastOnly(this); } } diff --git a/client/src/com/vaadin/client/metadata/TypeDataStore.java b/client/src/com/vaadin/client/metadata/TypeDataStore.java index 27054c5aeb..c30ee8803c 100644 --- a/client/src/com/vaadin/client/metadata/TypeDataStore.java +++ b/client/src/com/vaadin/client/metadata/TypeDataStore.java @@ -23,7 +23,7 @@ public class TypeDataStore { private final Map<Type, Collection<Property>> properties = new HashMap<Type, Collection<Property>>(); private final Set<Method> delayedMethods = new HashSet<Method>(); - private final Set<Method> lastonlyMethods = new HashSet<Method>(); + private final Set<Method> lastOnlyMethods = new HashSet<Method>(); private final Map<Method, Type> returnTypes = new HashMap<Method, Type>(); private final Map<Method, Invoker> invokers = new HashMap<Method, Invoker>(); @@ -159,12 +159,12 @@ public class TypeDataStore { delayedMethods.add(getType(type).getMethod(methodName)); } - public static boolean isLastonly(Method method) { - return get().lastonlyMethods.contains(method); + public static boolean isLastOnly(Method method) { + return get().lastOnlyMethods.contains(method); } - public void setLastonly(Class<?> clazz, String methodName) { - lastonlyMethods.add(getType(clazz).getMethod(methodName)); + public void setLastOnly(Class<?> clazz, String methodName) { + lastOnlyMethods.add(getType(clazz).getMethod(methodName)); } public static Collection<Property> getProperties(Type type) 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 <code>true</code>, any previous invocations of the + * By setting lastOnly to <code>true</code>, 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, <code>false</code> 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 - * <code>{@literal @}Delay(lastonly = true)</code> is used. + * <code>{@literal @}Delay(lastOnly = true)</code> is used. * <p> * 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 diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java index 3db8d712c4..d0c2992003 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java @@ -20,6 +20,6 @@ import com.vaadin.shared.annotations.Delayed; import com.vaadin.shared.communication.ServerRpc; public interface CapsLockWarningRpc extends ServerRpc { - @Delayed(lastonly = true) + @Delayed(lastOnly = true) public void isCapsLockEnabled(boolean isCapsLockEnabled); } |