summaryrefslogtreecommitdiffstats
path: root/server/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-04-22 14:06:54 +0300
committerVaadin Code Review <review@vaadin.com>2013-04-23 07:46:25 +0000
commitf596fea90a03df5191ff65aa82cf70a879809774 (patch)
tree19b7f50b3ad209e107b02c54f7b4ba39000406f9 /server/src
parent09cb9d88956b5c892d8dba9b1a3f3dd9cdfd078a (diff)
downloadvaadin-framework-f596fea90a03df5191ff65aa82cf70a879809774.tar.gz
vaadin-framework-f596fea90a03df5191ff65aa82cf70a879809774.zip
Renamed UI.getLoadingIndicator -> getLoadingIndicatorConfiguration (#11665)
Change-Id: If80abf821abd9c6c025e49b249339eb20d56f7ce
Diffstat (limited to 'server/src')
-rw-r--r--server/src/com/vaadin/ui/LoadingIndicatorConfiguration.java (renamed from server/src/com/vaadin/ui/LoadingIndicator.java)12
-rw-r--r--server/src/com/vaadin/ui/UI.java6
2 files changed, 9 insertions, 9 deletions
diff --git a/server/src/com/vaadin/ui/LoadingIndicator.java b/server/src/com/vaadin/ui/LoadingIndicatorConfiguration.java
index 5740ee772d..ca6c158aa5 100644
--- a/server/src/com/vaadin/ui/LoadingIndicator.java
+++ b/server/src/com/vaadin/ui/LoadingIndicatorConfiguration.java
@@ -17,7 +17,7 @@ package com.vaadin.ui;
import java.io.Serializable;
-import com.vaadin.shared.ui.ui.UIState.LoadingIndicatorConfiguration;
+import com.vaadin.shared.ui.ui.UIState.LoadingIndicatorConfigurationState;
/**
* Provides method for configuring the loading indicator.
@@ -25,7 +25,7 @@ import com.vaadin.shared.ui.ui.UIState.LoadingIndicatorConfiguration;
* @author Vaadin Ltd
* @since 7.1
*/
-public interface LoadingIndicator extends Serializable {
+public interface LoadingIndicatorConfiguration extends Serializable {
/**
* Sets the delay before the loading indicator is shown. The default is
* 300ms.
@@ -81,10 +81,10 @@ public interface LoadingIndicator extends Serializable {
public int getWaitStateDelay();
}
-class LoadingIndicatorImpl implements LoadingIndicator {
+class LoadingIndicatorConfigurationImpl implements LoadingIndicatorConfiguration {
private UI ui;
- public LoadingIndicatorImpl(UI ui) {
+ public LoadingIndicatorConfigurationImpl(UI ui) {
this.ui = ui;
}
@@ -148,11 +148,11 @@ class LoadingIndicatorImpl implements LoadingIndicator {
return getState(false).waitStateDelay;
}
- private LoadingIndicatorConfiguration getState() {
+ private LoadingIndicatorConfigurationState getState() {
return ui.getState().loadingIndicatorConfiguration;
}
- private LoadingIndicatorConfiguration getState(boolean markAsDirty) {
+ private LoadingIndicatorConfigurationState getState(boolean markAsDirty) {
return ui.getState(markAsDirty).loadingIndicatorConfiguration;
}
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index b6574fe1b2..837d793b19 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -118,7 +118,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
private Page page = new Page(this);
- private LoadingIndicator loadingIndicator = new LoadingIndicatorImpl(this);
+ private LoadingIndicatorConfiguration loadingIndicatorConfiguration = new LoadingIndicatorConfigurationImpl(this);
/**
* Scroll Y position.
@@ -1132,8 +1132,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements
*
* @return The instance used for configuring the loading indicator
*/
- public LoadingIndicator getLoadingIndicator() {
- return loadingIndicator;
+ public LoadingIndicatorConfiguration getLoadingIndicatorConfiguration() {
+ return loadingIndicatorConfiguration;
}
/**