#5692 Generics: mostly UIDL.getChildIterator related changes; UIDL.getChildIterator() related code should be improved

svn changeset:15333/svn branch:6.5

9 files changed, 15 insertions, 16 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
index 0817d3d6e0..34a2a645be 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
@@ -18,11 +18,9 @@ import com.google.gwt.user.client.ui.KeyboardListenerCollection;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.Container;
 import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextArea;
 
 /**
  * A helper class to implement keyboard shorcut handling. Keeps a list of owners
@@ -94,7 +92,7 @@ public class ShortcutActionHandler {
      */
     public void updateActionMap(UIDL c) {
         actions.clear();
-        final Iterator it = c.getChildIterator();
+        final Iterator<?> it = c.getChildIterator();
         while (it.hasNext()) {
             final UIDL action = (UIDL) it.next();
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
index 798fb01edf..4ba5d82527 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
@@ -107,7 +107,7 @@ public class VFormLayout extends SimplePanel implements Container {
                     uidl.hasAttribute("spacing"));
 
             int i = 0;
-            for (final Iterator it = uidl.getChildIterator(); it.hasNext(); i++) {
+            for (final Iterator<?> it = uidl.getChildIterator(); it.hasNext(); i++) {
                 prepareCell(i, 1);
                 final UIDL childUidl = (UIDL) it.next();
                 final Paintable p = client.getPaintable(childUidl);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index 59dd4f9611..7730247f67 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -143,10 +143,10 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
 
         LinkedList<Cell> relativeHeighted = new LinkedList<Cell>();
 
-        for (final Iterator i = uidl.getChildIterator(); i.hasNext();) {
+        for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) {
             final UIDL r = (UIDL) i.next();
             if ("gr".equals(r.getTag())) {
-                for (final Iterator j = r.getChildIterator(); j.hasNext();) {
+                for (final Iterator<?> j = r.getChildIterator(); j.hasNext();) {
                     final UIDL c = (UIDL) j.next();
                     if ("gc".equals(c.getTag())) {
                         Cell cell = getCell(c);
@@ -483,8 +483,9 @@ public class VGridLayout extends SimplePanel implements Paintable, Container {
     private void renderRemainingComponentsWithNoRelativeHeight(
             LinkedList<Cell> pendingCells) {
 
-        for (Iterator iterator = pendingCells.iterator(); iterator.hasNext();) {
-            Cell cell = (Cell) iterator.next();
+        for (Iterator<Cell> iterator = pendingCells.iterator(); iterator
+                .hasNext();) {
+            Cell cell = iterator.next();
             if (!cell.hasRelativeHeight()) {
                 cell.render();
                 iterator.remove();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
index a6fc0107c3..e19079039d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
@@ -46,7 +46,7 @@ public class VListSelect extends VOptionGroupBase {
             // can't unselect last item in singleselect mode
             select.addItem("", null);
         }
-        for (final Iterator i = uidl.getChildIterator(); i.hasNext();) {
+        for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) {
             final UIDL optionUidl = (UIDL) i.next();
             select.addItem(optionUidl.getStringAttribute("caption"),
                     optionUidl.getStringAttribute("key"));
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
index a1c4e0ba01..5e47ac571e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
@@ -38,7 +38,7 @@ public class VNativeSelect extends VOptionGroupBase implements Field {
             select.addItem("", null);
         }
         boolean selected = false;
-        for (final Iterator i = uidl.getChildIterator(); i.hasNext();) {
+        for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) {
             final UIDL optionUidl = (UIDL) i.next();
             select.addItem(optionUidl.getStringAttribute("caption"),
                     optionUidl.getStringAttribute("key"));
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index edf04c913b..aa358b2c18 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -171,7 +171,7 @@ public class VTree extends SimpleFocusablePanel implements Paintable,
     }
 
     private void updateActionMap(UIDL c) {
-        final Iterator it = c.getChildIterator();
+        final Iterator<?> it = c.getChildIterator();
         while (it.hasNext()) {
             final UIDL action = (UIDL) it.next();
             final String key = action.getStringAttribute("key");
@@ -223,7 +223,7 @@ public class VTree extends SimpleFocusablePanel implements Paintable,
         isNullSelectionAllowed = uidl.getBooleanAttribute("nullselect");
 
         body.clear();
-        for (final Iterator i = uidl.getChildIterator(); i.hasNext();) {
+        for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) {
             final UIDL childUidl = (UIDL) i.next();
             if ("actions".equals(childUidl.getTag())) {
                 updateActionMap(childUidl);
@@ -890,7 +890,7 @@ public class VTree extends SimpleFocusablePanel implements Paintable,
             DOM.setInnerText(nodeCaptionSpan, text);
         }
 
-        private void renderChildNodes(Iterator i) {
+        private void renderChildNodes(Iterator<?> i) {
             childNodeContainer.clear();
             childNodeContainer.setVisible(true);
             while (i.hasNext()) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
index 2733836f1e..24d6dee749 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
@@ -115,7 +115,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler,
         remove.setEnabled(enabled);

         options.clear();

         selections.clear();

-        for (final Iterator i = uidl.getChildIterator(); i.hasNext();) {

+        for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) {

             final UIDL optionUidl = (UIDL) i.next();

             if (optionUidl.hasAttribute("selected")) {

                 selections.addItem(optionUidl.getStringAttribute("caption"),

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java
index a0af7f90d5..c564feb51e 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java
@@ -271,7 +271,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
                 String script = childUidl.getStringAttribute("script");
                 eval(script);
             } else if (tag == "notifications") {
-                for (final Iterator it = childUidl.getChildIterator(); it
+                for (final Iterator<?> it = childUidl.getChildIterator(); it
                         .hasNext();) {
                     final UIDL notification = (UIDL) it.next();
                     String html = "";
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index ec26626015..6572d93873 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -403,7 +403,7 @@ public class VWindow extends VOverlay implements Container, ScrollListener,
                     shortcutHandler.updateActionMap(childUidl);
                 } else if (childUidl.getTag().equals("notifications")) {
                     // TODO needed? move ->
-                    for (final Iterator it = childUidl.getChildIterator(); it
+                    for (final Iterator<?> it = childUidl.getChildIterator(); it
                             .hasNext();) {
                         final UIDL notification = (UIDL) it.next();
                         String html = "";