summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/terminal/AbstractClientConnector.java
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-08-24 08:44:20 +0300
committerArtur Signell <artur@vaadin.com>2012-08-24 13:23:16 +0300
commitda176c32c4d92676424021712a7f6d7ee8cedf76 (patch)
tree36e5c97e5c556dd882498516415663384db18185 /server/src/com/vaadin/terminal/AbstractClientConnector.java
parent86bbe59bb855b6cf57486322bca92e2ace88e8a2 (diff)
downloadvaadin-framework-da176c32c4d92676424021712a7f6d7ee8cedf76.tar.gz
vaadin-framework-da176c32c4d92676424021712a7f6d7ee8cedf76.zip
Renamed Root to UI, automatic rename (#8908)
Automatic rename in Eclipse of the class Root to UI with all rename options enabled, rename also embedded "Root" in variable and method names. The following classes/methods were excluded in the rename: - BootstrapHandler.getApplicationCSSClassName() - ComponentLocator - ConnectorMap - ItemClickEvent - KeepAllItemsVisible - MenuBarTest - MenuBarTooltips - TreeTableTest - TreeWithIcons - Trees - VDebugConsole.printLayoutProblems()
Diffstat (limited to 'server/src/com/vaadin/terminal/AbstractClientConnector.java')
-rw-r--r--server/src/com/vaadin/terminal/AbstractClientConnector.java30
1 files changed, 15 insertions, 15 deletions
diff --git a/server/src/com/vaadin/terminal/AbstractClientConnector.java b/server/src/com/vaadin/terminal/AbstractClientConnector.java
index d2490225fb..87e1dbaa38 100644
--- a/server/src/com/vaadin/terminal/AbstractClientConnector.java
+++ b/server/src/com/vaadin/terminal/AbstractClientConnector.java
@@ -43,7 +43,7 @@ import com.vaadin.terminal.gwt.server.RpcManager;
import com.vaadin.terminal.gwt.server.RpcTarget;
import com.vaadin.terminal.gwt.server.ServerRpcManager;
import com.vaadin.ui.HasComponents;
-import com.vaadin.ui.Root;
+import com.vaadin.ui.UI;
/**
* An abstract base class for ClientConnector implementations. This class
@@ -94,9 +94,9 @@ public abstract class AbstractClientConnector implements ClientConnector {
/* Documentation copied from interface */
@Override
public void markAsDirty() {
- Root root = getRoot();
- if (root != null) {
- root.getConnectorTracker().markDirty(this);
+ UI uI = getRoot();
+ if (uI != null) {
+ uI.getConnectorTracker().markDirty(this);
}
}
@@ -154,8 +154,8 @@ public abstract class AbstractClientConnector implements ClientConnector {
sharedState = createState();
}
- Root root = getRoot();
- if (root != null && !root.getConnectorTracker().isDirty(this)) {
+ UI uI = getRoot();
+ if (uI != null && !uI.getConnectorTracker().isDirty(this)) {
requestRepaint();
}
@@ -363,28 +363,28 @@ public abstract class AbstractClientConnector implements ClientConnector {
* @return The connector's application, or <code>null</code> if not attached
*/
protected Application getApplication() {
- Root root = getRoot();
- if (root == null) {
+ UI uI = getRoot();
+ if (uI == null) {
return null;
} else {
- return root.getApplication();
+ return uI.getApplication();
}
}
/**
- * Finds a Root ancestor of this connector. <code>null</code> is returned if
- * no Root ancestor is found (typically because the connector is not
+ * Finds a UI ancestor of this connector. <code>null</code> is returned if
+ * no UI ancestor is found (typically because the connector is not
* attached to a proper hierarchy).
*
- * @return the Root ancestor of this connector, or <code>null</code> if none
+ * @return the UI ancestor of this connector, or <code>null</code> if none
* is found.
*/
@Override
- public Root getRoot() {
+ public UI getRoot() {
ClientConnector connector = this;
while (connector != null) {
- if (connector instanceof Root) {
- return (Root) connector;
+ if (connector instanceof UI) {
+ return (UI) connector;
}
connector = connector.getParent();
}