From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 23 Oct 2009 05:50:35 +0000 (+0000)
Subject: fixed customlayouts, broken since UIDL refactoring
X-Git-Tag: 6.7.0.beta1~2395
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9a45557e9f8ac768a9650c4fe64d20dcfc49c6da;p=vaadin-framework.git

fixed customlayouts, broken since UIDL refactoring

svn changeset:9318/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 3bd547ba9d..023764ca43 100644
--- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -27,6 +27,7 @@ import com.vaadin.terminal.VariableOwner;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.ClientWidget;
 import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomLayout;
 
 /**
  * User Interface Description Language Target.
@@ -135,11 +136,12 @@ public class JsonPaintTarget implements PaintTarget {
 
         tag = new JsonTag(tagName);
 
-        customLayoutArgumentsOpen = "customlayout".equals(tagName);
-
         if ("error".equals(tagName)) {
             errorsOpen++;
         }
+
+        customLayoutArgumentsOpen = false;
+
     }
 
     /**
@@ -761,7 +763,6 @@ public class JsonPaintTarget implements PaintTarget {
         if (namespace != null) {
             addAttribute("xmlns", namespace);
         }
-        customLayoutArgumentsOpen = false;
 
         if (sectionData != null) {
             tag.addData("\"" + escapeJSON(sectionData) + "\"");
@@ -823,6 +824,11 @@ public class JsonPaintTarget implements PaintTarget {
         paintable.addListener(manager);
         addAttribute("id", id);
         paintedComponents.add(paintable);
+
+        if (paintable instanceof CustomLayout) {
+            customLayoutArgumentsOpen = true;
+        }
+
         return cacheEnabled && isPreviouslyPainted;
     }