summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/UI.java
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-11-06 16:27:17 +0000
committerVaadin Code Review <review@vaadin.com>2012-11-06 16:27:17 +0000
commitd55cac7aa08e1652d140f6980ffc29e99da349ab (patch)
tree6ab09e745dff47a0e21fcc57691ffa5d344b4205 /server/src/com/vaadin/ui/UI.java
parentec2ebb4d65f5d2150d0d01b726837c45105eab5d (diff)
parent438854e549b7f44f091f47363dfc050d9a2fa82a (diff)
downloadvaadin-framework-d55cac7aa08e1652d140f6980ffc29e99da349ab.tar.gz
vaadin-framework-d55cac7aa08e1652d140f6980ffc29e99da349ab.zip
Merge "AbstractComponentContainer should implement getComponentIterator and not iterator (#10144)"
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
-rw-r--r--server/src/com/vaadin/ui/UI.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 4d743859da..d2f323e5fe 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -333,7 +333,7 @@ public abstract class UI extends AbstractComponentContainer implements
* @see com.vaadin.ui.ComponentContainer#getComponentIterator()
*/
@Override
- public Iterator<Component> getComponentIterator() {
+ public Iterator<Component> iterator() {
// TODO could directly create some kind of combined iterator instead of
// creating a new ArrayList
ArrayList<Component> components = new ArrayList<Component>();