diff options
author | Leif Åstrand <leif@vaadin.com> | 2015-01-13 21:55:26 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2015-01-13 20:15:00 +0000 |
commit | 8e17afda2ec060f56da0626fb40b088670777e8c (patch) | |
tree | dc78c93c4739198daba52efe293b20f0bf42acf3 | |
parent | 2fd0f18ec8362a23bf48069c64270344782e8eea (diff) | |
download | vaadin-framework-8e17afda2ec060f56da0626fb40b088670777e8c.tar.gz vaadin-framework-8e17afda2ec060f56da0626fb40b088670777e8c.zip |
Rename BackgroundMessage -> NoLoadingIndicator (#15373)
Change-Id: Icc25e5727880baa9dceba3394522b3c5b3a4314f
-rw-r--r-- | client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java | 6 | ||||
-rw-r--r-- | client/src/com/vaadin/client/ApplicationConnection.java | 2 | ||||
-rw-r--r-- | client/src/com/vaadin/client/metadata/TypeDataStore.java | 6 | ||||
-rw-r--r-- | shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java (renamed from shared/src/com/vaadin/shared/annotations/BackgroundMessage.java) | 6 | ||||
-rw-r--r-- | shared/src/com/vaadin/shared/data/DataRequestRpc.java | 4 | ||||
-rw-r--r-- | shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java | 4 | ||||
-rw-r--r-- | shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java index 7efdf9db81..86ece28041 100644 --- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java +++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java @@ -24,7 +24,7 @@ import com.google.gwt.core.ext.typeinfo.JClassType; import com.google.gwt.core.ext.typeinfo.JMethod; import com.google.gwt.core.ext.typeinfo.JType; import com.vaadin.client.metadata.TypeDataStore.MethodAttribute; -import com.vaadin.shared.annotations.BackgroundMessage; +import com.vaadin.shared.annotations.NoLoadingIndicator; import com.vaadin.shared.annotations.Delayed; public class ServerRpcVisitor extends TypeVisitor { @@ -52,9 +52,9 @@ public class ServerRpcVisitor extends TypeVisitor { } } - if (method.getAnnotation(BackgroundMessage.class) != null) { + if (method.getAnnotation(NoLoadingIndicator.class) != null) { bundle.setMethodAttribute(type, method, - MethodAttribute.BACKGROUND_MESSAGE); + MethodAttribute.NO_LOADING_INDICATOR); } bundle.setNeedsParamTypes(type, method); diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index c00e5a8dae..6abaf28eda 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -2794,7 +2794,7 @@ public class ApplicationConnection implements HasHandlers { parameterTypes = method.getParameterTypes(); showLoadingIndicator |= !TypeDataStore - .isBackgroundMessage(method); + .isNoLoadingIndicator(method); } catch (NoDataException e) { throw new RuntimeException("No type data for " + invocation.toString(), e); diff --git a/client/src/com/vaadin/client/metadata/TypeDataStore.java b/client/src/com/vaadin/client/metadata/TypeDataStore.java index adbf24d411..46f26f1b25 100644 --- a/client/src/com/vaadin/client/metadata/TypeDataStore.java +++ b/client/src/com/vaadin/client/metadata/TypeDataStore.java @@ -29,7 +29,7 @@ import com.vaadin.shared.annotations.NoLayout; public class TypeDataStore { public static enum MethodAttribute { - DELAYED, LAST_ONLY, NO_LAYOUT, BACKGROUND_MESSAGE; + DELAYED, LAST_ONLY, NO_LAYOUT, NO_LOADING_INDICATOR; } private static final String CONSTRUCTOR_NAME = "!new"; @@ -219,8 +219,8 @@ public class TypeDataStore { return hasMethodAttribute(method, MethodAttribute.DELAYED); } - public static boolean isBackgroundMessage(Method method) { - return hasMethodAttribute(method, MethodAttribute.BACKGROUND_MESSAGE); + public static boolean isNoLoadingIndicator(Method method) { + return hasMethodAttribute(method, MethodAttribute.NO_LOADING_INDICATOR); } private static boolean hasMethodAttribute(Method method, diff --git a/shared/src/com/vaadin/shared/annotations/BackgroundMessage.java b/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java index 885c0de4d2..8455b4cead 100644 --- a/shared/src/com/vaadin/shared/annotations/BackgroundMessage.java +++ b/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java @@ -20,8 +20,8 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Target; /** - * Annotation used to mark server RPC methods that perform background tasks that - * are transparent to the user. The framework will show a loading indicator when + * Annotation used to mark server RPC methods for which it isn't necessary to + * show the loading indicator. The framework will show a loading indicator when * sending requests for RPC methods that are not marked with this annotation. * The loading indicator is hidden once a response is received. * @@ -30,6 +30,6 @@ import java.lang.annotation.Target; */ @Target(ElementType.METHOD) @Documented -public @interface BackgroundMessage { +public @interface NoLoadingIndicator { // Just an empty marker annotation } diff --git a/shared/src/com/vaadin/shared/data/DataRequestRpc.java b/shared/src/com/vaadin/shared/data/DataRequestRpc.java index c2a13d470c..0d9b919a4e 100644 --- a/shared/src/com/vaadin/shared/data/DataRequestRpc.java +++ b/shared/src/com/vaadin/shared/data/DataRequestRpc.java @@ -16,7 +16,7 @@ package com.vaadin.shared.data; -import com.vaadin.shared.annotations.BackgroundMessage; +import com.vaadin.shared.annotations.NoLoadingIndicator; import com.vaadin.shared.annotations.Delayed; import com.vaadin.shared.communication.ServerRpc; @@ -40,7 +40,7 @@ public interface DataRequestRpc extends ServerRpc { * @param cacheSize * the number of cached rows */ - @BackgroundMessage + @NoLoadingIndicator public void requestRows(int firstRowIndex, int numberOfRows, int firstCachedRowIndex, int cacheSize); diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java b/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java index 54153005e3..f541395cef 100644 --- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java +++ b/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java @@ -15,10 +15,10 @@ */ package com.vaadin.shared.ui.progressindicator; -import com.vaadin.shared.annotations.BackgroundMessage; +import com.vaadin.shared.annotations.NoLoadingIndicator; import com.vaadin.shared.communication.ServerRpc; public interface ProgressIndicatorServerRpc extends ServerRpc { - @BackgroundMessage + @NoLoadingIndicator public void poll(); } diff --git a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java b/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java index 20e4dbdf4c..887ea760b3 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java @@ -15,7 +15,7 @@ */ package com.vaadin.shared.ui.ui; -import com.vaadin.shared.annotations.BackgroundMessage; +import com.vaadin.shared.annotations.NoLoadingIndicator; import com.vaadin.shared.annotations.Delayed; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.ui.ClickRpc; @@ -28,7 +28,7 @@ public interface UIServerRpc extends ClickRpc, ServerRpc { @Delayed(lastOnly = true) public void scroll(int scrollTop, int scrollLeft); - @BackgroundMessage + @NoLoadingIndicator @Delayed(lastOnly = true) /* * @Delayed just to get lastOnly semantics, sendPendingVariableChanges() |