1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/vaadin/ui/CustomComponent.java b/src/com/vaadin/ui/CustomComponent.java
index 5d086ddaf9..976775b8f3 100644
--- a/src/com/vaadin/ui/CustomComponent.java
+++ b/src/com/vaadin/ui/CustomComponent.java
@@ -145,14 +145,15 @@ public class CustomComponent extends AbstractComponentContainer {
         this.componentType = componentType;
     }
 
-    private class ComponentIterator implements Iterator, Serializable {
+    private class ComponentIterator implements Iterator<Component>,
+            Serializable {
         boolean first = getCompositionRoot() != null;
 
         public boolean hasNext() {
             return first;
         }
 
-        public Object next() {
+        public Component next() {
             first = false;
             return root;
         }
@@ -162,8 +163,7 @@ public class CustomComponent extends AbstractComponentContainer {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    public Iterator getComponentIterator() {
+    public Iterator<Component> getComponentIterator() {
         return new ComponentIterator();
     }