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 6872b2389d705aa111ab4c8aa3085d7ec0a75446..1e11814bf75358dbb96ce0aea97676baee65bcd1 100644 (file)
--- 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 045b9c180d0cb79dbbc790635d2ace348c30c665..26c221d4a39aba2df0ac78fdc76ac0087f2fce21 100644 (file)
--- 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;