#7056 Window caption cannot be removed

svn changeset:19090/svn branch:6.6

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index 3d5288b0bffea9035038195bf011c514746a1c5c..e2fe47cc2c270eff0320ecde44208eb691386c4d 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -311,9 +311,9 @@ public class VWindow extends VOverlay implements Container,
             resizeLazy = uidl.hasAttribute(VView.RESIZE_LAZY);
 
             setDraggable(!uidl.hasAttribute("fixedposition"));
-        }
 
-        if (uidl.hasAttribute("caption")) {
+            // Caption must be set before required header size is measured. If
+            // the caption attribute is missing the caption should be cleared.
             setCaption(uidl.getStringAttribute("caption"),
                     uidl.getStringAttribute("icon"));
         }