diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-24 11:32:49 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-24 13:23:19 +0300 |
| commit | 0b0ddb86876a965f68c6160fe7a499412b6c199d (patch) | |
| tree | 636de4f5b01e38b4e7d460012438fe7a266e7596 /server/src/com/vaadin/terminal/gwt | |
| parent | ff0761f787f94a157d12af2a37e10e808d43fc59 (diff) | |
| download | vaadin-framework-0b0ddb86876a965f68c6160fe7a499412b6c199d.tar.gz vaadin-framework-0b0ddb86876a965f68c6160fe7a499412b6c199d.zip | |
Component.getRoot() -> Component.getUI() (#8908)
Diffstat (limited to 'server/src/com/vaadin/terminal/gwt')
3 files changed, 4 insertions, 4 deletions
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index 7662564233..e19cfc4de6 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -1245,7 +1245,7 @@ public abstract class AbstractCommunicationManager implements Serializable { public static JSONObject encodeState(ClientConnector connector, SharedState state) throws JSONException { - UI uI = connector.getRoot(); + UI uI = connector.getUI(); ConnectorTracker connectorTracker = uI.getConnectorTracker(); Class<? extends SharedState> stateType = connector.getStateType(); Object diffState = connectorTracker.getDiffState(connector); @@ -2353,7 +2353,7 @@ public abstract class AbstractCommunicationManager implements Serializable { * handling post */ String paintableId = owner.getConnectorId(); - int rootId = owner.getRoot().getUIId(); + int rootId = owner.getUI().getUIId(); String key = rootId + "/" + paintableId + "/" + name; if (pidToNameToStreamVariable == null) { diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java index 3a18dbd6f4..1a5019a7c1 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java +++ b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java @@ -180,7 +180,7 @@ public interface ClientConnector extends Connector, RpcTarget { * @return The UI this connector is attached to or null if it is not * attached to any UI */ - public UI getRoot(); + public UI getUI(); /** * Called before the shared state and RPC invocations are sent to the diff --git a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java index 42312b72fd..0106f466fc 100644 --- a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java @@ -327,7 +327,7 @@ public class DragAndDropService implements VariableOwner, ClientConnector { } @Override - public UI getRoot() { + public UI getUI() { return null; } |