Fixed ClassCastException for VWindow

1 files changed, 6 insertions, 4 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VViewPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/VViewPaintable.java
index ccf7185c14..3e8b178b1d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VViewPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VViewPaintable.java
@@ -167,11 +167,13 @@ public class VViewPaintable extends VAbstractPaintableWidgetContainer {
                 }
             } else {
                 // subwindows
-                final VPaintableWidget w = client.getPaintable(childUidl);
-                if (getWidgetForPaintable().subWindows.contains(w)) {
-                    removedSubWindows.remove(w);
+                final VWindowPaintable w = (VWindowPaintable) client
+                        .getPaintable(childUidl);
+                VWindow windowWidget = w.getWidgetForPaintable();
+                if (getWidgetForPaintable().subWindows.contains(windowWidget)) {
+                    removedSubWindows.remove(windowWidget);
                 } else {
-                    getWidgetForPaintable().subWindows.add((VWindow) w);
+                    getWidgetForPaintable().subWindows.add(windowWidget);
                 }
                 w.updateFromUIDL(childUidl, client);
             }