From: Artur Signell <artur.signell@itmill.com>
Date: Mon, 11 May 2009 13:05:12 +0000 (+0000)
Subject: Additional fix for - #2921: Window should be able to contain a ComponentContainer
X-Git-Tag: 6.7.0.beta1~2924
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4056548437d063ac9dba15cf1e7e944bf4140cb0;p=vaadin-framework.git

Additional fix for - #2921: Window should be able to contain a ComponentContainer
http://dev.itmill.com/ticket/2921

svn changeset:7737/svn branch:6.0
---

diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index 6872b2389d..1e11814bf7 100644
--- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -455,7 +455,7 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
                     if (analyzeLayouts) {
                         invalidComponentRelativeSizes = ComponentSizeValidator
                                 .validateComponentRelativeSizes(((Window) p)
-                                        .getLayout(), null, null);
+                                        .getContent(), null, null);
                     }
                 }
             }
diff --git a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
index 045b9c180d..26c221d4a3 100644
--- a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
+++ b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
@@ -63,7 +63,7 @@ public class ComponentSizeValidator implements Serializable {
 
         if (component instanceof Panel) {
             Panel panel = (Panel) component;
-            errors = validateComponentRelativeSizes(panel.getLayout(), errors,
+            errors = validateComponentRelativeSizes(panel.getContent(), errors,
                     parent);
         } else if (component instanceof ComponentContainer) {
             ComponentContainer lo = (ComponentContainer) component;