diff options
Diffstat (limited to 'client')
3 files changed, 5 insertions, 5 deletions
diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 8bb4f37324..aa7a9fc72a 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -284,7 +284,7 @@ public class ApplicationConfiguration implements EntryPoint { /** * Gets the root if of this application instance. The root id should be * included in every request originating from this instance in order to - * associate it with the right Root instance on the server. + * associate it with the right UI instance on the server. * * @return the root id */ diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 10f63d0f51..4e8871b8ac 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -208,7 +208,7 @@ public class ApplicationConnection { } public ApplicationConnection() { - // Assuming Root data is eagerly loaded + // Assuming UI data is eagerly loaded ConnectorBundleLoader.get().loadBundle( ConnectorBundleLoader.EAGER_BUNDLE_NAME, null); rootConnector = GWT.create(RootConnector.class); diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java index b3490effa7..3321b07146 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java @@ -58,9 +58,9 @@ import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler; import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren; import com.vaadin.terminal.gwt.client.ui.notification.VNotification; import com.vaadin.terminal.gwt.client.ui.window.WindowConnector; -import com.vaadin.ui.Root; +import com.vaadin.ui.UI; -@Connect(value = Root.class, loadStyle = LoadStyle.EAGER) +@Connect(value = UI.class, loadStyle = LoadStyle.EAGER) public class RootConnector extends AbstractComponentContainerConnector implements Paintable, MayScrollChildren { @@ -359,7 +359,7 @@ public class RootConnector extends AbstractComponentContainerConnector } /** - * Checks if the given sub window is a child of this Root Connector + * Checks if the given sub window is a child of this UI Connector * * @deprecated Should be replaced by a more generic mechanism for getting * non-ComponentConnector children |