Formlayout removed components wrong (left one extra component)

svn changeset:3965/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
index f9c8b7bdab93ff88af6f1681724247ee73966393..79e5773fd91fa0fb77240a6e17e8673c160c597f 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
@@ -34,7 +34,7 @@ public class IFormLayout extends FlexTable implements Container {
         for (final Iterator it = uidl.getChildIterator(); it.hasNext(); i++) {
             prepareCell(i, 1);
             final UIDL childUidl = (UIDL) it.next();
-            final Paintable p = (Paintable) client.getPaintable(childUidl);
+            final Paintable p = client.getPaintable(childUidl);
             Caption c = (Caption) componentToCaption.get(p);
             if (c == null) {
                 c = new Caption(p, client);
@@ -50,7 +50,7 @@ public class IFormLayout extends FlexTable implements Container {
             setWidget(i, 0, c);
             p.updateFromUIDL(childUidl, client);
         }
-        i++;
+
         while (getRowCount() > i) {
             final Paintable p = (Paintable) getWidget(i, 1);
             client.unregisterPaintable(p);