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/ui/UI.java | |
| 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/ui/UI.java')
| -rw-r--r-- | server/src/com/vaadin/ui/UI.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 957e00385d..c0b3ed9929 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -515,10 +515,10 @@ public abstract class UI extends AbstractComponentContainer implements * * @return this UI * - * @see com.vaadin.ui.AbstractComponent#getRoot() + * @see com.vaadin.ui.AbstractComponent#getUI() */ @Override - public UI getRoot() { + public UI getUI() { return this; } @@ -543,9 +543,9 @@ public abstract class UI extends AbstractComponentContainer implements if (pendingFocus != null) { // ensure focused component is still attached to this main window - if (pendingFocus.getRoot() == this - || (pendingFocus.getRoot() != null && pendingFocus - .getRoot().getParent() == this)) { + if (pendingFocus.getUI() == this + || (pendingFocus.getUI() != null && pendingFocus + .getUI().getParent() == this)) { target.addAttribute("focused", pendingFocus); } pendingFocus = null; @@ -804,7 +804,7 @@ public abstract class UI extends AbstractComponentContainer implements */ public void scrollIntoView(Component component) throws IllegalArgumentException { - if (component.getRoot() != this) { + if (component.getUI() != this) { throw new IllegalArgumentException( "The component where to scroll must belong to this UI."); } |