Fix GridLayout empty cells when UIDL set after component creation.

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
index f894b49d87704672f0f8b80f49ca29bd21deea80..6e84d636fce2568d5a47d99f30c805bfd62f76d9 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java
@@ -929,8 +929,11 @@ public class VGridLayout extends SimplePanel implements Container {
                 }
             }
             childUidl = c;
-            updateRelSizeStatus(client.getPaintable(c).getState(),
-                    c.getBooleanAttribute("cached"));
+            if (null != c) {
+                VPaintableWidget paintable = client.getPaintable(c);
+                updateRelSizeStatus(paintable.getState(),
+                        c.getBooleanAttribute("cached"));
+            }
         }
 
         protected void updateRelSizeStatus(SharedState state, boolean cached) {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayoutPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayoutPaintable.java
index 0df932a45b8c0ecb48a0c8448756040f510c3eda..24d33fc1559cc7f633a58a2c7926fe1daf3bb348 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayoutPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayoutPaintable.java
@@ -38,7 +38,6 @@ public class VGridLayoutPaintable extends VAbstractPaintableWidgetContainer {
     };
 
     @Override
-    @SuppressWarnings("unchecked")
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidgetForPaintable().rendering = true;
         getWidgetForPaintable().client = client;