diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-05-11 13:05:12 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-05-11 13:05:12 +0000 |
| commit | 4056548437d063ac9dba15cf1e7e944bf4140cb0 (patch) | |
| tree | c1d4c145342aa41381f2d7d7ea356283f0e5da30 /src | |
| parent | aa96022613d590d0ec0aa4a0e4511be12806d347 (diff) | |
| download | vaadin-framework-4056548437d063ac9dba15cf1e7e944bf4140cb0.tar.gz vaadin-framework-4056548437d063ac9dba15cf1e7e944bf4140cb0.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/CommunicationManager.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java | 2 |
2 files changed, 2 insertions, 2 deletions
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; |