AbstractComponentContainer should implement getComponentIterator and not iterator (#10144)

Change-Id: I092cc71dfa9ded74f6624e6808a9ec1de7cf1cb5

server/src/com/vaadin/ui/AbsoluteLayout.java

@@ -70,7 +70,7 @@ public class AbsoluteLayout extends AbstractLayout implements
      * absolute layout.
      */
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return componentToCoordinates.keySet().iterator();
     }
 

server/src/com/vaadin/ui/AbstractComponentContainer.java

@@ -379,8 +379,8 @@ public abstract class AbstractComponentContainer extends AbstractComponent
     }
 
     @Override
-    public Iterator<Component> iterator() {
-        return getComponentIterator();
+    public Iterator<Component> getComponentIterator() {
+        return iterator();
     }
 
     /*

server/src/com/vaadin/ui/AbstractOrderedLayout.java

@@ -182,7 +182,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      * @return the Iterator of the components inside the container.
      */
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return components.iterator();
     }
 

server/src/com/vaadin/ui/AbstractSplitPanel.java

@@ -224,7 +224,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      */
 
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return new ComponentIterator();
     }
 

server/src/com/vaadin/ui/CssLayout.java

@@ -210,7 +210,7 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
      * @return the Iterator of the components inside the container.
      */
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return components.iterator();
     }
 

server/src/com/vaadin/ui/CustomComponent.java

@@ -128,7 +128,7 @@ public class CustomComponent extends AbstractComponentContainer {
     }
 
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return new ComponentIterator();
     }
 

server/src/com/vaadin/ui/CustomField.java

@@ -146,14 +146,6 @@ public abstract class CustomField<T> extends AbstractField<T> implements
         }
     }
 
-    /**
-     * @deprecated As of 7.0, use {@link #iterator()} instead.
-     */
-    @Deprecated
-    public Iterator<Component> getComponentIterator() {
-        return iterator();
-    }
-
     @Override
     public Iterator<Component> iterator() {
         return new ComponentIterator();

server/src/com/vaadin/ui/CustomLayout.java

@@ -191,7 +191,7 @@ public class CustomLayout extends AbstractLayout implements LegacyComponent {
      * @return the Iterator of the components inside the container.
      */
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return slots.values().iterator();
     }
 

server/src/com/vaadin/ui/GridLayout.java

@@ -460,7 +460,7 @@ public class GridLayout extends AbstractLayout implements
      * @return the Iterator of the components inside the layout.
      */
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return Collections.unmodifiableCollection(components).iterator();
     }
 

server/src/com/vaadin/ui/Panel.java

@@ -240,7 +240,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return Collections.singleton((Component) content).iterator();
     }
 

server/src/com/vaadin/ui/PopupView.java

@@ -224,7 +224,7 @@ public class PopupView extends AbstractComponentContainer implements
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return new SingleComponentIterator(visibleComponent);
     }
 

server/src/com/vaadin/ui/TabSheet.java

@@ -133,7 +133,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
      */
 
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return Collections.unmodifiableList(components).iterator();
     }
 

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>();

uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java

@@ -43,7 +43,7 @@ public class WidgetContainer extends AbstractComponentContainer {
     }
 
     @Override
-    public Iterator<Component> getComponentIterator() {
+    public Iterator<Component> iterator() {
         return children.iterator();
     }
 }