From: Matti Tahvonen Date: Fri, 8 Jun 2007 08:20:06 +0000 (+0000) Subject: small changes X-Git-Tag: 6.7.0.beta1~6298 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3d9e3b67a312f5e111d2a0e6ed72a261cc227765;p=vaadin-framework.git small changes svn changeset:1649/svn branch:trunk --- diff --git a/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java b/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java index d4e5233c04..073636d76c 100644 --- a/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java +++ b/src/com/itmill/toolkit/terminal/web/AjaxJsonPaintTarget.java @@ -410,7 +410,7 @@ public class AjaxJsonPaintTarget implements PaintTarget, AjaxPaintTarget { * if the paint operation failed. */ public void addAttribute(String name, int value) throws PaintException { - tag.addAttribute(name + ":" + String.valueOf(value)); + tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } /** @@ -426,7 +426,7 @@ public class AjaxJsonPaintTarget implements PaintTarget, AjaxPaintTarget { * if the paint operation failed. */ public void addAttribute(String name, long value) throws PaintException { - tag.addAttribute(name + ":" + String.valueOf(value)); + tag.addAttribute("\"" + name + "\":" + String.valueOf(value)); } /** @@ -584,7 +584,7 @@ public class AjaxJsonPaintTarget implements PaintTarget, AjaxPaintTarget { // Escape and write what was given if (xml != null) - tag.addData(xml); + tag.addData("\""+escapeJSON(xml)+"\""); } diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java index b8748a0331..0e32f5812c 100644 --- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -905,8 +905,7 @@ public class ApplicationServlet extends HttpServlet implements "\n\n" + " \n" + "

" + - "

\n" + - "

console

\n" + + "

\n" + "

IT Mill Toolkit 5 Prototype

\n" + " \n" + "\n");