From 8e17afda2ec060f56da0626fb40b088670777e8c Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Tue, 13 Jan 2015 21:55:26 +0200 Subject: Rename BackgroundMessage -> NoLoadingIndicator (#15373) Change-Id: Icc25e5727880baa9dceba3394522b3c5b3a4314f --- .../shared/annotations/BackgroundMessage.java | 35 ---------------------- .../shared/annotations/NoLoadingIndicator.java | 35 ++++++++++++++++++++++ .../src/com/vaadin/shared/data/DataRequestRpc.java | 4 +-- .../ProgressIndicatorServerRpc.java | 4 +-- .../src/com/vaadin/shared/ui/ui/UIServerRpc.java | 4 +-- 5 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 shared/src/com/vaadin/shared/annotations/BackgroundMessage.java create mode 100644 shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java (limited to 'shared') diff --git a/shared/src/com/vaadin/shared/annotations/BackgroundMessage.java b/shared/src/com/vaadin/shared/annotations/BackgroundMessage.java deleted file mode 100644 index 885c0de4d2..0000000000 --- a/shared/src/com/vaadin/shared/annotations/BackgroundMessage.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.annotations; - -import java.lang.annotation.Documented; -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 - * sending requests for RPC methods that are not marked with this annotation. - * The loading indicator is hidden once a response is received. - * - * @since - * @author Vaadin Ltd - */ -@Target(ElementType.METHOD) -@Documented -public @interface BackgroundMessage { - // Just an empty marker annotation -} diff --git a/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java b/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java new file mode 100644 index 0000000000..8455b4cead --- /dev/null +++ b/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java @@ -0,0 +1,35 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.shared.annotations; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +/** + * 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. + * + * @since + * @author Vaadin Ltd + */ +@Target(ElementType.METHOD) +@Documented +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() -- cgit v1.2.3